From da4e686838f9b43a871126498bbff2dfa0412eb5 Mon Sep 17 00:00:00 2001 From: dragomagol <66640614+dragomagol@users.noreply.github.com> Date: Thu, 13 May 2021 17:12:39 -0700 Subject: [PATCH] snowdin shuttle, whiteship wall mount conversion (#58968) --- _maps/shuttles/snowdin_mining.dmm | 6 +- _maps/shuttles/whiteship_box.dmm | 189 +++++++------------------- _maps/shuttles/whiteship_cere.dmm | 42 +++--- _maps/shuttles/whiteship_delta.dmm | 207 ++++++++--------------------- _maps/shuttles/whiteship_donut.dmm | 38 ++---- _maps/shuttles/whiteship_kilo.dmm | 195 +++++++-------------------- _maps/shuttles/whiteship_meta.dmm | 206 ++++++++-------------------- _maps/shuttles/whiteship_tram.dmm | 74 +++-------- 8 files changed, 261 insertions(+), 696 deletions(-) diff --git a/_maps/shuttles/snowdin_mining.dmm b/_maps/shuttles/snowdin_mining.dmm index 9e89edf3d9d..1d9f13193b2 100644 --- a/_maps/shuttles/snowdin_mining.dmm +++ b/_maps/shuttles/snowdin_mining.dmm @@ -35,13 +35,11 @@ /turf/open/floor/engine, /area/shuttle/snowdin/elevator2) "g" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/shuttle/snowdin/elevator2) "i" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/engine, /area/shuttle/snowdin/elevator2) "j" = ( diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 175c1e8fe63..928162115b5 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -43,9 +43,7 @@ "ai" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/structure/bed, /obj/machinery/airalarm/all_access{ pixel_y = 24 @@ -69,9 +67,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/crew) "ak" = ( @@ -224,9 +220,7 @@ /area/shuttle/abandoned/crew) "ay" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 1 }, @@ -302,12 +296,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/small/built{ - dir = 1 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/light/small/built/directional/north, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -409,13 +399,8 @@ /area/shuttle/abandoned/medbay) "aJ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/light/small/built/directional/east, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -555,9 +540,7 @@ pixel_y = 3 }, /obj/item/storage/box/donkpockets, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -603,7 +586,7 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aW" = ( @@ -719,9 +702,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bh" = ( -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bi" = ( @@ -766,10 +747,7 @@ /area/shuttle/abandoned/engine) "bo" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -783,9 +761,7 @@ /obj/machinery/airalarm/all_access{ pixel_y = 24 }, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -892,9 +868,7 @@ /area/shuttle/abandoned/medbay) "bA" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/structure/closet/secure_closet/medical2{ anchored = 1 }, @@ -910,12 +884,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/sleeper, /obj/effect/turf_decal/delivery, -/obj/machinery/light/small/built{ - dir = 8 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/light/small/built/directional/west, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "bC" = ( @@ -949,9 +919,7 @@ /area/shuttle/abandoned/medbay) "bF" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/blood/old, /obj/structure/cable, /turf/open/floor/iron/white/side{ @@ -976,9 +944,7 @@ /area/shuttle/abandoned/medbay) "bH" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -991,11 +957,7 @@ /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/crowbar, -/obj/machinery/power/apc{ - dir = 1; - name = "Hospital Ship Medbay APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/structure/cable, /turf/open/floor/iron/white, /area/shuttle/abandoned/medbay) @@ -1202,16 +1164,11 @@ "ce" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/structure/closet/secure_closet/medical3{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -1226,9 +1183,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "cg" = ( @@ -1262,9 +1217,7 @@ /obj/machinery/atmospherics/components/binary/thermomachine/freezer{ dir = 1 }, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /turf/open/floor/iron/white/side{ dir = 6 }, @@ -1273,19 +1226,14 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/emcloset/anchored, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white/corner{ dir = 1 }, /area/shuttle/abandoned/medbay) "cl" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -1299,28 +1247,21 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/machinery/light/small/built{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/machinery/button/door{ - id = "whiteship_windows"; - name = "Windows Blast Door Control"; - pixel_x = -5; - pixel_y = -24 - }, -/obj/machinery/button/door{ - id = "whiteship_bridge"; - name = "Bridge Blast Door Control"; - pixel_x = 5; - pixel_y = -24 - }, +/obj/machinery/light/small/built/directional/west, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/button/door/directional/south{ + id = "whiteship_windows"; + name = "Windows Blast Door Control"; + pixel_x = -6 + }, +/obj/machinery/button/door/directional/south{ + id = "whiteship_bridge"; + name = "Bridge Blast Door Control"; + pixel_x = 6 + }, /turf/open/floor/iron, /area/shuttle/abandoned/bridge) "cn" = ( @@ -1350,7 +1291,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bridge) "cp" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cq" = ( @@ -1370,9 +1311,7 @@ /area/shuttle/abandoned/engine) "cs" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable, /turf/open/floor/plating, @@ -1500,9 +1439,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/white/side{ dir = 1 @@ -1553,9 +1490,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/medbay) "cJ" = ( @@ -1566,7 +1501,7 @@ }, /obj/item/soap, /obj/structure/curtain, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/medbay) "cK" = ( @@ -1612,11 +1547,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/obj/machinery/power/apc{ - dir = 8; - name = "Hospital Ship Engineering APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -1718,9 +1649,7 @@ "cX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/structure/table, /obj/machinery/door/window/westleft{ name = "Medical Equipment Storage" @@ -1842,11 +1771,8 @@ "dh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -1889,11 +1815,8 @@ "dl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /obj/item/folder/white{ pixel_x = -5; pixel_y = 5 @@ -1916,9 +1839,7 @@ /area/shuttle/abandoned/medbay) "dn" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -1965,9 +1886,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /turf/open/floor/plating, /area/shuttle/abandoned/medbay) "dt" = ( @@ -1983,18 +1902,12 @@ /obj/item/storage/box/zipties, /obj/item/assembly/flash/handheld, /obj/item/melee/classic_baton/telescopic, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/machinery/airalarm/all_access{ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "Hospital Ship Bridge APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/tile/blue{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index df0f803213c..a06a56e369c 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -37,9 +37,7 @@ /area/shuttle/abandoned) "af" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "ag" = ( @@ -128,9 +126,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "au" = ( @@ -156,9 +152,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "ax" = ( @@ -182,12 +176,11 @@ /obj/effect/turf_decal/delivery{ dir = 1 }, -/obj/machinery/button/door{ - id = "cerewhiteleft"; - name = "Cargo Blast Door Toggle"; - pixel_x = -24 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door/directional/west{ + id = "cerewhiteleft"; + name = "Cargo Blast Door Toggle" + }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "aA" = ( @@ -237,12 +230,11 @@ /obj/effect/turf_decal/delivery{ dir = 1 }, -/obj/machinery/button/door{ - id = "cerewhiteright"; - name = "Cargo Blast Door Toggle"; - pixel_x = 24 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door/directional/east{ + id = "cerewhiteright"; + name = "Cargo Blast Door Toggle" + }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "aF" = ( @@ -285,7 +277,7 @@ icon_state = "crateopen"; name = "spare equipment crate" }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "aK" = ( @@ -301,7 +293,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "aM" = ( @@ -328,9 +320,7 @@ "aP" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "aQ" = ( @@ -353,9 +343,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "aU" = ( diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index bd17a93ea87..0900a9191af 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -60,7 +60,7 @@ }, /obj/item/soap, /obj/structure/curtain, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/crew) @@ -72,17 +72,13 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/crew) "al" = ( -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed, /obj/item/bedsheet/centcom, @@ -97,9 +93,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed, /obj/item/bedsheet/centcom, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/airalarm/all_access{ dir = 8; @@ -116,9 +110,7 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /turf/open/floor/plating, /area/shuttle/abandoned/crew) "ap" = ( @@ -161,9 +153,7 @@ /area/shuttle/abandoned/bar) "as" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -172,15 +162,9 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "at" = ( -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 8; - name = "Frigate Bar APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -366,9 +350,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "aL" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -416,14 +398,11 @@ /area/shuttle/abandoned/crew) "aT" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/machinery/airalarm/all_access{ pixel_y = 24 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -436,11 +415,7 @@ /area/shuttle/abandoned/crew) "aU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 1; - name = "Frigate Crew Quarters APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -451,7 +426,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/crew) "aV" = ( -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -479,9 +454,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 6 }, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -506,9 +479,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 1 @@ -554,9 +525,7 @@ /area/shuttle/abandoned/bar) "bd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/chair, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/bar, @@ -649,9 +618,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bl" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -667,9 +634,7 @@ "bn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -769,9 +734,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "bx" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -808,10 +771,7 @@ pixel_x = -2; pixel_y = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bB" = ( @@ -1012,16 +972,14 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, /turf/open/floor/iron, /area/shuttle/abandoned/crew) "bV" = ( -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -1039,10 +997,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/item/stack/spacecash/c200{ pixel_x = 7; pixel_y = 4 @@ -1131,14 +1086,8 @@ /obj/item/camera, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "Frigate Bridge APC"; - pixel_x = -25 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/power/apc/auto_name/west, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -1192,9 +1141,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/crew) "ck" = ( -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -1207,11 +1154,7 @@ /area/shuttle/abandoned/engine) "cl" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 4; - name = "Frigate Engineering APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/auto_name/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, /turf/open/floor/plating, @@ -1311,20 +1254,18 @@ /area/shuttle/abandoned/engine) "ct" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - id = "whiteship_windows"; - name = "Windows Blast Door Control"; - pixel_x = -24; - pixel_y = -5 - }, -/obj/machinery/button/door{ - id = "whiteship_bridge"; - name = "Bridge Blast Door Control"; - pixel_x = -24; - pixel_y = 5 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "whiteship_windows"; + name = "Windows Blast Door Control"; + pixel_y = -6 + }, +/obj/machinery/button/door/directional/west{ + id = "whiteship_bridge"; + name = "Bridge Blast Door Control"; + pixel_y = 6 + }, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "cu" = ( @@ -1349,14 +1290,9 @@ "cv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/spider/stickyweb, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -1403,10 +1339,7 @@ /area/shuttle/abandoned/engine) "cD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stack/cable_coil, @@ -1563,9 +1496,7 @@ /area/shuttle/abandoned/engine) "cP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -1650,9 +1581,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/cargo) "cX" = ( -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/spider/stickyweb, /turf/open/floor/iron, @@ -1713,9 +1642,7 @@ /area/shuttle/abandoned/cargo) "db" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, @@ -1785,14 +1712,10 @@ /turf/open/floor/iron/white, /area/shuttle/abandoned/medbay) "dj" = ( -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/spider/stickyweb, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -1821,9 +1744,7 @@ /area/shuttle/abandoned/medbay) "dm" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -1836,7 +1757,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -1858,7 +1779,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/spider/stickyweb, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, @@ -2022,9 +1943,7 @@ /area/shuttle/abandoned/medbay) "dE" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/machinery/airalarm/all_access{ dir = 8; pixel_x = 24 @@ -2063,15 +1982,9 @@ /turf/open/floor/plating, /area/shuttle/abandoned/medbay) "dJ" = ( -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 8; - name = "Frigate Cargo APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /turf/open/floor/iron, /area/shuttle/abandoned/cargo) @@ -2110,9 +2023,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "dM" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -2158,10 +2069,7 @@ /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/bot, -/obj/machinery/power/apc{ - name = "Frigate Medbay APC"; - pixel_y = -23 - }, +/obj/machinery/power/apc/auto_name/south, /obj/structure/spider/stickyweb, /obj/structure/cable, /turf/open/floor/iron/white, @@ -2187,9 +2095,7 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/abandoned/medbay) @@ -2274,10 +2180,7 @@ pixel_y = 4 }, /obj/item/healthanalyzer, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index a1377bd8dee..f3d553299ac 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -25,9 +25,7 @@ /area/shuttle/abandoned) "ae" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/item/stack/sheet/iron, /obj/structure/tank_dispenser, /turf/open/floor/iron/airless, @@ -42,9 +40,7 @@ /area/shuttle/abandoned) "ah" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/broken{ - dir = 4 - }, +/obj/machinery/light/broken/directional/east, /obj/structure/closet/emcloset, /turf/open/floor/iron/airless, /area/shuttle/abandoned) @@ -151,9 +147,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/frame/machine, /obj/item/stack/cable_coil, -/obj/machinery/light/broken{ - dir = 4 - }, +/obj/machinery/light/broken/directional/east, /turf/open/floor/iron/airless, /area/shuttle/abandoned) "aC" = ( @@ -219,10 +213,7 @@ /area/shuttle/abandoned) "aM" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/urinal{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/urinal/directional/east, /obj/structure/window/reinforced/tinted, /turf/open/floor/iron/showroomfloor/airless, /area/shuttle/abandoned) @@ -257,15 +248,12 @@ /area/shuttle/abandoned) "aR" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/showroomfloor/airless, /area/shuttle/abandoned) "aS" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/urinal{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/urinal/directional/east, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -278,7 +266,7 @@ /area/shuttle/abandoned) "aU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/spawner/lootdrop/whiteship_cere_ripley, /turf/open/floor/mech_bay_recharge_floor, /area/shuttle/abandoned) @@ -344,9 +332,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/extinguisher_cabinet{ - pixel_y = 28 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/item/storage/toolbox/emergency, /turf/open/floor/iron/airless, /area/shuttle/abandoned) @@ -369,9 +355,7 @@ "bg" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/item/folder/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -384,9 +368,7 @@ "bh" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 0998fdfc15f..bf25d783750 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -53,9 +53,7 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/cobweb, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) "ag" = ( @@ -71,10 +69,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) @@ -102,9 +97,7 @@ /area/shuttle/abandoned/cargo) "aj" = ( /obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/dirt, @@ -129,26 +122,19 @@ "am" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset/anchored, -/obj/machinery/button/door{ - id = "ntms_exterior"; - name = "NTMS-037 External Lock"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -8; - specialfunctions = 4 - }, /obj/structure/sign/warning/xeno_mining{ pixel_y = 32 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/west{ + id = "ntms_exterior"; + name = "NTMS-037 External Lock"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/cargo) "an" = ( @@ -159,11 +145,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/power/apc{ - dir = 8; - name = "Salvage Ship Cargo APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/mineral/titanium/yellow, @@ -209,13 +191,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/cargo) "ar" = ( @@ -355,18 +333,16 @@ dir = 4; pixel_x = -24 }, +/obj/machinery/button/door/directional/north{ + id = "whiteship_port"; + name = "Cargo Bay Control" + }, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) "aF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/button/door{ - id = "whiteship_port"; - name = "Cargo Bay Control"; - pixel_x = -24; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 6 }, @@ -431,9 +407,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aM" = ( @@ -449,7 +423,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aN" = ( -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/tank/air, /obj/effect/turf_decal/bot, @@ -727,7 +701,7 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/cargo) @@ -742,9 +716,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/yellow, @@ -781,10 +753,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/cargo) "bs" = ( @@ -795,9 +764,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/tank/internals/emergency_oxygen, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) "bt" = ( @@ -858,12 +825,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) "by" = ( @@ -884,10 +847,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bz" = ( @@ -903,10 +863,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/power/apc{ - name = "Salvage Ship Engineering APC"; - pixel_y = -24 - }, +/obj/machinery/power/apc/auto_name/south, /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -917,9 +874,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bB" = ( @@ -930,7 +885,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bC" = ( @@ -960,10 +915,7 @@ /obj/structure/rack, /obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -994,9 +946,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, /area/shuttle/abandoned/cargo) @@ -1027,9 +977,7 @@ /area/shuttle/abandoned/bridge) "bQ" = ( /obj/structure/table, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/item/folder/yellow{ @@ -1054,11 +1002,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned/bridge) "bS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "NTMS-037 Bridge APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -1068,9 +1012,7 @@ /area/shuttle/abandoned/bridge) "bT" = ( /obj/structure/table, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/recharger, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/bridge) @@ -1097,9 +1039,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/bedsheet/brown, /turf/open/floor/wood, @@ -1115,9 +1055,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/bedsheet/brown, /obj/effect/decal/cleanable/greenglow, @@ -1174,9 +1112,7 @@ /obj/machinery/computer/shuttle/white_ship/bridge{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/bot, /obj/machinery/airalarm/all_access{ dir = 4; @@ -1232,9 +1168,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -1281,12 +1215,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/trash/syndi_cakes, /obj/item/organ/stomach, -/obj/machinery/firealarm{ - pixel_y = 26 - }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/showroomfloor, /area/shuttle/abandoned/bar) "co" = ( @@ -1311,13 +1241,8 @@ color = "#c45c57"; dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/carpet, /area/shuttle/abandoned/crew) "cr" = ( @@ -1408,10 +1333,7 @@ pixel_y = 6; req_access = null }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -6 - }, +/obj/machinery/light_switch/directional/east, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned/bridge) "cA" = ( @@ -1492,11 +1414,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "NTMS-037 Crew Quarters APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 1 }, @@ -1663,7 +1581,7 @@ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/showroomfloor, /area/shuttle/abandoned/bar) "cV" = ( @@ -1674,13 +1592,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/crew) "cW" = ( @@ -1706,9 +1619,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/crew) "cY" = ( @@ -1726,7 +1637,7 @@ anchored = 1; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/machinery/computer/security/telescreen{ dir = 1; name = "NTMS-037 Monitor"; @@ -1757,11 +1668,7 @@ /obj/machinery/microwave{ pixel_y = 5 }, -/obj/machinery/power/apc{ - dir = 8; - name = "NTMS-037 Saloon APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/bar) diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index a2c40b1de3f..46ea40fa84b 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -90,11 +90,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/west{ id = "whiteship_port"; - name = "Port Blast Door Control"; - pixel_x = -24; - pixel_y = 5 + name = "Port Blast Door Control" }, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -154,11 +152,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/east{ id = "whiteship_port"; - name = "Port Blast Door Control"; - pixel_x = 24; - pixel_y = 5 + name = "Port Blast Door Control" }, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -167,9 +163,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/crew) "au" = ( @@ -194,9 +188,7 @@ "av" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/item/bedsheet/brown, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -626,11 +618,9 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/crew) "ba" = ( -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -671,9 +661,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/crew) "be" = ( -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -705,10 +693,7 @@ /area/shuttle/abandoned/engine) "bh" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/table, /obj/item/storage/toolbox/mechanical{ pixel_y = 4 @@ -729,7 +714,7 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -871,10 +856,7 @@ /obj/structure/bedsheetbin, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - name = "Salvage Ship Crew Quarters APC"; - pixel_y = -23 - }, +/obj/machinery/power/apc/auto_name/south, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -912,14 +894,9 @@ /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bz" = ( -/obj/machinery/light/built{ - dir = 8 - }, +/obj/machinery/light/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/closet/crate/internals, /obj/item/tank/internals/oxygen{ pixel_x = -3; @@ -956,9 +933,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "bC" = ( -/obj/machinery/light/built{ - dir = 4 - }, +/obj/machinery/light/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/all_access{ dir = 8; @@ -991,7 +966,7 @@ /area/shuttle/abandoned/bar) "bF" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/structure/curtain, /obj/machinery/shower{ pixel_y = 15 @@ -1008,9 +983,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/crew) "bH" = ( @@ -1083,9 +1056,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "bM" = ( -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/machinery/microwave, @@ -1132,11 +1103,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 1; - name = "Salvage Ship Bar APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -1155,9 +1122,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "bP" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt/dust, @@ -1190,10 +1155,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/stripes/white/corner{ dir = 8 }, @@ -1309,9 +1271,7 @@ /area/shuttle/abandoned/bar) "cd" = ( /obj/structure/table, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/item/paper_bin{ pixel_x = -4 @@ -1319,11 +1279,7 @@ /obj/item/pen{ pixel_x = -4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "Salvage Ship Bridge APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/item/camera{ pixel_x = 12; pixel_y = 6 @@ -1393,9 +1349,7 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -1675,18 +1629,13 @@ /area/shuttle/abandoned/bar) "cC" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/abandoned/bar) "cD" = ( /obj/structure/table, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/off{ pixel_x = 6; @@ -1700,10 +1649,7 @@ /area/shuttle/abandoned/bridge) "cE" = ( /obj/structure/table, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, @@ -1720,19 +1666,17 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - id = "whiteship_bridge"; - name = "Bridge Blast Door Control"; - pixel_x = 5; - pixel_y = -24 - }, -/obj/machinery/button/door{ +/obj/effect/turf_decal/tile/blue, +/obj/machinery/button/door/directional/south{ id = "whiteship_windows"; name = "Windows Blast Door Control"; - pixel_x = -5; - pixel_y = -24 + pixel_x = -8 + }, +/obj/machinery/button/door/directional/south{ + id = "whiteship_bridge"; + name = "Bridge Blast Door Control"; + pixel_x = 6 }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "cG" = ( @@ -1760,9 +1704,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/engine) "cI" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -1783,11 +1725,7 @@ /area/shuttle/abandoned/engine) "cJ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - dir = 8; - name = "Salvage Ship Cargo APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1863,9 +1801,7 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "cO" = ( -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/vending/cigarette, /obj/effect/decal/cleanable/dirt/dust, @@ -1886,9 +1822,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/bar) "cP" = ( -/obj/machinery/light/built{ - dir = 8 - }, +/obj/machinery/light/built/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/all_access{ @@ -1922,15 +1856,10 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "cS" = ( -/obj/machinery/light/built{ - dir = 4 - }, +/obj/machinery/light/built/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "cT" = ( @@ -1987,9 +1916,7 @@ /area/shuttle/abandoned/engine) "cY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/bot, /obj/structure/table, /obj/machinery/cell_charger, @@ -2007,9 +1934,7 @@ /obj/machinery/airalarm/all_access{ pixel_y = 24 }, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/directional/north, /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -2160,9 +2085,7 @@ "dk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/cafeteria, /area/shuttle/abandoned/bar) @@ -2304,7 +2227,7 @@ /turf/open/floor/iron/dark, /area/shuttle/abandoned/bar) "dy" = ( -/obj/machinery/light/small/built, +/obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/all_access{ dir = 1; @@ -2439,10 +2362,7 @@ /area/shuttle/abandoned/engine) "dJ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc{ - name = "Salvage Ship Engineering APC"; - pixel_y = -23 - }, +/obj/machinery/power/apc/auto_name/south, /obj/structure/closet/crate, /obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ @@ -2613,11 +2533,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/west{ id = "whiteship_starboard"; - name = "Starboard Blast Door Control"; - pixel_x = -24; - pixel_y = -5 + name = "Starboard Blast Door Control" }, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -2633,11 +2551,9 @@ /obj/effect/turf_decal/box/white/corners, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/east{ id = "whiteship_starboard"; - name = "Starboard Blast Door Control"; - pixel_x = 24; - pixel_y = -5 + name = "Starboard Blast Door Control" }, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -2652,17 +2568,12 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /turf/open/floor/plating, /area/shuttle/abandoned/bar) "ed" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -2694,16 +2605,12 @@ pixel_x = -3; pixel_y = 6 }, -/obj/machinery/light/small/built{ - dir = 4 - }, +/obj/machinery/light/small/built/directional/east, /turf/open/floor/iron, /area/shuttle/abandoned/bar) "ef" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/directional/west, /obj/machinery/hydroponics/constructable, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/green{ @@ -2717,10 +2624,7 @@ "eg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/hydroponics/constructable, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index 8d23105ecdd..c06a29e03f1 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -125,7 +125,7 @@ /area/shuttle/abandoned/engine) "at" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red, +/obj/machinery/light/red/directional/south, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/engine) "au" = ( @@ -184,16 +184,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/cargo) "aE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 1 - }, +/obj/machinery/light/red/directional/north, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/abandoned/cargo) "aF" = ( @@ -231,10 +227,7 @@ "aK" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/cargo) "aL" = ( @@ -661,7 +654,7 @@ /area/shuttle/abandoned/cargo) "bT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red, +/obj/machinery/light/red/directional/south, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/abandoned/cargo) "bU" = ( @@ -686,19 +679,15 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 8 - }, -/obj/machinery/button/door{ +/obj/machinery/light/red/directional/west, +/obj/machinery/button/door/directional/west{ id = "whiteship_blastdoor_bottomleft"; name = "Cargo Hold Access Toggle"; - pixel_x = -24; pixel_y = -8 }, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/west{ id = "whiteship_blastdoor_topleft"; name = "Cargo Hold Access Toggle"; - pixel_x = -24; pixel_y = 8 }, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -764,19 +753,15 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 4 - }, -/obj/machinery/button/door{ +/obj/machinery/light/red/directional/east, +/obj/machinery/button/door/directional/east{ id = "whiteship_blastdoor_topright"; name = "Cargo Hold Access Toggle"; - pixel_x = 24; pixel_y = 8 }, -/obj/machinery/button/door{ +/obj/machinery/button/door/directional/east{ id = "whiteship_blastdoor_bottomright"; name = "Cargo Hold Access Toggle"; - pixel_x = 24; pixel_y = -8 }, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -797,9 +782,7 @@ /area/shuttle/abandoned/cargo) "ch" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 1 - }, +/obj/machinery/light/red/directional/north, /obj/structure/cable, /obj/effect/spawner/lootdrop/garbage_spawner, /turf/open/floor/mineral/titanium/tiled, @@ -943,9 +926,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/cargo) "cx" = ( @@ -982,14 +963,12 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/closet/crate, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/cargo) "cC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red, +/obj/machinery/light/red/directional/south, /obj/structure/sign/departments/medbay/alt{ pixel_y = -32 }, @@ -998,7 +977,7 @@ "cD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/machinery/light/small/red, +/obj/machinery/light/small/red/directional/south, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/cargo) "cE" = ( @@ -1017,17 +996,14 @@ /area/shuttle/abandoned/cargo) "cG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red, +/obj/machinery/light/red/directional/south, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/abandoned/cargo) "cH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/closet/crate, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/titanium/tiled/yellow, /area/shuttle/abandoned/cargo) "cI" = ( @@ -1059,9 +1035,7 @@ /area/template_noop) "cN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 1 - }, +/obj/machinery/light/red/directional/north, /obj/machinery/power/apc/auto_name/west, /obj/structure/cable, /obj/structure/table, @@ -1128,9 +1102,7 @@ "cW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/optable, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/abandoned/medbay) "cX" = ( @@ -1224,9 +1196,7 @@ /area/shuttle/abandoned/medbay) "de" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red{ - dir = 8 - }, +/obj/machinery/light/red/directional/west, /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/abandoned/bridge) "df" = ( @@ -1378,7 +1348,7 @@ /area/shuttle/abandoned/medbay) "dy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/red, +/obj/machinery/light/red/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 5 },