Merge remote-tracking branch 'upstream/master' into hardline_maints

shiptest-ss13 · Jan 4, 2025 · 47c2c5d · 47c2c5d
2 parents 314e446 + 29af48d
commit 47c2c5d
Show file tree

Hide file tree

Showing 122 changed files with 21,302 additions and 3,576 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm
diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -52,12 +52,12 @@
 /area/ship/security)
 "bg" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/structure/weightmachine/weightlifter,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/platform/ship_three{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "bi" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -200,7 +200,7 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "dy" = (
 /obj/structure/cable{
@@ -220,6 +220,9 @@
 	pixel_y = -20
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "dO" = (
@@ -416,6 +419,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "gt" = (
@@ -465,6 +471,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"hh" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
 "hn" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -533,6 +551,7 @@
 	dir = 1
 	},
 /obj/machinery/light/small/directional/north,
+/obj/structure/chair/handrail,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "id" = (
@@ -678,6 +697,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/firealarm/directional/north,
+/obj/structure/chair/handrail,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "jB" = (
@@ -987,12 +1007,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
-"oQ" = (
-/obj/structure/sign/number/eight{
-	pixel_y = -8
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
 "oX" = (
 /obj/structure/table/reinforced,
 /obj/item/lighter{
@@ -1042,14 +1056,11 @@
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
-"pl" = (
-/obj/structure/sign/number/nine{
-	pixel_y = -8
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
 "pM" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 4
@@ -1138,6 +1149,9 @@
 	dir = 4
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "ro" = (
@@ -1211,6 +1225,9 @@
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
 	dir = 8
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "sS" = (
@@ -1248,6 +1265,9 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
+/obj/structure/platform/ship_three{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "uy" = (
@@ -1305,7 +1325,7 @@
 /turf/template_noop,
 /area/template_noop)
 "vo" = (
-/obj/structure/sign/number/one{
+/obj/structure/sign/number/random{
 	pixel_y = -8
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -1316,7 +1336,7 @@
 /obj/structure/closet/crate,
 /obj/item/stack/sheet/glass/twenty,
 /obj/item/stack/sheet/metal/twenty,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "vw" = (
 /obj/structure/marker_beacon{
@@ -1348,6 +1368,9 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 4
 	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "vV" = (
@@ -1373,7 +1396,7 @@
 "wI" = (
 /obj/structure/weightmachine/weightlifter,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/box/corners{
+/obj/structure/platform/ship_three{
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -1537,6 +1560,9 @@
 /obj/item/reagent_containers/food/drinks/waterbottle/large,
 /obj/item/reagent_containers/food/drinks/waterbottle/large,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/platform/ship_three{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "zr" = (
@@ -1547,7 +1573,7 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/box/corners,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "zG" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
@@ -1949,6 +1975,9 @@
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/machinery/firealarm/directional/south,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Dh" = (
@@ -2150,8 +2179,8 @@
 /area/ship/crew)
 "GI" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/box/corners{
-	dir = 4
+/obj/structure/platform/ship_three{
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -2237,14 +2266,15 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
+/obj/structure/chair/handrail,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "HS" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
 /obj/structure/reagent_dispensers/watertank,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/platform/ship_three{
+	dir = 9
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Ie" = (
@@ -2273,6 +2303,9 @@
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "IX" = (
@@ -2294,6 +2327,9 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/light/directional/west,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "Jc" = (
@@ -2316,14 +2352,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Jl" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
 /obj/machinery/autolathe,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/platform/ship_three{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "JB" = (
@@ -2379,6 +2415,9 @@
 /area/ship/maintenance/port)
 "Ky" = (
 /obj/item/trash/can,
+/obj/structure/platform/ship_three{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "KR" = (
@@ -3370,6 +3409,9 @@
 /obj/effect/turf_decal/industrial/caution{
 	dir = 1
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Zi" = (
@@ -3674,7 +3716,7 @@ pM
 dO
 Zv
 jO
-jO
+hh
 Cs
 jV
 gt
@@ -3858,7 +3900,7 @@ te
 hN
 oZ
 ba
-pl
+vo
 ox
 ww
 "}
@@ -3898,7 +3940,7 @@ te
 gh
 CQ
 Bl
-oQ
+vo
 ww
 ww
 "}