From c1cb86dc940c98211796873a0daa2f9ad0322aaa Mon Sep 17 00:00:00 2001 From: dragomagol <66640614+dragomagol@users.noreply.github.com> Date: Thu, 13 May 2021 17:11:21 -0700 Subject: [PATCH] mining, pirate, and ruin wall mount conversion (#58966) --- _maps/shuttles/mining_box.dmm | 4 +- _maps/shuttles/mining_common_kilo.dmm | 13 +- _maps/shuttles/mining_common_meta.dmm | 4 +- _maps/shuttles/mining_delta.dmm | 16 +-- _maps/shuttles/mining_freight.dmm | 13 +- _maps/shuttles/mining_kilo.dmm | 37 ++---- _maps/shuttles/mining_large.dmm | 15 +-- _maps/shuttles/pirate_default.dmm | 119 ++++++------------ _maps/shuttles/pirate_dutchman.dmm | 28 ++--- _maps/shuttles/pirate_silverscale.dmm | 65 +++------- _maps/shuttles/ruin_caravan_victim.dmm | 113 ++++++----------- _maps/shuttles/ruin_pirate_cutter.dmm | 118 +++++++---------- _maps/shuttles/ruin_syndicate_dropship.dmm | 55 ++------ .../shuttles/ruin_syndicate_fighter_shiv.dmm | 7 +- 14 files changed, 190 insertions(+), 417 deletions(-) diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index e18f0f30d3e..4cfb962c0e4 100644 --- a/_maps/shuttles/mining_box.dmm +++ b/_maps/shuttles/mining_box.dmm @@ -24,9 +24,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "g" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium, /area/shuttle/mining) "h" = ( diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm index 45073a2cc96..5942996893f 100644 --- a/_maps/shuttles/mining_common_kilo.dmm +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -19,9 +19,7 @@ "e" = ( /obj/structure/table, /obj/item/radio, -/obj/item/radio/intercom{ - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining) "f" = ( @@ -53,9 +51,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/mining) "j" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -108,10 +104,7 @@ "o" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining) "p" = ( diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm index f04f8e1a3b2..58071107f50 100644 --- a/_maps/shuttles/mining_common_meta.dmm +++ b/_maps/shuttles/mining_common_meta.dmm @@ -24,9 +24,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "g" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium, /area/shuttle/mining) "h" = ( diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm index 41ca79e7b3b..1f99646205f 100644 --- a/_maps/shuttles/mining_delta.dmm +++ b/_maps/shuttles/mining_delta.dmm @@ -12,9 +12,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/shuttle/mining) "d" = ( @@ -35,9 +33,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/shuttle/mining) "f" = ( @@ -247,9 +243,7 @@ /obj/item/pickaxe/emergency, /obj/item/pickaxe/emergency, /obj/effect/turf_decal/delivery, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/shuttle/mining) "r" = ( @@ -270,9 +264,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/shuttle/mining) "t" = ( diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm index 67e1b6b35c7..3a9b104b725 100644 --- a/_maps/shuttles/mining_freight.dmm +++ b/_maps/shuttles/mining_freight.dmm @@ -19,9 +19,7 @@ "e" = ( /obj/structure/table, /obj/item/radio, -/obj/item/radio/intercom{ - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining) "f" = ( @@ -50,9 +48,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/mining) "j" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -106,10 +102,7 @@ "o" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining) "p" = ( diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm index 6ab1e810829..be1d2ddd3ec 100644 --- a/_maps/shuttles/mining_kilo.dmm +++ b/_maps/shuttles/mining_kilo.dmm @@ -76,7 +76,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "m" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -89,10 +89,8 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/mining/large) "o" = ( -/obj/machinery/light/small, -/obj/item/radio/intercom{ - pixel_y = -29 - }, +/obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -109,10 +107,7 @@ pixel_y = 18 }, /obj/structure/table, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 22 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "q" = ( @@ -175,19 +170,14 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "u" = ( /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "v" = ( @@ -204,9 +194,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining/large) "x" = ( @@ -299,12 +287,7 @@ /turf/open/floor/plating, /area/shuttle/mining/large) "J" = ( -/obj/machinery/power/apc/highcap{ - dir = 4; - locked = 0; - name = "Mining Shuttle APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/auto_name/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/turf_decal/bot, @@ -324,9 +307,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/binary/pump{ dir = 1 }, diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm index 29295e0dc4b..32f1fbe21a4 100644 --- a/_maps/shuttles/mining_large.dmm +++ b/_maps/shuttles/mining_large.dmm @@ -151,7 +151,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/corner, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -184,7 +184,7 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/item/radio/intercom{ pixel_y = -29 }, @@ -356,7 +356,7 @@ /turf/open/floor/iron/dark, /area/shuttle/mining/large) "y" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/box/white/corners, /turf/open/floor/iron/dark, /area/shuttle/mining/large) @@ -376,7 +376,7 @@ /turf/open/floor/iron/dark, /area/shuttle/mining/large) "A" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/box/white/corners{ dir = 8 }, @@ -407,12 +407,7 @@ /turf/open/floor/plating, /area/shuttle/mining/large) "E" = ( -/obj/machinery/power/apc/highcap{ - dir = 4; - locked = 0; - name = "Mining Shuttle APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/auto_name/east, /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index bcdf48f14d8..79d0757de10 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -3,9 +3,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/airalarm/all_access{ dir = 4; pixel_x = -24 @@ -84,7 +82,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, /area/shuttle/pirate) "aj" = ( @@ -96,9 +94,7 @@ pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "fridge" @@ -156,23 +152,20 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/button/door{ +/obj/effect/turf_decal/tile/red, +/obj/machinery/button/door/directional/south{ id = "piratebridgebolt"; name = "Bridge Bolt Control"; normaldoorcontrol = 1; - pixel_y = -24; specialfunctions = 4 }, -/obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark, /area/shuttle/pirate) "ao" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/airalarm/all_access{ dir = 8; pixel_x = 24 @@ -278,9 +271,7 @@ /turf/open/floor/iron, /area/shuttle/pirate) "ax" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -315,9 +306,7 @@ /turf/open/floor/iron, /area/shuttle/pirate) "aB" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/computer/monitor/secret{ dir = 8 }, @@ -380,9 +369,7 @@ /turf/open/floor/plating/airless, /area/shuttle/pirate) "aI" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, @@ -418,15 +405,7 @@ /turf/open/floor/wood, /area/shuttle/pirate) "aN" = ( -/obj/machinery/light/small, -/obj/machinery/button/door{ - id = "pirateportexternal"; - name = "External Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -4; - pixel_y = -24; - specialfunctions = 4 - }, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -434,20 +413,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, +/obj/machinery/button/door/directional/south{ + id = "pirateportexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/plating, /area/shuttle/pirate) "aO" = ( -/obj/machinery/light/small, -/obj/machinery/button/door{ - id = "piratestarboardexternal"; - name = "External Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 4; - pixel_y = -24; - specialfunctions = 4 - }, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/south{ + id = "pirateportstarboardexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/plating, /area/shuttle/pirate) "aQ" = ( @@ -490,19 +473,14 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate) "aW" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 4; x_offset = -3; y_offset = 7 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -568,9 +546,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/airalarm/all_access{ pixel_y = 24 }, @@ -590,9 +566,7 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "bo" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, @@ -619,12 +593,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/melee/transforming/energy/sword/pirate{ @@ -642,9 +612,7 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "bu" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -691,9 +659,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -728,7 +694,7 @@ /turf/open/floor/iron, /area/shuttle/pirate) "bI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/machinery/computer/piratepad_control{ dir = 1 }, @@ -756,7 +722,7 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -782,12 +748,7 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate) "bO" = ( -/obj/machinery/power/apc{ - aidisabled = 1; - dir = 1; - name = "Pirate Corvette APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -880,16 +841,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/shuttle/pirate) "dU" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -1013,9 +970,7 @@ "km" = ( /obj/machinery/atmospherics/components/unary/tank/air, /obj/effect/turf_decal/bot, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/pirate) diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index ec45c5cc080..cacb8fa08ff 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -165,9 +165,7 @@ pixel_x = 2; pixel_y = -1 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "be" = ( @@ -324,16 +322,14 @@ /obj/item/restraints/legcuffs/bola, /obj/item/restraints/legcuffs/bola, /obj/item/restraints/legcuffs/bola, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "gS" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/fermenting_barrel/gunpowder, /obj/item/reagent_containers/glass/bucket/wooden, /obj/item/reagent_containers/glass/bucket/wooden, @@ -343,9 +339,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "hV" = ( @@ -463,7 +457,7 @@ name = "wooden railing" }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "uw" = ( @@ -581,7 +575,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/fermenting_barrel/gunpowder, /obj/item/reagent_containers/glass/bucket/wooden, /obj/item/reagent_containers/glass/bucket/wooden, @@ -698,9 +692,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "Gr" = ( @@ -798,9 +790,7 @@ /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "Ms" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/carpet/royalblack/airless, /area/shuttle/pirate/flying_dutchman) "NG" = ( @@ -809,7 +799,7 @@ color = "#4C3117"; name = "wooden railing" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "Oe" = ( diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 6b91973c844..5b5fdcd2bbb 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -36,9 +36,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 1 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/shuttle/pirate) "cH" = ( @@ -94,9 +92,7 @@ /area/shuttle/pirate) "fN" = ( /obj/structure/dresser, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "fT" = ( @@ -173,7 +169,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, /area/shuttle/pirate) "ko" = ( @@ -184,18 +180,14 @@ /obj/structure/toilet{ dir = 8 }, -/obj/structure/mirror{ - pixel_y = 26 - }, +/obj/structure/mirror/directional/north, /obj/structure/sink{ pixel_y = 17 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/shuttle/pirate) "kF" = ( @@ -217,10 +209,7 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate) "lu" = ( -/obj/item/storage/secure/safe{ - pixel_x = 6; - pixel_y = 32 - }, +/obj/item/storage/secure/safe/directional/north, /obj/effect/mob_spawn/human/pirate/silverscale/captain{ dir = 8 }, @@ -288,9 +277,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/pod/dark, /area/shuttle/pirate) "rB" = ( @@ -342,9 +329,7 @@ /area/shuttle/pirate) "xe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/pod/dark, /area/shuttle/pirate) "xj" = ( @@ -396,9 +381,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/pod/dark, /area/shuttle/pirate) "zQ" = ( @@ -435,16 +418,14 @@ /obj/structure/toilet{ dir = 8 }, -/obj/structure/mirror{ - pixel_y = 26 - }, +/obj/structure/mirror/directional/north, /obj/structure/sink{ pixel_y = 17 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/shuttle/pirate) "BK" = ( @@ -506,9 +487,7 @@ /area/shuttle/pirate) "Gy" = ( /obj/structure/table/glass, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/west, /obj/item/reagent_containers/food/drinks/bottle/patron{ pixel_x = -5; pixel_y = 16 @@ -525,9 +504,6 @@ pixel_x = 2; pixel_y = 4 }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, /turf/open/floor/iron/dark, /area/shuttle/pirate) "HD" = ( @@ -585,9 +561,7 @@ /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "Kq" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/shuttle/pirate) "Lk" = ( @@ -700,12 +674,7 @@ /area/shuttle/pirate) "QU" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - aidisabled = 1; - dir = 1; - name = "Pirate Corvette APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /obj/structure/rack, /obj/item/storage/toolbox/mechanical{ pixel_y = 4 @@ -749,9 +718,7 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "RY" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Sh" = ( @@ -856,7 +823,7 @@ /obj/machinery/vending/boozeomat/all_access{ onstation = 0 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "XX" = ( diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 4f4978d0e4d..dc6a7a38e33 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -48,17 +48,16 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "bI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/box/white/corners, -/obj/machinery/button/door{ - id = "caravantrade1_cargo"; - name = "Cargo Blast Door Control"; - pixel_y = -24 - }, /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/diamond{ amount = 5 }, +/obj/machinery/button/door/directional/south{ + id = "caravantrade1_cargo"; + name = "Cargo Blast Door Control" + }, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "bR" = ( @@ -68,7 +67,7 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor{ @@ -234,9 +233,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "lM" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/sign/warning/vacuum{ pixel_x = 32 }, @@ -252,13 +249,8 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "mw" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -311,7 +303,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "pR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -355,9 +347,7 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "sf" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table, /obj/item/stack/package_wrap, /obj/item/crowbar, @@ -384,9 +374,7 @@ "ss" = ( /obj/structure/rack, /obj/item/storage/belt/utility, -/obj/structure/extinguisher_cabinet{ - pixel_y = 29 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, @@ -405,7 +393,7 @@ }, /area/shuttle/caravan/freighter1) "uA" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/dirt, @@ -413,14 +401,6 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/button/door{ - id = "caravantrade1_cabin1"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - pixel_y = 6; - specialfunctions = 4 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -434,6 +414,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/button/door/directional/west{ + id = "caravantrade1_cabin1"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "uS" = ( @@ -485,16 +471,15 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "yC" = ( -/obj/machinery/button/door{ +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/button/door/directional/west{ id = "caravantrade1_bolt"; name = "External Bolt Control"; normaldoorcontrol = 1; - pixel_x = -25; pixel_y = 8; specialfunctions = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron{ initial_gas_mix = "TEMP=2.7" }, @@ -651,13 +636,8 @@ }, /area/shuttle/caravan/freighter1) "EQ" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/blood, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -711,9 +691,7 @@ /turf/template_noop, /area/shuttle/caravan/freighter1) "GJ" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 1 }, @@ -726,9 +704,7 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "Ib" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/machinery/airalarm/all_access{ pixel_y = 24 }, @@ -738,9 +714,7 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "Ja" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/storage/firstaid/regular, @@ -806,7 +780,7 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "Mb" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -902,7 +876,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "PM" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/dirt, @@ -910,14 +884,6 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/button/door{ - id = "caravantrade1_cabin2"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - pixel_y = 6; - specialfunctions = 4 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -931,6 +897,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/button/door/directional/west{ + id = "caravantrade1_cabin2"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "Qk" = ( @@ -941,15 +913,8 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "Qs" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "Small Freighter APC"; - pixel_x = 24; - start_charge = 0 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/power/apc/auto_name/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, @@ -958,9 +923,7 @@ "QY" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/item/stack/cable_coil{ pixel_x = 12; pixel_y = 4 diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 8bcfc4ff87f..1b35635b151 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -121,9 +121,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "hT" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/structure/bed, /obj/item/bedsheet/brown, /turf/open/floor/iron/dark, @@ -207,6 +205,11 @@ }, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) +"js" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/shuttle/caravan/pirate) "jU" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 @@ -288,10 +291,7 @@ pixel_y = 3 }, /obj/item/storage/firstaid/fire, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/shuttle/caravan/pirate) "na" = ( @@ -303,9 +303,7 @@ }, /area/shuttle/caravan/pirate) "nD" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 10 }, @@ -322,9 +320,7 @@ /obj/item/cautery{ pixel_x = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/white/side{ dir = 8 }, @@ -414,9 +410,7 @@ /area/shuttle/caravan/pirate) "pZ" = ( /obj/structure/tank_dispenser/oxygen, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -535,41 +529,33 @@ "vq" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/side{ dir = 6 }, /area/shuttle/caravan/pirate) "vW" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/plating, /area/shuttle/caravan/pirate) "wL" = ( -/obj/machinery/button/door{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/button/door/directional/north{ id = "caravanpirate_bolt_port"; name = "External Bolt Control"; normaldoorcontrol = 1; - pixel_x = -4; - pixel_y = 25; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, /turf/open/floor/iron/white/side{ dir = 1 }, /area/shuttle/caravan/pirate) "wX" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -635,14 +621,6 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "zB" = ( -/obj/machinery/button/door{ - id = "caravanpirate_bolt_starboard"; - name = "External Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -4; - pixel_y = -25; - specialfunctions = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -650,6 +628,12 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/button/door/directional/south{ + id = "caravanpirate_bolt_starboard"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/iron, /area/shuttle/caravan/pirate) "Ag" = ( @@ -683,8 +667,14 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/caravan/pirate) "Bi" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "caravanpirate_bridge" + }, +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, +/area/shuttle/caravan/pirate) +"BC" = ( +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ id = "caravanpirate_bridge" }, @@ -692,10 +682,7 @@ /area/shuttle/caravan/pirate) "BI" = ( /obj/structure/table, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/item/stack/spacecash/c200, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) @@ -789,9 +776,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "GQ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 }, @@ -896,9 +881,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/pirate) "NM" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/closet/crate/secure/loot, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -959,9 +942,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "Sd" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/structure/sign/warning/vacuum{ pixel_x = -32 }, @@ -989,10 +970,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "UP" = ( @@ -1005,7 +983,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "Wb" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/structure/bed, /obj/item/bedsheet/brown, /turf/open/floor/iron/dark, @@ -1118,7 +1096,7 @@ Jv af Gh kY -vW +js fh Cb hI @@ -1205,7 +1183,7 @@ oL "} (10,1,1) = {" Jv -Bi +BC Ld nD bH @@ -1362,7 +1340,7 @@ Bi oO EB bd -Bi +BC Jv Jv Jv @@ -1373,11 +1351,11 @@ Jv Jv Jv Jv -Bi -Bi +BC +BC fL -Bi -Bi +BC +BC Jv Jv Jv @@ -1389,9 +1367,9 @@ Jv Jv Jv Jv -Bi -Bi -Bi +BC +BC +BC Jv Jv Jv diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 1fdc4c86f48..e8047499d43 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -8,22 +8,15 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "bo" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "bB" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/button/door{ +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/west{ id = "caravansyndicate3_bolt_starboard"; name = "External Bolt Control"; normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -6; req_access_txt = "150"; specialfunctions = 4 }, @@ -94,9 +87,7 @@ /area/shuttle/caravan/syndicate3) "hF" = ( /obj/structure/chair/comfy/shuttle, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/power/apc/syndicate{ dir = 8; name = "Syndicate Drop Ship APC"; @@ -110,9 +101,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/caravan/syndicate3) @@ -220,9 +209,7 @@ "uy" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -262,15 +249,11 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/syndicate3) "xC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/button/door{ +/obj/machinery/light/small/directional/west, +/obj/machinery/button/door/directional/west{ id = "caravansyndicate3_bolt_port"; name = "External Bolt Control"; normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 6; req_access_txt = "150"; specialfunctions = 4 }, @@ -287,10 +270,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/caravan/syndicate3) @@ -298,9 +278,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/syndicate{ @@ -451,9 +429,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/structure/closet/syndicate{ anchored = 1 }, @@ -498,9 +474,7 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -608,10 +582,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "ZZ" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 26e1c1d8d55..abcc874d6f9 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -41,16 +41,15 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/caravan/syndicate1) "uW" = ( -/obj/machinery/button/door{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1, +/obj/machinery/button/door/directional/west{ id = "caravansyndicate1_bolt"; name = "External Bolt Control"; normaldoorcontrol = 1; - pixel_x = -25; req_access_txt = "150"; specialfunctions = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/caravan/syndicate1) "vD" = (