From 945bff2c1062699bd7ae46b9ac55f1dc035e2e38 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 8 May 2021 15:46:01 +0200 Subject: [PATCH] [MIRROR] The Wallening Approacheth: Adds directional variants to most wall mounts (#5551) * The Wallening Approacheth: Adds directional variants to most wall mounts * Update reagent_dispenser.dm * Update CentCom_skyrat.dmm Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com> Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com> Co-authored-by: KathrinBailey --- _maps/map_files/Mining/Lavaland.dmm | 501 +- _maps/map_files/generic/CentCom.dmm | 1953 +++--- _maps/map_files/generic/CentCom_skyrat.dmm | 5741 ++++++++--------- code/game/machinery/bounty_board.dm | 16 + code/game/machinery/buttons.dm | 17 +- code/game/machinery/computer/camera.dm | 16 + code/game/machinery/defibrillator_mount.dm | 32 + code/game/machinery/flasher.dm | 16 + code/game/machinery/igniter.dm | 16 + code/game/machinery/lightswitch.dm | 16 + code/game/machinery/requests_console.dm | 16 + code/game/machinery/status_display.dm | 33 + code/game/objects/items/storage/secure.dm | 16 + code/game/objects/structures/extinguisher.dm | 16 + code/game/objects/structures/fireaxe.dm | 16 + code/game/objects/structures/mirror.dm | 16 + code/game/objects/structures/noticeboard.dm | 16 + code/game/objects/structures/watercloset.dm | 16 + code/modules/mining/aux_base.dm | 16 + code/modules/paperwork/ticketmachine.dm | 16 + code/modules/power/lighting.dm | 242 +- code/modules/reagents/reagent_dispenser.dm | 32 +- .../security_levels/keycard_authentication.dm | 16 + code/modules/vending/medical_wall.dm | 16 + 24 files changed, 4356 insertions(+), 4451 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 68c15c4ddda..7f90d05af43 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -119,19 +119,6 @@ "aw" = ( /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors/explored) -"ax" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/bounty_board{ - dir = 4; - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/mine/production) "ay" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -168,9 +155,7 @@ "aE" = ( /obj/machinery/vending/sustenance, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/mine/laborcamp) "aF" = ( @@ -220,7 +205,7 @@ /area/mine/laborcamp) "aQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/mine/laborcamp) "aS" = ( @@ -276,16 +261,13 @@ /turf/open/floor/iron, /area/mine/laborcamp) "aZ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/north{ id = "labor"; name = "Labor Camp Lockdown"; - pixel_y = 28; req_access_txt = "2" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) "ba" = ( @@ -339,9 +321,7 @@ /turf/open/floor/iron, /area/mine/laborcamp) "bj" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, +/obj/machinery/status_display/evac/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) @@ -415,10 +395,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/mine/eva) "bt" = ( @@ -432,9 +409,6 @@ /turf/open/floor/iron, /area/mine/eva) "bu" = ( -/obj/machinery/light_switch{ - pixel_x = 27 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -443,12 +417,11 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron, /area/mine/eva) "bv" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) "bw" = ( @@ -467,26 +440,17 @@ /area/mine/laborcamp) "by" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 1; - name = "Labor Camp APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/plating, /area/mine/laborcamp) "bB" = ( /obj/structure/toilet{ dir = 8 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/mine/laborcamp/security) "bC" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/machinery/computer/shuttle/mining{ req_access = null }, @@ -496,12 +460,11 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/mine/production) "bD" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/mech_bay_recharge_floor, /area/mine/mechbay) "bE" = ( @@ -519,9 +482,7 @@ dir = 4; network = list("mine") }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; @@ -541,23 +502,18 @@ /turf/open/floor/iron, /area/mine/eva) "bJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/tile/purple{ dir = 8 }, /turf/open/floor/iron, /area/mine/eva) "bK" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, /obj/machinery/shower{ dir = 8 }, /obj/effect/turf_decal/tile/purple, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/mine/eva) "bL" = ( @@ -753,11 +709,6 @@ /turf/open/floor/iron, /area/mine/production) "co" = ( -/obj/machinery/power/apc{ - name = "Mining EVA APC"; - pixel_x = 1; - pixel_y = -23 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -767,6 +718,7 @@ /obj/item/stack/package_wrap, /obj/item/stack/package_wrap, /obj/item/hand_labeler, +/obj/machinery/power/apc/auto_name/south, /turf/open/floor/iron, /area/mine/eva) "cp" = ( @@ -840,9 +792,7 @@ /turf/open/floor/iron, /area/mine/production) "cG" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/closet/secure_closet/freezer/gulag_fridge, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -872,9 +822,7 @@ /turf/open/floor/plating, /area/mine/production) "cK" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/mine/production) "cL" = ( @@ -885,27 +833,21 @@ /turf/closed/wall, /area/mine/living_quarters) "cO" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = -28 - }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/mine/production) "cP" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/mine/production) "cQ" = ( @@ -923,9 +865,7 @@ /turf/open/floor/plating, /area/mine/living_quarters) "cT" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/structure/closet/crate/secure/loot, /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -946,15 +886,7 @@ /turf/open/floor/plating, /area/mine/living_quarters) "cX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Mining Station Starboard Wing APC"; - pixel_x = -25; - pixel_y = 2 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -962,6 +894,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/west, /turf/open/floor/iron, /area/mine/production) "cZ" = ( @@ -984,20 +917,15 @@ /area/mine/production) "dc" = ( /obj/structure/closet/crate, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/effect/turf_decal/bot, /obj/item/food/mint, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/mine/production) "dd" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, /obj/structure/table, /obj/item/paper/fluff/stations/lavaland/orm_notice, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/mine/production) "de" = ( @@ -1013,21 +941,14 @@ /turf/open/floor/circuit, /area/mine/maintenance) "dh" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Mining Communications APC"; - pixel_x = 1; - pixel_y = 23 - }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron/dark, /area/mine/maintenance) "di" = ( /obj/machinery/telecomms/relay/preset/mining, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1045,18 +966,11 @@ /turf/open/floor/iron/dark, /area/mine/maintenance) "dk" = ( -/obj/machinery/airalarm{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/circuit, /area/mine/maintenance) "dl" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -1064,6 +978,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/mine/living_quarters) "dm" = ( @@ -1145,9 +1060,7 @@ /turf/open/floor/iron, /area/mine/production) "dw" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/mine/production) @@ -1170,12 +1083,10 @@ /turf/open/floor/iron/dark, /area/mine/maintenance) "dz" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 9 }, +/obj/machinery/light_switch/directional/south, /turf/open/floor/circuit, /area/mine/maintenance) "dA" = ( @@ -1262,22 +1173,17 @@ /turf/open/floor/iron, /area/mine/production) "dK" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Shuttle Docking Foyer"; dir = 8; network = list("mine") }, -/obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = 1 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/mine/production) "dM" = ( @@ -1290,15 +1196,11 @@ dir = 8; network = list("mine") }, -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = 28 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/mine/production) "dO" = ( @@ -1418,9 +1320,7 @@ /turf/open/floor/iron, /area/mine/living_quarters) "ee" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "ef" = ( @@ -1435,20 +1335,12 @@ /turf/open/floor/iron, /area/mine/living_quarters) "eg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Mining Station Port Wing APC"; - pixel_x = 1; - pixel_y = 23 - }, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron, /area/mine/living_quarters) "eh" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "ei" = ( @@ -1477,9 +1369,7 @@ /turf/open/floor/iron, /area/mine/living_quarters) "em" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -1670,11 +1560,11 @@ /turf/open/floor/iron, /area/mine/living_quarters) "eM" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/mine/living_quarters) "eO" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -1701,18 +1591,15 @@ /turf/open/floor/iron, /area/mine/living_quarters) "eS" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, /obj/machinery/mineral/equipment_vendor, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/mine/production) "eT" = ( /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -1759,42 +1646,31 @@ dir = 10; id = "mining_internal" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plating, /area/mine/production) "fa" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, /obj/structure/chair, +/obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "fb" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/chair, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "fc" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "fd" = ( @@ -1817,9 +1693,7 @@ "fe" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/machinery/airalarm{ - pixel_y = 23 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/carpet, /area/mine/living_quarters) "ff" = ( @@ -1829,6 +1703,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 6 }, +/obj/machinery/button/door/directional/north{ + id = "miningdorm1"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/carpet, /area/mine/living_quarters) "fg" = ( @@ -1885,13 +1764,11 @@ /area/mine/living_quarters) "fm" = ( /obj/machinery/vending/cigarette, -/obj/machinery/newscaster{ - pixel_y = 32 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/mine/living_quarters) "fn" = ( @@ -1912,36 +1789,16 @@ /turf/open/floor/iron, /area/mine/living_quarters) "fq" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = 28 - }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/mine/living_quarters) "fr" = ( /obj/structure/table, /turf/open/floor/carpet, /area/mine/living_quarters) -"fs" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "miningdorm1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/mine/living_quarters) "ft" = ( /obj/machinery/camera{ c_tag = "Dormitories"; @@ -2069,15 +1926,11 @@ /turf/open/floor/iron, /area/mine/living_quarters) "fI" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = -28 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/mine/living_quarters) "fJ" = ( @@ -2086,10 +1939,8 @@ dir = 1; network = list("mine") }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -2097,14 +1948,11 @@ /turf/open/floor/iron, /area/mine/living_quarters) "fK" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/mine/living_quarters) "fL" = ( @@ -2118,26 +1966,8 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) -"fM" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "miningdorm2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/mine/living_quarters) "fN" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -2158,16 +1988,7 @@ /turf/open/floor/iron, /area/mine/living_quarters) "fP" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "miningdorm3"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -2704,9 +2525,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "jV" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -3477,10 +3296,6 @@ /area/lavaland/surface/outdoors) "nj" = ( /obj/structure/chair/stool, -/obj/machinery/flasher{ - id = "GulagCell 1"; - pixel_x = -28 - }, /obj/structure/sign/poster/official/obey{ pixel_y = 32 }, @@ -3488,6 +3303,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/machinery/flasher/directional/west{ + id = "GulagCell 1" + }, /turf/open/floor/iron, /area/mine/laborcamp) "nm" = ( @@ -3505,11 +3323,7 @@ "nA" = ( /obj/machinery/computer/mech_bay_power_console, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 1; - name = "Mining Station Mech Bay APC"; - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron, /area/mine/mechbay) "nF" = ( @@ -3604,18 +3418,14 @@ /turf/open/floor/iron, /area/mine/laborcamp/security) "po" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/production) "pr" = ( /obj/structure/toilet{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/mine/laborcamp) "ps" = ( @@ -3641,6 +3451,16 @@ }, /turf/open/floor/iron, /area/mine/mechbay) +"pH" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/bounty_board/directional/west, +/turf/open/floor/iron, +/area/mine/production) "pR" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3686,9 +3506,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/cafeteria, /area/mine/laborcamp) "qt" = ( @@ -3771,19 +3589,17 @@ /turf/open/floor/plating, /area/mine/laborcamp) "ss" = ( -/obj/machinery/button/door{ - id = "miningbathroom"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/machinery/button/door/directional/south{ + id = "miningbathroom"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/iron/freezer, /area/mine/living_quarters) "su" = ( @@ -3817,9 +3633,7 @@ /turf/open/floor/plating, /area/mine/laborcamp/security) "tI" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -3856,7 +3670,7 @@ /turf/open/floor/iron, /area/mine/laborcamp) "uG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -3948,9 +3762,6 @@ req_access = list(54) }, /obj/structure/cable, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -3958,6 +3769,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/mine/mechbay) "wE" = ( @@ -3967,11 +3779,23 @@ /area/mine/laborcamp) "wQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/mine/laborcamp) +"wZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "miningdorm2"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/carpet, +/area/mine/living_quarters) "xi" = ( /obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, @@ -3988,9 +3812,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -4030,9 +3852,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Labor Camp Cell 3"; @@ -4045,15 +3865,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "Labor Camp Security APC"; - pixel_y = 23 - }, +/obj/machinery/light/directional/north, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron, /area/mine/laborcamp/security) "zn" = ( @@ -4190,14 +4004,12 @@ /turf/open/floor/iron, /area/mine/living_quarters) "Dh" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/mine/living_quarters) "Dr" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/laborcamp) "Dv" = ( @@ -4211,9 +4023,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Labor Camp Cell 1"; @@ -4283,9 +4093,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/mine/living_quarters) "FF" = ( @@ -4436,9 +4244,7 @@ /turf/open/floor/iron/dark, /area/mine/laborcamp) "Je" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) @@ -4478,6 +4284,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/living_quarters) +"Kc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "miningdorm3"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/carpet, +/area/mine/living_quarters) "Kv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -4590,9 +4410,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Labor Camp Cell 2"; @@ -4615,7 +4433,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/mine/laborcamp) "OX" = ( @@ -4755,9 +4573,8 @@ /area/mine/laborcamp/security) "QX" = ( /obj/structure/chair/stool, -/obj/machinery/flasher{ - id = "GulagCell 3"; - pixel_x = -28 +/obj/machinery/flasher/directional/west{ + id = "GulagCell 3" }, /obj/structure/sign/poster/official/obey{ pixel_y = 32 @@ -4776,12 +4593,10 @@ /obj/machinery/shower{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/mine/production) "RO" = ( @@ -4794,10 +4609,6 @@ /area/mine/living_quarters) "RY" = ( /obj/structure/chair/stool, -/obj/machinery/flasher{ - id = "GulagCell 2"; - pixel_x = -28 - }, /obj/structure/sign/poster/official/work_for_a_future{ pixel_y = 32 }, @@ -4805,6 +4616,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/machinery/flasher/directional/west{ + id = "GulagCell 2" + }, /turf/open/floor/iron, /area/mine/laborcamp) "Sd" = ( @@ -4815,9 +4629,7 @@ /obj/effect/turf_decal/tile/green, /obj/effect/decal/cleanable/dirt, /obj/item/seeds/redbeet, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/mine/laborcamp) "SJ" = ( @@ -4831,17 +4643,14 @@ /turf/open/floor/iron, /area/mine/living_quarters) "Tb" = ( -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/north{ prison_radio = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) "Tn" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -4857,9 +4666,7 @@ /area/mine/living_quarters) "TJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 1 }, @@ -4972,15 +4779,13 @@ /area/mine/living_quarters) "UV" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/mine/laborcamp) "UX" = ( @@ -5109,10 +4914,7 @@ /area/mine/production) "Xb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -5168,8 +4970,7 @@ /turf/open/floor/iron, /area/mine/laborcamp) "YY" = ( -/obj/machinery/camera{ - c_tag = "Crew Area Hallway West"; +/obj/machinery/camera/autoname{ dir = 1; network = list("mine") }, @@ -5211,13 +5012,11 @@ /turf/open/floor/iron, /area/mine/laborcamp) "Zs" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/mine/laborcamp) "ZD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Labor Camp Showers"; dir = 1; @@ -14459,12 +14258,12 @@ YA dZ cM ff -fs +fP cM -ff -fM +wZ +fP cM -ff +Kc fP cM aj @@ -20362,7 +20161,7 @@ cl cH cO cX -ax +pH dJ ia cn diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2f2b33c0abb..ba4ff71eec2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -86,6 +86,14 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"aP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/evac) "aW" = ( /obj/machinery/door/poddoor{ id = "thunderdomehea"; @@ -115,6 +123,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/centcom/control) +"da" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/control) "dn" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -122,6 +145,13 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"dp" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/grimy, +/area/centcom/control) "dK" = ( /obj/machinery/door/poddoor{ id = "thunderdomegen"; @@ -129,6 +159,23 @@ }, /turf/open/floor/iron/dark, /area/tdome/arena_source) +"dR" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/control) "ev" = ( /obj/structure/rack, /obj/item/clothing/under/color/green, @@ -172,11 +219,30 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"fa" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/ferry) +"fj" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/wood, +/area/centcom/ferry) "fx" = ( /obj/machinery/igniter/on, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/tdome/arena_source) +"fE" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/evac) "fR" = ( /obj/item/food/egg/rainbow{ desc = "I bet you think you're pretty clever... well you are."; @@ -211,12 +277,30 @@ "hH" = ( /turf/open/floor/holofloor/hyperspace, /area/space) +"hU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/control) "il" = ( /turf/closed/indestructible/riveted, /area/centcom/prison) "im" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, /area/centcom/control) "in" = ( /obj/structure/sign/nanotrasen, @@ -226,8 +310,11 @@ /turf/closed/indestructible/riveted, /area/centcom/control) "ip" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, /area/centcom/control) "iq" = ( /obj/effect/landmark/prisonwarp, @@ -251,6 +338,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "it" = ( @@ -276,19 +364,16 @@ pixel_y = 5 }, /obj/item/radio, -/obj/machinery/airalarm{ - pixel_y = 23 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/control) "iw" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/centcom/control) "ix" = ( @@ -302,9 +387,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/control) @@ -319,6 +402,7 @@ /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "iA" = ( @@ -394,9 +478,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "iK" = ( @@ -415,9 +497,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "iN" = ( @@ -435,9 +515,7 @@ /turf/open/floor/iron, /area/centcom/supply) "iQ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -456,10 +534,7 @@ /turf/open/floor/iron, /area/centcom/supply) "iS" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -571,9 +646,7 @@ }, /area/centcom/supply) "jf" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -581,15 +654,11 @@ /turf/open/floor/iron, /area/centcom/supply) "jg" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "jh" = ( @@ -605,20 +674,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/control) "jj" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "jk" = ( @@ -748,16 +812,11 @@ /turf/open/floor/iron, /area/centcom/supply) "jz" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "jA" = ( @@ -765,16 +824,11 @@ /turf/open/floor/holofloor/hyperspace, /area/space) "jB" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "jC" = ( @@ -796,9 +850,12 @@ /turf/open/floor/iron, /area/centcom/supply) "jE" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/supply) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/control) "jF" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, @@ -889,10 +946,7 @@ /area/centcom/supply) "jQ" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/supply) @@ -903,9 +957,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "jS" = ( @@ -916,9 +968,7 @@ "jT" = ( /obj/machinery/computer/security, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/control) "jU" = ( @@ -927,16 +977,11 @@ /turf/open/floor/iron, /area/centcom/control) "jV" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "jW" = ( @@ -1013,9 +1058,7 @@ /area/centcom/control) "kb" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1059,6 +1102,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "ke" = ( @@ -1103,6 +1147,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "kg" = ( @@ -1292,10 +1337,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1371,10 +1413,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1435,9 +1474,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "kT" = ( @@ -1461,15 +1498,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "kW" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1509,9 +1542,8 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/grimy, /area/centcom/control) "lb" = ( @@ -1561,9 +1593,8 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "lg" = ( @@ -1593,11 +1624,11 @@ /turf/open/floor/plating, /area/syndicate_mothership/control) "lm" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/plating, /area/syndicate_mothership/control) "ln" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -1612,10 +1643,7 @@ /turf/open/floor/iron, /area/centcom/supply) "lp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -1676,9 +1704,7 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "lx" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1711,10 +1737,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "lA" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1831,10 +1854,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1942,9 +1962,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "mc" = ( -/obj/machinery/computer/auxiliary_base{ - pixel_y = 32 - }, +/obj/machinery/computer/auxiliary_base/directional/north, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/yellow, @@ -1976,9 +1994,7 @@ /turf/open/floor/iron, /area/centcom/supply) "mf" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/crowbar/red, /obj/item/wrench, @@ -2009,23 +2025,16 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "mh" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/filingcabinet/filingcabinet, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/chair, +/obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/supply) +/obj/machinery/newscaster/security_unit/directional/north, +/turf/open/floor/iron, +/area/centcom/control) "mi" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -2039,10 +2048,7 @@ /turf/open/floor/iron, /area/centcom/supply) "mj" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -2062,9 +2068,7 @@ /turf/open/floor/plating, /area/centcom/control) "ml" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -2121,12 +2125,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "mr" = ( @@ -2190,13 +2190,13 @@ "mD" = ( /turf/closed/indestructible/riveted, /area/centcom/ferry) -"mE" = ( -/obj/machinery/computer/security/telescreen/entertainment, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) "mF" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, /area/centcom/supply) "mG" = ( /obj/machinery/computer/cargo{ @@ -2205,6 +2205,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/centcom/supply) "mH" = ( @@ -2235,10 +2236,7 @@ /turf/open/floor/iron, /area/centcom/supply) "mJ" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -2349,6 +2347,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "mT" = ( @@ -2364,6 +2363,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "mU" = ( @@ -2396,9 +2396,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "mW" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -2449,9 +2447,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/newscaster/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "nb" = ( @@ -2496,9 +2492,8 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/iron/white, /area/centcom/ferry) "nk" = ( @@ -2523,6 +2518,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/supply) "nm" = ( @@ -2570,9 +2566,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -2580,9 +2574,7 @@ /turf/open/floor/iron, /area/centcom/control) "ns" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2660,9 +2652,7 @@ /turf/open/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "ny" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/syndicate_mothership/control) "nz" = ( @@ -2683,9 +2673,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 }, @@ -2712,9 +2700,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "nE" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, +/obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, /obj/item/stack/package_wrap, /obj/item/stack/cable_coil, @@ -2750,10 +2736,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/supply) "nH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2765,17 +2752,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/supply) "nI" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2789,10 +2772,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "nJ" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -2866,10 +2846,7 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2888,10 +2865,7 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2912,20 +2886,31 @@ /turf/open/floor/iron/white, /area/centcom/ferry) "nT" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/control) "nU" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) +/obj/structure/bookcase/random, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/control) "nV" = ( /obj/structure/chair{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -2990,9 +2975,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "oc" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3030,9 +3013,7 @@ /obj/item/taperecorder, /obj/item/storage/box/handcuffs, /obj/item/flashlight/seclite, -/obj/structure/noticeboard{ - pixel_y = 28 - }, +/obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3049,9 +3030,7 @@ /obj/structure/table/wood, /obj/item/storage/photo_album, /obj/item/camera, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3065,9 +3044,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "oh" = ( -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, +/obj/machinery/status_display/ai/directional/north, /obj/item/kirbyplants{ icon_state = "plant-15"; pixel_x = -6; @@ -3100,9 +3077,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "oj" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, +/obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3132,30 +3107,28 @@ "ol" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/requests_console{ +/obj/machinery/requests_console/directional/north{ announcementConsole = 1; department = "Captain's Desk"; - departmentType = 5; - name = "Captain RC"; - pixel_y = 32 + departmentType = 5 }, /turf/open/floor/iron/grimy, /area/centcom/ferry) "om" = ( /obj/machinery/modular_computer/console/preset/id/centcom, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/grimy, /area/centcom/ferry) "on" = ( /obj/machinery/computer/communications, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/grimy, /area/centcom/ferry) "oo" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 32; +/obj/machinery/vending/wallmed/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/neutral{ @@ -3168,6 +3141,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/dark, /area/centcom/ferry) "op" = ( @@ -3208,6 +3182,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "or" = ( @@ -3239,9 +3214,7 @@ /obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/supply) "ou" = ( @@ -3296,10 +3269,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3425,6 +3395,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "oM" = ( @@ -3477,10 +3448,7 @@ }, /obj/item/storage/secure/briefcase, /obj/structure/table/wood, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3525,6 +3493,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "oU" = ( @@ -3536,13 +3505,12 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/delivery, -/obj/machinery/light, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "oV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/wood, /area/centcom/holding) "oW" = ( @@ -3555,9 +3523,7 @@ /area/syndicate_mothership) "oX" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3625,18 +3591,12 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "pe" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/grimy, /area/centcom/ferry) "pf" = ( -/obj/machinery/light_switch{ - pixel_x = -24 - }, +/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "pg" = ( @@ -3646,12 +3606,8 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/machinery/light/directional/east, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3719,7 +3675,8 @@ /area/centcom/supply) "pm" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/control) "pn" = ( @@ -3757,10 +3714,8 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/machinery/light, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3775,10 +3730,7 @@ /area/centcom/control) "pq" = ( /obj/structure/bookcase/random, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3793,9 +3745,7 @@ /area/centcom/control) "pr" = ( /obj/structure/bookcase/random, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, +/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3810,10 +3760,7 @@ /area/centcom/control) "ps" = ( /obj/structure/bookcase/random, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3828,9 +3775,7 @@ /area/centcom/control) "pt" = ( /obj/machinery/vending/coffee, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3846,7 +3791,7 @@ "pu" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3861,9 +3806,6 @@ /area/centcom/control) "pv" = ( /obj/machinery/vending/cigarette, -/obj/machinery/newscaster{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3880,9 +3822,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3899,16 +3839,14 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -28 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /obj/structure/sign/warning/securearea{ pixel_x = 32 }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "py" = ( @@ -3991,10 +3929,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "pM" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -4018,19 +3953,13 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "pO" = ( /obj/structure/destructible/cult/tome, /obj/item/book/codex_gigas, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4072,9 +4001,7 @@ /turf/open/floor/iron, /area/centcom/supply) "pR" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4112,9 +4039,7 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/ert) "pV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "pW" = ( @@ -4139,9 +4064,7 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "qa" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4154,10 +4077,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4174,10 +4094,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4200,14 +4117,12 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /turf/open/floor/wood, /area/centcom/ferry) "qf" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/centcom/ferry) "qg" = ( @@ -4224,6 +4139,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "qh" = ( @@ -4277,6 +4193,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "qk" = ( @@ -4309,6 +4226,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "qm" = ( @@ -4327,10 +4245,7 @@ /area/centcom/supply) "qn" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -4347,14 +4262,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/supply) "qp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4471,9 +4383,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/pointybush, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evac) "qB" = ( @@ -4485,9 +4395,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evac) "qD" = ( @@ -4509,9 +4417,7 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/ert) "qH" = ( -/obj/structure/urinal{ - pixel_y = 28 - }, +/obj/structure/urinal/directional/north, /turf/open/floor/iron/white, /area/centcom/holding) "qI" = ( @@ -4552,23 +4458,17 @@ /turf/open/floor/plating/asteroid/snow/airless, /area/syndicate_mothership/control) "qN" = ( -/obj/structure/urinal{ - pixel_y = 28 - }, +/obj/structure/urinal/directional/north, /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) "qO" = ( /obj/item/soap/syndie, /obj/structure/mopbucket, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) "qP" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/item/mop, /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) @@ -4664,9 +4564,7 @@ /area/syndicate_mothership) "re" = ( /obj/item/paper/fluff/stations/centcom/disk_memo, -/obj/structure/noticeboard{ - pixel_x = -32 - }, +/obj/structure/noticeboard/directional/west, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4702,9 +4600,7 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "rj" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/structure/sink{ dir = 8; pixel_x = 11 @@ -4728,9 +4624,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "rl" = ( -/obj/machinery/computer/auxiliary_base{ - pixel_y = 32 - }, +/obj/machinery/computer/auxiliary_base/directional/north, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/radio/headset/headset_cent, @@ -4761,9 +4655,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "ro" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/crowbar/red, /obj/item/wrench, @@ -4778,6 +4670,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/ferry) "rp" = ( @@ -4795,10 +4688,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "rq" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -4842,9 +4732,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4855,21 +4743,19 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/ferry) "ru" = ( -/obj/machinery/light_switch{ - pixel_y = 24 - }, +/obj/machinery/light_switch/directional/north, /turf/open/floor/wood, /area/centcom/ferry) "rv" = ( /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/wood, /area/centcom/ferry) "rw" = ( @@ -4910,9 +4796,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/ferry) "rB" = ( @@ -4941,9 +4825,7 @@ /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, /obj/item/gun/ballistic/automatic/ar, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -4953,9 +4835,7 @@ /obj/item/crowbar/red, /obj/item/crowbar/power, /obj/item/storage/belt/security/full, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -4987,9 +4867,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fernybush, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron{ icon_state = "asteroid5"; name = "plating" @@ -5009,9 +4887,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/genericbush, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/grass, /area/centcom/control) "rK" = ( @@ -5027,9 +4903,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5074,9 +4948,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5087,6 +4959,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "rP" = ( @@ -5129,12 +5002,8 @@ }, /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/machinery/newscaster/security_unit/directional/north, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5148,9 +5017,12 @@ /turf/open/floor/iron/dark, /area/centcom/control) "rS" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/evac) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/control) "rT" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -5170,15 +5042,11 @@ /turf/open/floor/grass, /area/centcom/evac) "rW" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/engine/cult, /area/wizard_station) "rX" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/engine/cult, /area/wizard_station) "rY" = ( @@ -5226,9 +5094,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "se" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -5302,9 +5168,7 @@ /area/syndicate_mothership/control) "sn" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/plating/airless, /area/syndicate_mothership/control) "so" = ( @@ -5324,6 +5188,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/centcom/ferry) "sr" = ( @@ -5363,10 +5228,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "sv" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -5391,15 +5253,11 @@ /area/centcom/ferry) "sx" = ( /obj/structure/chair/comfy/black, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "sy" = ( @@ -5633,9 +5491,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/evac) "sS" = ( @@ -5655,9 +5511,7 @@ /area/centcom/evac) "sU" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/evac) "sV" = ( @@ -5773,6 +5627,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/ferry) "tp" = ( @@ -5892,12 +5747,8 @@ /obj/item/paper_bin, /obj/item/pen/fourcolor, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5915,10 +5766,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, @@ -5937,6 +5785,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "tF" = ( @@ -5947,10 +5796,7 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "tG" = ( @@ -5959,10 +5805,7 @@ /obj/item/ammo_box/a357, /obj/item/gun/ballistic/revolver/mateba, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -5972,10 +5815,7 @@ /obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/flashlight/seclite, /obj/structure/table/reinforced, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -5992,9 +5832,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6063,9 +5901,12 @@ /turf/open/floor/wood, /area/syndicate_mothership/control) "tR" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/evac) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "tS" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -6073,9 +5914,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/evac) "tT" = ( @@ -6174,9 +6013,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "uk" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, +/obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/button/door/indestructible{ @@ -6218,7 +6055,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "un" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -6230,17 +6067,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "uo" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6257,9 +6090,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "uq" = ( @@ -6293,10 +6124,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "uu" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6361,10 +6189,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6383,7 +6208,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/plating/asteroid, /area/centcom/evac) "uA" = ( @@ -6487,10 +6312,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6551,9 +6373,7 @@ /area/centcom/ferry) "uW" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6575,13 +6395,8 @@ /obj/item/dice/d10{ pixel_x = -3 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6629,8 +6444,15 @@ /turf/open/floor/grass, /area/centcom/ferry) "vc" = ( -/obj/machinery/newscaster, -/turf/closed/indestructible/riveted, +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/newscaster/security_unit/directional/south, +/turf/open/floor/iron, /area/centcom/control) "vd" = ( /obj/structure/table/reinforced, @@ -6768,12 +6590,11 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/delivery, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/centcom/ferry) "vC" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -6786,15 +6607,11 @@ /turf/open/floor/iron, /area/centcom/ferry) "vE" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/chair{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -6820,12 +6637,11 @@ /turf/open/floor/iron, /area/centcom/control) "vH" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "vI" = ( @@ -6844,9 +6660,7 @@ /area/centcom/control) "vJ" = ( /obj/machinery/photocopier, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/machinery/button/door/indestructible{ id = "XCCFerry"; name = "Hanger Bay Shutters"; @@ -6932,9 +6746,7 @@ /area/centcom/control) "vN" = ( /obj/structure/filingcabinet/medical, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6948,12 +6760,11 @@ /turf/open/floor/iron/dark, /area/centcom/control) "vO" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "vP" = ( @@ -6971,9 +6782,7 @@ /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -6983,6 +6792,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "vR" = ( @@ -7003,9 +6813,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -7013,6 +6821,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "vU" = ( @@ -7032,9 +6841,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/evac) "vW" = ( @@ -7128,7 +6936,7 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "wl" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/syndicate_mothership/control) "wm" = ( @@ -7149,7 +6957,7 @@ /turf/open/floor/wood, /area/syndicate_mothership/control) "wp" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -7238,9 +7046,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "wA" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -7372,16 +7178,11 @@ /turf/open/floor/wood, /area/wizard_station) "wN" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/engine/cult, /area/wizard_station) "wO" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/engine/cult, /area/wizard_station) "wP" = ( @@ -7571,7 +7372,7 @@ /turf/open/floor/iron, /area/centcom/evac) "xu" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/wizard_station) "xv" = ( @@ -7599,7 +7400,7 @@ "xz" = ( /obj/structure/table/wood/fancy, /obj/item/storage/photo_album, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/carpet, /area/wizard_station) "xB" = ( @@ -7619,9 +7420,7 @@ /turf/open/floor/plating, /area/syndicate_mothership/control) "xI" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/mech_bay_recharge_floor, /area/syndicate_mothership/control) "xJ" = ( @@ -7659,7 +7458,8 @@ /area/syndicate_mothership/control) "xQ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "xR" = ( @@ -7772,16 +7572,14 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, /obj/structure/window/reinforced/fulltile, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/grass, /area/centcom/holding) "yf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/supplypod) "yj" = ( @@ -7813,7 +7611,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/plating/airless, /area/syndicate_mothership/control) "yn" = ( @@ -7834,12 +7632,11 @@ /turf/open/floor/iron, /area/centcom/ferry) "ys" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "yt" = ( @@ -7882,7 +7679,7 @@ /obj/machinery/computer/prisoner/management{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7899,7 +7696,7 @@ /obj/machinery/computer/secure_data{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7930,10 +7727,9 @@ /turf/open/floor/iron/dark, /area/centcom/control) "yy" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "yz" = ( @@ -7956,6 +7752,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "yB" = ( @@ -7977,9 +7774,7 @@ "yE" = ( /obj/structure/table/wood, /obj/item/retractor, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/engine/cult, /area/wizard_station) "yF" = ( @@ -7990,9 +7785,7 @@ /obj/structure/mirror/magic{ pixel_y = 28 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/engine/cult, /area/wizard_station) "yG" = ( @@ -8092,9 +7885,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8109,9 +7900,7 @@ /area/centcom/ferry) "za" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8143,9 +7932,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8168,9 +7955,7 @@ /area/centcom/ferry) "zf" = ( /obj/structure/closet/secure_closet/ert_engi, -/obj/machinery/airalarm{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -8180,9 +7965,7 @@ /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/wt550, /obj/item/flashlight/seclite, -/obj/structure/noticeboard{ - pixel_y = 28 - }, +/obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -8194,9 +7977,7 @@ /obj/item/grenade/c4{ pixel_x = -4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -8221,6 +8002,7 @@ pixel_y = 24 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/centcom/ferry) "zk" = ( @@ -8334,9 +8116,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "zD" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8415,10 +8195,7 @@ /obj/machinery/computer/med_data{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -8433,9 +8210,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/plating/asteroid, /area/centcom/evac) "zM" = ( @@ -8483,9 +8258,7 @@ /area/centcom/holding) "zX" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/item/soap/deluxe, /turf/open/floor/iron/cafeteria, /area/centcom/holding) @@ -8607,9 +8380,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "Al" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8632,14 +8403,14 @@ /turf/open/floor/iron, /area/centcom/control) "An" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green{ dir = 8 }, /turf/open/floor/iron, /area/centcom/control) "Ao" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/control) @@ -8678,9 +8449,7 @@ /obj/machinery/computer/communications{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -8811,11 +8580,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "AS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Briefing Area APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/auto_name/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8843,6 +8608,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/white, /area/centcom/control) "AV" = ( @@ -8874,7 +8640,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/evac) "Ba" = ( @@ -8897,7 +8663,7 @@ /area/centcom/evac) "Bd" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/evac) "Be" = ( @@ -8921,7 +8687,7 @@ /turf/open/floor/engine/cult, /area/wizard_station) "Bh" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/engine/cult, /area/wizard_station) "Bi" = ( @@ -9086,6 +8852,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/centcom/control) "BG" = ( @@ -9138,11 +8905,8 @@ /turf/open/floor/iron, /area/centcom/control) "BI" = ( -/obj/machinery/light, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -9179,10 +8943,7 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -9325,7 +9086,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/genericbush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/grass, /area/centcom/evac) "Ce" = ( @@ -9392,9 +9153,7 @@ /turf/open/floor/iron/dark, /area/centcom/evac) "Ci" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/engine/cult, /area/wizard_station) "Co" = ( @@ -9430,9 +9189,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9447,7 +9204,7 @@ /area/centcom/ferry) "Cs" = ( /obj/structure/bookcase/random, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9472,6 +9229,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "Cu" = ( @@ -9486,6 +9244,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "Cv" = ( @@ -9506,10 +9265,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/power/apc{ - name = "Briefing Room APC"; - pixel_y = -23 - }, +/obj/machinery/power/apc/auto_name/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9524,10 +9280,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "Cx" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9544,11 +9297,8 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9565,9 +9315,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9601,6 +9349,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "CB" = ( @@ -9616,9 +9365,7 @@ /area/centcom/ferry) "CC" = ( /obj/structure/closet/secure_closet/ert_med, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -32; +/obj/machinery/vending/wallmed/directional/south{ use_power = 0 }, /obj/effect/turf_decal/stripes/line{ @@ -9642,9 +9389,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/syringes, /obj/item/gun/syringe/rapidsyringe, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -9655,6 +9400,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "CG" = ( @@ -9666,16 +9412,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/ferry) "CH" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9692,9 +9436,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -9725,9 +9467,7 @@ /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -9739,10 +9479,7 @@ /area/centcom/control) "CM" = ( /obj/structure/filingcabinet/medical, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9771,9 +9508,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "CO" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9805,9 +9540,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9833,9 +9566,7 @@ /obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, /obj/item/crowbar/red, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9846,6 +9577,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/centcom/control) "CY" = ( @@ -9891,9 +9623,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9958,9 +9688,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10073,7 +9801,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "Dx" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10090,7 +9818,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10126,9 +9854,7 @@ }, /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10171,9 +9897,7 @@ }, /obj/item/stamp, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10184,6 +9908,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/dark, /area/centcom/control) "DG" = ( @@ -10264,9 +9989,7 @@ /turf/open/floor/carpet, /area/wizard_station) "DQ" = ( -/obj/structure/urinal{ - pixel_y = 28 - }, +/obj/structure/urinal/directional/north, /turf/open/floor/iron/white, /area/wizard_station) "DR" = ( @@ -10287,10 +10010,7 @@ id = "XCCsec3"; name = "CC Main Access Control" }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10307,9 +10027,7 @@ /obj/machinery/computer/security{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10339,9 +10057,7 @@ /turf/open/floor/iron, /area/centcom/control) "DX" = ( -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/computer/med_data{ dir = 1 }, @@ -10362,10 +10078,7 @@ /obj/item/clipboard, /obj/item/folder/white, /obj/item/pen/blue, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10389,10 +10102,7 @@ /turf/open/floor/iron, /area/wizard_station) "Eb" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/carpet, /area/wizard_station) "Ec" = ( @@ -10401,23 +10111,16 @@ /turf/open/floor/carpet, /area/wizard_station) "Ed" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/wizard_station) "Ee" = ( /obj/item/soap/homemade, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/white, /area/wizard_station) "Ef" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/wizard_station) "Eg" = ( @@ -10442,7 +10145,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/wizard_station) "Ek" = ( @@ -10656,19 +10359,22 @@ }, /area/tdome/tdomeobserve) "EK" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeobserve) -"EL" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/supply) +"EL" = ( +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/tdome/tdomeobserve) "EM" = ( @@ -10724,13 +10430,12 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "EQ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/tdome/tdomeobserve) "ER" = ( @@ -10761,9 +10466,7 @@ /area/tdome/tdomeobserve) "EV" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10814,9 +10517,7 @@ /area/centcom/holding) "Fb" = ( /obj/structure/musician/piano, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/carpet/black, /area/centcom/holding) "Fc" = ( @@ -10831,6 +10532,19 @@ /obj/item/food/sashimi, /turf/open/floor/wood, /area/centcom/holding) +"Fg" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "Fh" = ( /turf/open/floor/iron/cafeteria, /area/centcom/holding) @@ -10838,9 +10552,7 @@ /obj/structure/chair/wood/wings{ dir = 3 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/centcom/holding) "Fj" = ( @@ -10863,9 +10575,7 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "Fn" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -10966,9 +10676,7 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "Fy" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -11163,7 +10871,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "Gf" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11221,7 +10929,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "Gk" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -11289,9 +10997,7 @@ /turf/open/lava, /area/wizard_station) "Gs" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/centcom/holding) "Gu" = ( @@ -11335,9 +11041,7 @@ "GC" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -11429,6 +11133,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "GH" = ( @@ -11467,6 +11172,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "GJ" = ( @@ -11583,14 +11289,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "GS" = ( /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/machinery/newscaster/security_unit/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11615,6 +11320,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "GU" = ( @@ -11642,9 +11348,7 @@ "GW" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -11680,9 +11384,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -11734,9 +11436,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -11754,9 +11454,7 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, /obj/structure/window/reinforced/fulltile, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/grass, /area/centcom/holding) "Hn" = ( @@ -11764,9 +11462,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "Ho" = ( @@ -11779,9 +11475,7 @@ pixel_x = -8 }, /obj/item/kitchen/knife, -/obj/machinery/newscaster{ - pixel_x = -32 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11795,7 +11489,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "Hp" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -11809,10 +11503,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "Hq" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "Hr" = ( @@ -11828,7 +11519,7 @@ /turf/open/floor/iron/grimy, /area/tdome/tdomeobserve) "Hs" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11852,10 +11543,7 @@ /turf/open/floor/iron/grimy, /area/tdome/tdomeobserve) "Hu" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -11863,7 +11551,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "Hv" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -11874,10 +11562,7 @@ /obj/machinery/chem_master/condimaster{ name = "HoochMaster 2000" }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11895,9 +11580,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "HA" = ( @@ -11905,9 +11588,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -11964,9 +11645,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) @@ -11978,7 +11657,7 @@ /turf/open/space, /area/space) "HH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/centcom/holding) "HI" = ( @@ -11986,9 +11665,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -12011,6 +11688,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "HK" = ( @@ -12063,12 +11741,8 @@ "HO" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12110,9 +11784,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -12128,9 +11800,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "HT" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -12143,9 +11813,7 @@ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12181,9 +11849,7 @@ /area/tdome/tdomeobserve) "HX" = ( /obj/machinery/vending/boozeomat, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12197,9 +11863,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "HY" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -12240,15 +11904,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "Ic" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/tdome/tdomeobserve) @@ -12286,6 +11948,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "If" = ( @@ -12322,10 +11985,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12422,9 +12082,7 @@ /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12464,9 +12122,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/plating/asteroid, /area/tdome/tdomeadmin) "Ix" = ( @@ -12619,9 +12275,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/fernybush, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -12987,9 +12641,7 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "JO" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13082,9 +12734,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "JU" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13108,10 +12758,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13205,7 +12852,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13216,6 +12863,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "Kp" = ( @@ -13268,10 +12916,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13310,7 +12955,7 @@ req_access_txt = "102" }, /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13321,6 +12966,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "Ku" = ( @@ -13346,9 +12992,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13401,7 +13045,7 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 5 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13412,6 +13056,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "KA" = ( @@ -13429,17 +13074,20 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/pointybush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/grass, /area/tdome/tdomeadmin) "KC" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeadmin) +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/wood, +/area/centcom/control) "KD" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeadmin) +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/grimy, +/area/centcom/control) "KF" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -13519,9 +13167,7 @@ /turf/open/floor/plating, /area/centcom/evac) "KR" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/centcom/evac) "KS" = ( @@ -13570,24 +13216,18 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "KZ" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/centcom/evac) "La" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Lb" = ( /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Lc" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Ld" = ( @@ -13687,9 +13327,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/centcom/evac) "Lu" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium, /area/centcom/evac) "Lv" = ( @@ -13702,9 +13340,7 @@ /area/centcom/evac) "Lx" = ( /obj/structure/bed, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Ly" = ( @@ -13730,7 +13366,7 @@ "LB" = ( /obj/structure/table, /obj/item/hand_labeler, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LC" = ( @@ -13764,9 +13400,7 @@ "LH" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LI" = ( @@ -13776,9 +13410,7 @@ "LJ" = ( /obj/structure/table, /obj/item/radio/off, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LK" = ( @@ -13934,6 +13566,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/control) "Mg" = ( @@ -13950,6 +13583,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/control) "Mh" = ( @@ -13982,9 +13616,7 @@ /turf/open/floor/wood, /area/centcom/holding) "Mu" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -14007,9 +13639,7 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "Mx" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/structure/rack, /obj/item/nullrod/claymore/saber/red{ damtype = "stamina"; @@ -14017,6 +13647,20 @@ }, /turf/open/floor/wood, /area/centcom/holding) +"MB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/control) "MD" = ( /obj/effect/light_emitter{ set_cap = 1; @@ -14046,9 +13690,7 @@ /turf/open/floor/grass, /area/centcom/holding) "MI" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/dark, @@ -14064,9 +13706,7 @@ /turf/open/floor/carpet/black, /area/centcom/holding) "MR" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/carpet/black, /area/centcom/holding) "MT" = ( @@ -14082,6 +13722,20 @@ /obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/iron/dark, /area/centcom/supplypod) +"Ni" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/supply) "Nk" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome"; @@ -14130,9 +13784,7 @@ /area/centcom/holding) "Ny" = ( /obj/machinery/modular_computer/console/preset/research, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/centcom/holding) "NE" = ( @@ -14258,9 +13910,7 @@ /area/centcom/supplypod) "OG" = ( /obj/structure/dresser, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/centcom/holding) "OP" = ( @@ -14316,6 +13966,21 @@ }, /turf/open/floor/carpet/black, /area/centcom/holding) +"Pq" = ( +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/supply) "Pr" = ( /obj/structure/table, /obj/item/book/manual/chef_recipes, @@ -14457,9 +14122,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "Qu" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/wood, /area/centcom/holding) "QA" = ( @@ -14514,6 +14177,21 @@ }, /turf/open/floor/iron, /area/centcom/supplypod) +"QS" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/control) "QT" = ( /obj/machinery/chem_dispenser/drinks, /turf/closed/indestructible/wood, @@ -14525,7 +14203,7 @@ /turf/open/floor/iron/cafeteria, /area/centcom/holding) "Rd" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -14586,7 +14264,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/supplypod) "Rw" = ( @@ -14616,9 +14294,7 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "RS" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/rack, /obj/item/nullrod/claymore/glowing{ damtype = "stamina"; @@ -14643,16 +14319,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/centcom/supplypod) "Sw" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -14665,6 +14337,13 @@ }, /turf/open/floor/iron/white, /area/centcom/holding) +"Sz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/supplypod/loading/ert) "SB" = ( /obj/structure/curtain, /obj/structure/window/reinforced/tinted{ @@ -14798,9 +14477,7 @@ /area/centcom/holding) "TK" = ( /obj/structure/table/wood/bar, -/obj/structure/mirror{ - pixel_y = 28 - }, +/obj/structure/mirror/directional/north, /turf/open/floor/wood, /area/centcom/holding) "TT" = ( @@ -14815,6 +14492,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/centcom/control) +"TY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/control) "Ud" = ( /obj/effect/landmark/holding_facility, /turf/open/floor/wood, @@ -14826,11 +14517,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "Uf" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Commander's Office APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -14851,9 +14538,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "Uh" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/structure/rack, /obj/item/nullrod/claymore/darkblade{ damtype = "stamina"; @@ -14892,9 +14577,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "Uw" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/centcom/supplypod) "UE" = ( @@ -14902,16 +14585,12 @@ /turf/open/floor/wood, /area/centcom/holding) "UH" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark, /area/centcom/supplypod) "UJ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/centcom/holding) "UM" = ( @@ -14936,6 +14615,21 @@ }, /turf/open/floor/iron, /area/centcom/control) +"UP" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/control) "UT" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -14959,9 +14653,7 @@ /area/centcom/supplypod/loading/two) "Vm" = ( /obj/machinery/gibber, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "Vn" = ( @@ -14974,7 +14666,7 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, /obj/structure/window/reinforced/fulltile, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/grass, /area/centcom/holding) "Vv" = ( @@ -14983,17 +14675,11 @@ /turf/open/floor/iron/cafeteria, /area/centcom/holding) "Vz" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28; - use_power = 0 - }, +/obj/machinery/vending/wallmed/directional/north, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "VA" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/centcom/holding) "VF" = ( @@ -15028,10 +14714,7 @@ /turf/open/floor/iron, /area/centcom/evac) "Wj" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) "Wm" = ( @@ -15047,6 +14730,22 @@ }, /turf/open/floor/iron, /area/centcom/supplypod/loading/four) +"WE" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/ferry) "WJ" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration"; @@ -15060,7 +14759,7 @@ /area/tdome/tdomeadmin) "WM" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/supplypod) "WP" = ( @@ -15178,9 +14877,7 @@ /turf/open/floor/wood, /area/centcom/holding) "Yh" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/centcom/holding) "Ym" = ( @@ -15231,9 +14928,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/centcom/supplypod) "YA" = ( @@ -15267,9 +14962,7 @@ /turf/open/floor/iron/cafeteria, /area/centcom/holding) "YV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/rack, /obj/item/nullrod/claymore/saber{ damtype = "stamina"; @@ -49447,8 +49140,8 @@ aa aa oe oe -nT -nU +mD +mD oe oe aa @@ -50478,13 +50171,13 @@ rn st tr um -nT +mD vB oe Xy oe oU -nU +mD ta oe td @@ -50730,12 +50423,12 @@ aa aa aa aa -nU +mD ro su ts un -nU +mD vC wr xe @@ -51258,7 +50951,7 @@ px mD pD pX -pX +Sz pX rb oe @@ -51515,7 +51208,7 @@ mD mD tc oe -nU +mD oe tc mD @@ -52529,7 +52222,7 @@ oC oZ oB qd -nU +mD rt sx tx @@ -52538,8 +52231,8 @@ uR mD ss xj -tr -nU +fa +mD zb pg Ac @@ -52547,7 +52240,7 @@ rY rZ pg Ct -nT +mD aa aa aa @@ -52804,7 +52497,7 @@ zA sc zA Cu -nU +mD aa aa aa @@ -53049,7 +52742,7 @@ pJ oB oB uT -nT +mD wx ws wB @@ -53291,7 +52984,7 @@ aa aa aa aa -mE +mD nj nB nS @@ -53300,7 +52993,7 @@ oF oF oF qf -nU +mD rv sz tz @@ -53310,7 +53003,7 @@ vF wy GZ xQ -nT +mD sw zB Ae @@ -53557,7 +53250,7 @@ oG pc oI qg -mE +mD rw sA tA @@ -53808,7 +53501,7 @@ aa mD mD mD -nT +mD om oH pd @@ -54065,7 +53758,7 @@ aa aa aa aa -nU +mD on oI pe @@ -54075,7 +53768,7 @@ mD ry sC tC -oB +fj uX mD su @@ -54323,7 +54016,7 @@ aa aa aa mD -mE +mD oJ mD mD @@ -54332,14 +54025,14 @@ mD mD sD mD -nU +mD mD mD su ws ts qR -pH +WE zA sw Qq @@ -54576,8 +54269,8 @@ aa aa iX iX -mF -jE +iF +iF iF mD oo @@ -54585,7 +54278,7 @@ oI pf pN qj -nU +mD Uf sE tD @@ -54596,13 +54289,13 @@ su ws ts mD -nT +mD rz Ai OC Ai rz -nU +mD mD aa aa @@ -54846,7 +54539,7 @@ qR rA sF tE -nU +mD uZ oe su @@ -55099,7 +54792,7 @@ oL ph pO ql -nT +mD rB sG tF @@ -55351,8 +55044,8 @@ iR nn nF mD -nT -nU +mD +mD mD mD mD @@ -55607,13 +55300,13 @@ me mI lo nG -mF +iF or oM pi pP -qm -nU +Pq +mD rC sI tG @@ -55646,9 +55339,9 @@ Ep FK Ep Ep -EK +Ep Gw -EK +Ep Ep Ep IB @@ -55864,7 +55557,7 @@ mf iR lo nH -jE +iF mg mi pj @@ -55888,7 +55581,7 @@ uU sw sw CF -nT +mD aa aa aa @@ -56126,8 +55819,8 @@ mg iR iY lo -mg -nT +Ni +mD rE sw tI @@ -56155,7 +55848,7 @@ EH Ev FI FL -EK +Ep GG Gc Hd @@ -56374,7 +56067,7 @@ kw iY lo iF -mh +qm mJ lq nI @@ -56395,13 +56088,13 @@ wu xh wu mD -nT +mD rz mD mD mD rz -nU +mD mD Dq io @@ -56629,8 +56322,8 @@ iY jp kw iY -lo -jE +EK +iF iF iF lJ @@ -56669,7 +56362,7 @@ EI Fp FJ Gg -EK +Ep GI Gc Hp @@ -56904,11 +56597,11 @@ iF iu iu io -im +io Oj mk Oj -im +io io iu iu @@ -56916,9 +56609,9 @@ io mQ io iu -im +io Dr -ip +io iu io Es @@ -57179,7 +56872,7 @@ DF DT io Ep -EK +Ep Ep FK Ep @@ -57205,7 +56898,7 @@ JQ Ka JG Ko -KC +Iv Iv Iv aa @@ -57394,7 +57087,7 @@ jf jq ju ju -iZ +mF jN jQ jN @@ -57651,7 +57344,7 @@ iF iF iF iF -jE +iF iF iF iF @@ -57691,7 +57384,7 @@ vM Ds DG Mf -im +io Eu EM Fr @@ -58451,8 +58144,8 @@ wD km nN yv -im -nq +io +TY xT iu BE @@ -58747,7 +58440,7 @@ JS Kb JG Kt -KD +Iv IR Iv aa @@ -58965,8 +58658,8 @@ wF km nN yw -im -nq +io +TY xo mk BE @@ -59747,7 +59440,7 @@ Da Dv DJ Mg -im +io Eu EP Fr @@ -60231,7 +59924,7 @@ ir iB il in -im +io iu Oj mk @@ -60263,7 +59956,7 @@ ns DY io Ep -EK +Ep Ep FK Ep @@ -60289,7 +59982,7 @@ JQ Ka JG Ky -KC +Iv Iv Iv aa @@ -60468,7 +60161,7 @@ aa aa aa aa -im +io is iC iJ @@ -60488,7 +60181,7 @@ ls iC kZ mR -kW +UP iL iT iT @@ -60502,11 +60195,11 @@ io tP UO io -im +io yU mk yU -im +io io iu iu @@ -60514,9 +60207,9 @@ io rK io iu -im -iC -ip +io +hU +io iu io Er @@ -60728,7 +60421,7 @@ aa in it iC -iK +im iU iU iU @@ -60740,7 +60433,7 @@ iU iU iU iU -iU +rS lt iC kZ @@ -60781,7 +60474,7 @@ ES Fw FO Gg -EK +Ep GR Hf Hv @@ -60985,7 +60678,7 @@ aa io iu iu -im +io iu ja iu @@ -60997,7 +60690,7 @@ iu iu ja iu -im +io iu iu io @@ -61008,24 +60701,24 @@ iu iu jw pm -im +io iu io io iu -im +io yj io -im +io Oj mk Oj -im +io io iu iu -ip -im +io +io io io io @@ -61257,7 +60950,7 @@ kx kT lu lO -im +io mS iC nN @@ -61270,15 +60963,15 @@ qv iu rL sK -iC +MB uu io vQ wG xp wG -qr -im +Fg +io zH Aq AU @@ -61295,7 +60988,7 @@ ET Ev FP FL -EK +Ep GT Hf Hf @@ -61496,18 +61189,18 @@ aa aa aa aa -ip +io iw iC iC iC iC ji -im -jw +io +jE iC -jG -im +nT +io jT iC iC @@ -61519,8 +61212,8 @@ iC iC km nZ -im -jw +io +jE jG iu lN @@ -61529,13 +61222,13 @@ rM sK mX nw +io +mh +nq +nq +nq vc -mO -nq -nq -nq -qs -vc +io zI nq Ar @@ -61771,7 +61464,7 @@ ky kU lv lP -im +io mT iC nN @@ -61814,9 +61507,9 @@ Ep FK Ep Ep -EK Ep -EK +Ep +Ep Ep Ep IM @@ -62013,7 +61706,7 @@ aa io iu iu -im +io iu ja iu @@ -62025,7 +61718,7 @@ iu iu ja iu -im +io iu iu io @@ -62036,9 +61729,9 @@ iu iu jw pm -im +io iu -im +io rO sK iC @@ -62270,7 +61963,7 @@ aa in iy iC -iL +ip iT iT iT @@ -62282,7 +61975,7 @@ iT iT iT iT -iT +tR ls iC kZ @@ -62524,7 +62217,7 @@ aa aa aa aa -im +io iz iC iM @@ -62544,7 +62237,7 @@ lt iC kZ mR -ns +QS iK iU iU @@ -62801,7 +62494,7 @@ ir iB il in -im +io iu ja mk @@ -62812,7 +62505,7 @@ io io rR iC -mm +dR uy iu vT @@ -63069,14 +62762,14 @@ qx qx qx ZJ -tR +qx qx io -im +io yU mk yU -im +io io io io @@ -63586,11 +63279,11 @@ Wc qx qx qx -rS +qx wJ xr wJ -rS +qx qx qx qx @@ -64083,8 +63776,8 @@ kl kA kY lw -kl -im +KC +io mV nu nP @@ -64609,8 +64302,8 @@ lQ io qy qz -rS -sQ +qx +fE tT uB vf @@ -64622,8 +64315,8 @@ uB uB uB At -AY -rS +aP +qx qy qx Dc @@ -65105,18 +64798,18 @@ aa aa aa aa -ip -kb +io +nU km kC -im +io iu lT iu iu iu -im -oc +io +da mY km pq @@ -65876,7 +65569,7 @@ aa aa aa aa -im +io kd kl kF @@ -66390,7 +66083,7 @@ aa aa aa aa -im +io kf kl kH @@ -66665,8 +66358,8 @@ ps io qy qz -rS -sQ +qx +fE tT uB uB @@ -66678,8 +66371,8 @@ xZ zm uB At -AY -rS +aP +qx qz qx Nh @@ -67161,18 +66854,18 @@ aa aa aa aa -ip -kb +io +nU km kI -im +io lz lU mp mZ lU -im -oc +io +da mY km ka @@ -67681,10 +67374,10 @@ kn kJ in lA -lW +KD mq na -lW +dp nR iC oz @@ -67938,10 +67631,10 @@ io io io io -ip io io -im +io +io io io io diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index b956b70d85b..7f8ea1e4249 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -23,16 +23,11 @@ /turf/open/space, /area/space) "aaw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "aaA" = ( @@ -190,12 +185,12 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "aeW" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/mob/living/simple_animal/chicken, -/turf/open/floor/grass, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/control) "aeX" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -203,22 +198,12 @@ /turf/open/floor/iron, /area/centcom/ferry) "aeY" = ( -/obj/structure/closet{ - anchored = 1; - name = "Plasmaman suits" +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/item/clothing/under/plasmaman, -/obj/item/clothing/under/plasmaman, -/obj/item/clothing/under/plasmaman, -/obj/item/clothing/under/plasmaman, -/obj/item/clothing/under/plasmaman, -/obj/item/clothing/head/helmet/space/plasmaman, -/obj/item/clothing/head/helmet/space/plasmaman, -/obj/item/clothing/head/helmet/space/plasmaman, -/obj/item/clothing/head/helmet/space/plasmaman, -/obj/item/clothing/head/helmet/space/plasmaman, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "aeZ" = ( /obj/machinery/computer/operating{ dir = 4 @@ -229,6 +214,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/white, /area/centcom/control) "afb" = ( @@ -248,21 +234,20 @@ /turf/open/floor/iron, /area/centcom/control) "afe" = ( -/obj/structure/chair/wood/wings{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/control) +"aff" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 28 - }, -/turf/open/floor/wood, -/area/centcom/holding) -"aff" = ( -/obj/structure/sign/barsign{ - pixel_y = 32 - }, -/obj/structure/chair/stool, -/turf/open/floor/carpet/black, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/supply) "afg" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, @@ -287,6 +272,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "afk" = ( @@ -298,9 +284,7 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "afm" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -400,9 +384,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -453,13 +435,10 @@ /turf/open/floor/iron/dark, /area/centcom/control) "afI" = ( -/obj/structure/rack, -/obj/item/nullrod/scythe/vibro{ - damtype = "stamina"; - force = 30 - }, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/control) "afJ" = ( /obj/machinery/vending/magivend, /turf/open/floor/engine/cult, @@ -473,7 +452,7 @@ /obj/machinery/computer/prisoner/management{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -487,9 +466,12 @@ /turf/open/floor/iron/dark, /area/centcom/control) "afP" = ( -/obj/machinery/deepfryer, -/turf/open/floor/iron/cafeteria, -/area/centcom/holding) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/control) "afS" = ( /obj/item/clipboard, /obj/item/folder/red, @@ -566,10 +548,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/power/apc{ - name = "Briefing Room APC"; - pixel_y = -23 - }, +/obj/machinery/power/apc/auto_name/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -589,9 +568,7 @@ /area/centcom/control) "agq" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -605,9 +582,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "agr" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -727,15 +702,11 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "agL" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "agM" = ( @@ -755,9 +726,12 @@ /turf/open/floor/wood, /area/syndicate_mothership/control) "agO" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/supply) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "agP" = ( /obj/structure/closet/secure_closet/ert_engi, /obj/structure/sign/directions/engineering{ @@ -777,21 +751,15 @@ /turf/closed/indestructible/riveted, /area/centcom/ferry) "agS" = ( -/obj/structure/closet/crate, -/obj/item/vending_refill/autodrobe, -/obj/item/stack/sheet/paperframes/fifty, -/obj/item/stack/sheet/paperframes/fifty, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/box/lights/mixed, -/turf/open/floor/wood, -/area/centcom/holding) -"agT" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/supply) +"agT" = ( +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -844,7 +812,7 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 5 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -855,6 +823,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "ahh" = ( @@ -911,14 +880,9 @@ /turf/open/floor/wood, /area/wizard_station) "ahq" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/wood, +/area/centcom/control) "ahr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron, @@ -938,8 +902,12 @@ /turf/open/floor/iron/dark, /area/centcom/control) "ahu" = ( -/turf/open/floor/carpet/black, -/area/centcom/holding) +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/grimy, +/area/centcom/control) "ahx" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -1001,9 +969,20 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/four) "ahF" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) +/obj/structure/bookcase/random, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/control) "ahG" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -1013,11 +992,7 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "ahI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Briefing Area APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/auto_name/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1067,9 +1042,20 @@ /turf/open/floor/iron, /area/centcom/ferry) "ahQ" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/evac) +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/control) "ahR" = ( /turf/closed/indestructible/fakeglass, /area/centcom/prison) @@ -1090,9 +1076,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/pointybush, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evac) "ahW" = ( @@ -1105,7 +1089,7 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "ahY" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1144,9 +1128,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aih" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1184,19 +1166,12 @@ /turf/open/floor/iron/dark, /area/centcom/evac) "aio" = ( -/obj/machinery/vending/hydronutrients, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/white, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/grimy, +/area/centcom/control) "aip" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -1209,10 +1184,7 @@ /area/centcom/ferry) "ais" = ( /obj/structure/filingcabinet/medical, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1230,14 +1202,20 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "aiw" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/carpet/black, -/area/centcom/holding) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/supply) "aiA" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -1353,9 +1331,7 @@ /area/centcom/control) "aiQ" = ( /obj/machinery/vending/boozeomat, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1369,7 +1345,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aiR" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1484,17 +1460,21 @@ /turf/closed/indestructible/riveted, /area/awaymission/errorroom) "ajk" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "sink"; - pixel_y = 28 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/iron/cafeteria, -/area/centcom/holding) -"ajm" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/supply) +"ajm" = ( +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -1537,27 +1517,34 @@ /turf/open/floor/iron/dark, /area/centcom/prison) "aju" = ( -/mob/living/simple_animal/bot/medbot{ - desc = "A little medical robot. You can make out the word \"sincerity\" on its chassis."; - name = "Hijikata"; - radio_key = null; - stationary_mode = 1 +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/evac) "ajv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/supplypod) "ajx" = ( -/obj/structure/mineral_door/paperframe{ - name = "Arcade" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/centcom/control) "ajy" = ( /obj/machinery/door/airlock/external{ req_access_txt = "150" @@ -1565,21 +1552,22 @@ /turf/open/floor/plating, /area/syndicate_mothership/control) "ajA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/computer/secure_data{ dir = 8 }, -/turf/open/floor/iron/white, -/area/centcom/holding) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/control) "ajC" = ( /obj/structure/chair{ dir = 8 @@ -1605,10 +1593,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "ajH" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -1645,9 +1630,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1664,9 +1647,7 @@ /turf/open/floor/iron, /area/centcom/evac) "ajP" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1695,12 +1676,10 @@ "ajU" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/requests_console{ +/obj/machinery/requests_console/directional/north{ announcementConsole = 1; department = "Captain's Desk"; - departmentType = 5; - name = "Captain RC"; - pixel_y = 32 + departmentType = 5 }, /turf/open/floor/iron/grimy, /area/centcom/ferry) @@ -1720,11 +1699,9 @@ /turf/open/floor/iron, /area/centcom/control) "akc" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/wood, -/area/centcom/holding) +/area/centcom/ferry) "akd" = ( /obj/item/food/meat/slab/xeno, /turf/open/floor/grass, @@ -1802,6 +1779,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/supply) "aku" = ( @@ -1826,9 +1804,16 @@ /turf/open/floor/iron, /area/centcom/control) "akw" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/structure/chair, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/newscaster/security_unit/directional/north, +/turf/open/floor/iron, +/area/centcom/control) "akx" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1888,12 +1873,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "akC" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, +/obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, /obj/item/stack/package_wrap, /obj/item/stack/cable_coil, @@ -1945,10 +1929,7 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "akJ" = ( @@ -1994,12 +1975,8 @@ /obj/item/paper_bin, /obj/item/pen/fourcolor, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2024,10 +2001,12 @@ /turf/open/floor/iron, /area/centcom/ferry) "akR" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/open/floor/iron/cafeteria, -/area/centcom/holding) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/ferry) "akS" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -2043,10 +2022,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, @@ -2055,9 +2031,7 @@ /area/centcom/ferry) "akW" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2089,10 +2063,18 @@ /turf/open/floor/iron, /area/centcom/supply) "alb" = ( -/obj/structure/table/wood, -/obj/machinery/computer/bookmanagement, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "alc" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2130,9 +2112,7 @@ /turf/open/floor/iron, /area/centcom/supply) "alk" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2149,12 +2129,32 @@ /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) "alm" = ( -/turf/open/floor/grass, -/area/centcom/holding) +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/newscaster/security_unit/directional/south, +/turf/open/floor/iron, +/area/centcom/control) "aln" = ( -/obj/machinery/door/airlock/wood, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/ferry) "alo" = ( /obj/item/radio{ pixel_x = 5; @@ -2207,9 +2207,19 @@ /turf/open/floor/plating, /area/centcom/control) "alt" = ( -/obj/machinery/recharge_station, -/turf/open/floor/iron/white, -/area/centcom/holding) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/centcom/control) "alv" = ( /obj/structure/table/wood, /obj/item/gun/magic/wand{ @@ -2273,7 +2283,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "alE" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2285,15 +2295,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "alF" = ( /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2311,9 +2320,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) @@ -2391,9 +2398,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "alT" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -2431,15 +2436,14 @@ /turf/open/floor/iron/dark, /area/centcom/control) "alZ" = ( -/obj/structure/table/wood, -/obj/item/instrument/piano_synth, -/obj/item/instrument/guitar, -/turf/open/floor/carpet/black, -/area/centcom/holding) -"amd" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/supplypod/loading/ert) +"amd" = ( +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2459,9 +2463,13 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "amg" = ( -/obj/machinery/autolathe, -/turf/open/floor/wood, -/area/centcom/holding) +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/evac) "ami" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fullgrass, @@ -2472,9 +2480,7 @@ /area/centcom/control) "amk" = ( /obj/structure/closet/secure_closet/ert_med, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -32; +/obj/machinery/vending/wallmed/directional/south{ use_power = 0 }, /obj/effect/turf_decal/stripes/line{ @@ -2506,6 +2512,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "amq" = ( @@ -2616,7 +2623,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/supplypod) "amD" = ( @@ -2658,9 +2665,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2674,9 +2679,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "amK" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/crowbar/red, /obj/item/wrench, @@ -2691,6 +2694,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/ferry) "amO" = ( @@ -2718,10 +2722,7 @@ "amS" = ( /obj/structure/destructible/cult/tome, /obj/item/book/codex_gigas, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2774,9 +2775,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2787,14 +2786,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/ferry) "anb" = ( /obj/structure/bookcase/random, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -2877,13 +2874,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "ank" = ( -/obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/turf/open/floor/iron/cafeteria, +/turf/closed/indestructible/wood, /area/centcom/holding) "anl" = ( /obj/effect/turf_decal/tile/green, @@ -2894,9 +2885,7 @@ /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -2907,11 +2896,18 @@ /turf/open/floor/iron, /area/centcom/control) "ant" = ( -/obj/structure/musician/piano, -/obj/machinery/light{ +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/turf/open/floor/carpet/black, +/turf/open/floor/iron/white, /area/centcom/holding) "anu" = ( /obj/machinery/abductor/gland_dispenser, @@ -2926,13 +2922,8 @@ /obj/item/dice/d10{ pixel_x = -3 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3040,9 +3031,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3056,10 +3045,22 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "anP" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" +/obj/structure/sink/kitchen{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "sink"; + pixel_y = 28 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "anR" = ( /obj/structure/table/wood, @@ -3111,12 +3112,20 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aoc" = ( -/obj/structure/rack, -/obj/item/nullrod/claymore/katana{ - damtype = "stamina"; - force = 30 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aof" = ( /turf/closed/indestructible/abductor{ @@ -3196,9 +3205,17 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aoq" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/turf/open/floor/iron/cafeteria, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aor" = ( /obj/structure/table/reinforced, @@ -3231,10 +3248,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aot" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3286,35 +3300,20 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/plating/asteroid, /area/centcom/evac) "aoD" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/filingcabinet/filingcabinet, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/supply) +/obj/machinery/autolathe, +/turf/open/floor/wood, +/area/centcom/holding) "aoE" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/tdome/tdomeobserve) "aoG" = ( @@ -3337,16 +3336,11 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aoN" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "aoO" = ( @@ -3370,9 +3364,11 @@ /turf/open/floor/carpet, /area/wizard_station) "aoS" = ( -/obj/structure/chair/wood/wings{ - dir = 3 - }, +/obj/structure/table/wood/bar, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, /turf/open/floor/wood, /area/centcom/holding) "aoT" = ( @@ -3427,14 +3423,6 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/ert) "ape" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/nullrod/claymore/saber{ - damtype = "stamina"; - force = 30 - }, /turf/open/floor/wood, /area/centcom/holding) "apg" = ( @@ -3449,7 +3437,7 @@ /area/centcom/supplypod/loading/one) "api" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/supplypod) "apm" = ( @@ -3458,6 +3446,7 @@ pixel_y = 24 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/centcom/ferry) "apn" = ( @@ -3491,8 +3480,10 @@ /turf/open/floor/iron, /area/centcom/evac) "app" = ( -/obj/structure/table, -/turf/open/floor/iron/cafeteria, +/obj/structure/table/wood/bar, +/obj/structure/safe/floor, +/obj/item/seeds/cherry/bomb, +/turf/open/floor/wood, /area/centcom/holding) "aps" = ( /obj/structure/table, @@ -3508,18 +3499,20 @@ /turf/open/floor/engine/cult, /area/wizard_station) "apv" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/evac) +/obj/structure/dresser, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/centcom/holding) "apz" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/grimy, /area/centcom/control) "apA" = ( @@ -3587,7 +3580,10 @@ /turf/open/floor/iron, /area/centcom/ferry) "apN" = ( -/obj/machinery/vending/autodrobe, +/obj/structure/table/wood/bar, +/obj/structure/mirror{ + pixel_y = 28 + }, /turf/open/floor/wood, /area/centcom/holding) "apP" = ( @@ -3597,6 +3593,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/centcom/supply) "apQ" = ( @@ -3641,14 +3638,8 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "apT" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/eastright{ - dir = 8; - name = "Animal Pen" - }, -/turf/open/floor/grass, +/obj/machinery/vending/clothing, +/turf/open/floor/wood, /area/centcom/holding) "apV" = ( /obj/structure/table/wood, @@ -3693,9 +3684,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/control) @@ -3714,14 +3703,9 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aqg" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3735,12 +3719,11 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aqh" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "aqi" = ( @@ -3763,9 +3746,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/evac) "aqq" = ( @@ -3816,10 +3797,7 @@ /turf/open/floor/plating, /area/centcom/evac) "aqA" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -3836,9 +3814,7 @@ "aqB" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -3846,10 +3822,8 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "aqD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/carpet/black, +/obj/machinery/vending/autodrobe, +/turf/open/floor/wood, /area/centcom/holding) "aqF" = ( /obj/effect/turf_decal/tile/red{ @@ -3865,14 +3839,16 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "aqG" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ - locked = 0 +/obj/machinery/modular_computer/console/preset/research, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/wood, /area/centcom/holding) "aqI" = ( -/obj/machinery/smartfridge, -/turf/closed/indestructible/wood, +/obj/structure/table/wood, +/obj/machinery/computer/bookmanagement, +/turf/open/floor/wood, /area/centcom/holding) "aqJ" = ( /obj/effect/landmark/abductor/scientist, @@ -3901,6 +3877,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/centcom/control) "aqN" = ( @@ -3958,10 +3935,7 @@ /obj/machinery/chem_master/condimaster{ name = "HoochMaster 2000" }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3976,7 +3950,7 @@ /area/tdome/tdomeobserve) "aqY" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/centcom/ferry) "aqZ" = ( @@ -4011,7 +3985,15 @@ /turf/open/floor/mineral/titanium, /area/centcom/evac) "arf" = ( -/obj/structure/mineral_door/paperframe, +/obj/structure/table/wood, +/obj/item/camera/detective{ + desc = "A polaroid camera with extra capacity for social media marketing."; + name = "Professional camera" + }, +/obj/item/camera_film, +/obj/item/wallframe/newscaster, +/obj/item/paper_bin, +/obj/item/pen/fountain, /turf/open/floor/wood, /area/centcom/holding) "arh" = ( @@ -4056,7 +4038,22 @@ /turf/closed/indestructible/riveted, /area/tdome/tdomeadmin) "arr" = ( -/turf/open/floor/iron/stairs, +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "BrewMaster 2199"; + pixel_x = -4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aru" = ( /obj/structure/chair{ @@ -4068,12 +4065,11 @@ /turf/open/floor/iron, /area/centcom/ferry) "arx" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "ary" = ( @@ -4110,9 +4106,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 32; +/obj/machinery/vending/wallmed/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/neutral{ @@ -4125,6 +4119,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/dark, /area/centcom/ferry) "arD" = ( @@ -4148,10 +4143,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4225,6 +4217,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "arU" = ( @@ -4234,22 +4227,28 @@ /turf/open/floor/wood, /area/wizard_station) "arV" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green{ dir = 8 }, /turf/open/floor/iron, /area/centcom/control) "arW" = ( -/obj/machinery/light{ +/obj/structure/table, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/seeds/pumpkin/blumpkin, +/obj/item/paper/guides/jobs/hydroponics, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/structure/rack, -/obj/item/nullrod/claymore/saber/red{ - damtype = "stamina"; - force = 30 +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/iron/white, /area/centcom/holding) "arX" = ( /obj/effect/turf_decal/tile/blue{ @@ -4290,22 +4289,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "asc" = ( -/obj/structure/closet{ - anchored = 1; - desc = "A storage unit for plasmaman internals, courtesy of the Spider Clan."; - icon_state = "emergency"; - name = "Plasmaman emergency closet" - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, +/obj/machinery/door/airlock/wood, /turf/open/floor/wood, /area/centcom/holding) "asg" = ( @@ -4332,7 +4316,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/pointybush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/grass, /area/tdome/tdomeadmin) "asp" = ( @@ -4392,9 +4376,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -4408,11 +4390,8 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "asA" = ( -/obj/structure/chair/wood/wings{ - dir = 8 - }, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 28 +/obj/structure/chair/wood{ + dir = 1 }, /turf/open/floor/wood, /area/centcom/holding) @@ -4420,9 +4399,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/centcom/supplypod) "asC" = ( @@ -4466,16 +4443,26 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "asI" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/wood, +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/glass/beaker/large, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "asM" = ( /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4489,10 +4476,18 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "asN" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "asP" = ( /obj/structure/chair/comfy/brown{ @@ -4550,7 +4545,7 @@ /turf/open/floor/iron, /area/tdome/arena) "asU" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -4564,12 +4559,8 @@ }, /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/machinery/newscaster/security_unit/directional/north, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4682,10 +4673,7 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4724,15 +4712,11 @@ /area/centcom/control) "ats" = ( /obj/structure/chair/comfy/black, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "att" = ( @@ -4748,9 +4732,8 @@ /turf/open/floor/iron, /area/wizard_station) "atv" = ( -/obj/structure/table/wood/fancy, -/obj/item/candle/infinite{ - pixel_y = 6 +/obj/machinery/light{ + dir = 8 }, /turf/open/floor/wood, /area/centcom/holding) @@ -4817,9 +4800,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fernybush, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron{ icon_state = "asteroid5"; name = "plating" @@ -4846,7 +4827,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/supply) "atK" = ( @@ -4914,9 +4895,15 @@ /turf/open/floor/iron/white, /area/centcom/control) "atP" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/control) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/eastright{ + dir = 8; + name = "Animal Pen" + }, +/turf/open/floor/grass, +/area/centcom/holding) "atQ" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -4936,22 +4923,10 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "atR" = ( -/obj/machinery/chem_master/condimaster{ - desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199"; - pixel_x = -4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/turf/open/floor/grass, /area/centcom/holding) "atS" = ( /obj/structure/table/reinforced, @@ -4963,9 +4938,11 @@ /turf/open/floor/iron, /area/centcom/supply) "atT" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/control) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/centcom/holding) "atU" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -4994,10 +4971,7 @@ /area/centcom/control) "atX" = ( /obj/structure/bookcase/random, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5011,9 +4985,21 @@ /turf/open/floor/iron/dark, /area/centcom/control) "atY" = ( -/obj/structure/table/wood, -/obj/item/food/sashimi, -/turf/open/floor/wood, +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aua" = ( /obj/effect/turf_decal/tile/neutral{ @@ -5032,16 +5018,13 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/wood, /area/centcom/ferry) "auc" = ( /obj/structure/closet/crate/bin, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5074,10 +5057,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "aui" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -5108,10 +5088,7 @@ }, /obj/item/storage/secure/briefcase, /obj/structure/table/wood, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5153,8 +5130,11 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/centcom/evac) "auu" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/mob/living/simple_animal/chicken, +/turf/open/floor/grass, /area/centcom/holding) "auv" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -5169,10 +5149,7 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "aux" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -5196,9 +5173,7 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "auF" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/crowbar/red, /obj/item/wrench, @@ -5250,17 +5225,13 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "auS" = ( -/obj/machinery/vending/dinnerware, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/grass, /area/centcom/holding) "auU" = ( /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5274,7 +5245,8 @@ /turf/open/floor/iron/dark, /area/centcom/control) "auX" = ( -/turf/open/floor/wood, +/mob/living/simple_animal/cow, +/turf/open/floor/grass, /area/centcom/holding) "auZ" = ( /obj/machinery/light{ @@ -5394,9 +5366,7 @@ /obj/item/crowbar/red, /obj/item/crowbar/power, /obj/item/storage/belt/security/full, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -5420,10 +5390,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5456,14 +5423,31 @@ /turf/open/floor/iron, /area/tdome/arena) "avD" = ( -/obj/structure/reagent_dispensers/cooking_oil, -/turf/open/floor/iron/cafeteria, +/obj/structure/closet/crate, +/obj/item/vending_refill/autodrobe, +/obj/item/stack/sheet/paperframes/fifty, +/obj/item/stack/sheet/paperframes/fifty, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/lights/mixed, +/turf/open/floor/wood, /area/centcom/holding) "avE" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker, -/turf/open/floor/iron/cafeteria, -/area/centcom/holding) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/control) "avI" = ( /obj/machinery/computer/shuttle/mining, /obj/effect/turf_decal/stripes/line{ @@ -5490,21 +5474,26 @@ /obj/structure/table/reinforced, /obj/item/storage/box/syringes, /obj/item/gun/syringe/rapidsyringe, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/centcom/ferry) "avM" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/grass, -/area/centcom/holding) +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/control) "avN" = ( /obj/structure/table/wood, /obj/item/storage/box/beanbag, @@ -5519,6 +5508,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "avQ" = ( @@ -5531,10 +5521,7 @@ /obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/flashlight/seclite, /obj/structure/table/reinforced, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -5640,10 +5627,7 @@ /turf/open/floor/grass, /area/centcom/ferry) "awk" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -5685,15 +5669,18 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/one) "awp" = ( -/obj/structure/closet, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/iv_drip, -/obj/item/roller, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/medigel/synthflesh, -/obj/item/reagent_containers/medigel/synthflesh, -/obj/item/reagent_containers/medigel/synthflesh, -/turf/open/floor/wood, +/obj/machinery/vending/hydroseeds, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "awr" = ( /obj/effect/turf_decal/tile/blue{ @@ -5709,9 +5696,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -5816,6 +5801,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "awI" = ( @@ -5832,10 +5818,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5849,9 +5832,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "awM" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -5918,9 +5899,7 @@ /area/centcom/evac) "awV" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5960,6 +5939,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/centcom/ferry) "axb" = ( @@ -5993,9 +5973,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "axe" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6071,8 +6049,25 @@ /turf/open/floor/iron, /area/centcom/supply) "axt" = ( -/obj/machinery/computer/arcade/battle, -/turf/open/floor/wood, +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wirecutters, +/obj/item/wrench, +/obj/item/watertank, +/obj/item/cultivator, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "axu" = ( /obj/structure/destructible/cult/forge{ @@ -6106,10 +6101,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6147,9 +6139,7 @@ /area/tdome/arena) "axH" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/evac) "axJ" = ( @@ -6167,16 +6157,13 @@ /turf/open/floor/iron, /area/centcom/ferry) "axL" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "axP" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -6186,9 +6173,19 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "axQ" = ( -/obj/machinery/chem_dispenser/drinks, -/turf/closed/indestructible/wood, -/area/centcom/holding) +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/control) "axT" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -6231,14 +6228,7 @@ /turf/open/floor/iron, /area/centcom/supplypod/loading/ert) "ayb" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wirecutters, -/obj/item/wrench, -/obj/item/watertank, -/obj/item/cultivator, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/machinery/biogenerator, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -6253,16 +6243,15 @@ /area/centcom/holding) "ayd" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/control) "aye" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/wt550, /obj/item/flashlight/seclite, -/obj/structure/noticeboard{ - pixel_y = 28 - }, +/obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -6284,11 +6273,20 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "ayh" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/grass, +/obj/structure/closet/secure_closet/hydroponics{ + locked = 0 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "ayi" = ( /obj/effect/turf_decal/stripes/line{ @@ -6314,9 +6312,7 @@ /area/centcom/ferry) "ayk" = ( /obj/structure/bookcase/random, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6327,6 +6323,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "aym" = ( @@ -6354,8 +6351,11 @@ /turf/open/floor/engine/cult, /area/wizard_station) "ayq" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, +/obj/machinery/gibber, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "ays" = ( /obj/structure/bed/abductor, @@ -6367,9 +6367,7 @@ /obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, /obj/item/crowbar/red, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6380,6 +6378,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/centcom/control) "ayv" = ( @@ -6401,17 +6400,14 @@ "ayy" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/tdome/tdomeobserve) "ayA" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeadmin) +/obj/machinery/processor, +/turf/open/floor/iron/cafeteria, +/area/centcom/holding) "ayB" = ( /obj/machinery/mech_bay_recharge_port, /turf/open/floor/plating, @@ -6521,12 +6517,9 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "ayQ" = ( -/obj/item/clothing/under/costume/jabroni, -/obj/item/clothing/under/costume/geisha, -/obj/item/clothing/under/costume/kilt, -/obj/structure/closet, -/obj/item/clothing/under/costume/roman, -/turf/open/floor/wood, +/obj/structure/table, +/obj/item/book/manual/chef_recipes, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "ayS" = ( /obj/structure/lattice, @@ -6585,10 +6578,8 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/machinery/light, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6640,9 +6631,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/genericbush, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/grass, /area/centcom/control) "azs" = ( @@ -6666,9 +6655,7 @@ /obj/item/taperecorder, /obj/item/storage/box/handcuffs, /obj/item/flashlight/seclite, -/obj/structure/noticeboard{ - pixel_y = 28 - }, +/obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -6824,24 +6811,28 @@ /turf/open/floor/iron, /area/centcom/control) "azY" = ( -/obj/machinery/newscaster, -/turf/closed/indestructible/riveted, -/area/centcom/control) +/obj/structure/sink/kitchen{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "sink"; + pixel_y = 28 + }, +/turf/open/floor/iron/cafeteria, +/area/centcom/holding) "aAa" = ( /obj/machinery/power/smes/magical, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/ferry) "aAb" = ( -/obj/structure/table/wood/bar, -/obj/structure/safe/floor, -/obj/item/seeds/cherry/bomb, -/turf/open/floor/wood, +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aAc" = ( /obj/item/toy/figure/syndie, @@ -6955,10 +6946,7 @@ /turf/open/floor/iron, /area/tdome/tdomeadmin) "aAt" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -6975,6 +6963,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/supply) "aAv" = ( @@ -6987,10 +6976,11 @@ /turf/open/floor/plating, /area/centcom/ferry) "aAz" = ( -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, -/obj/structure/closet/crate, +/obj/structure/table, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/soap/deluxe, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "aAA" = ( @@ -7003,9 +6993,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7069,8 +7057,8 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "aAK" = ( -/obj/machinery/chem_dispenser/drinks/beer, -/turf/closed/indestructible/wood, +/obj/machinery/deepfryer, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aAL" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -7219,6 +7207,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aBk" = ( @@ -7249,6 +7238,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aBn" = ( @@ -7272,9 +7262,7 @@ /turf/open/floor/iron, /area/centcom/control) "aBs" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7285,6 +7273,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/centcom/control) "aBt" = ( @@ -7323,9 +7312,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "aBE" = ( @@ -7357,10 +7344,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "aBL" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7411,16 +7395,11 @@ /turf/open/floor/iron/grimy, /area/tdome/tdomeobserve) "aBR" = ( -/obj/structure/chair/wood/wings{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aBS" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -7471,9 +7450,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "aCh" = ( @@ -7520,12 +7497,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "aCp" = ( @@ -7559,9 +7532,7 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aCu" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "aCv" = ( @@ -7572,9 +7543,7 @@ /obj/item/grenade/c4{ pixel_x = -4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) @@ -7596,9 +7565,7 @@ /area/centcom/control) "aCy" = ( /obj/machinery/photocopier, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/machinery/button/door/indestructible{ id = "XCCFerry"; name = "Hanger Bay Shutters"; @@ -7685,9 +7652,7 @@ /area/centcom/evac) "aCI" = ( /obj/machinery/vending/coffee, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7709,10 +7674,9 @@ "aCM" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/centcom/control) "aCN" = ( @@ -7748,6 +7712,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/ferry) "aCS" = ( @@ -7780,9 +7745,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7820,17 +7783,12 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aCZ" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_y = 28; + use_power = 0 }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aDa" = ( /obj/structure/table/reinforced, @@ -7839,10 +7797,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7856,9 +7811,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aDb" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7875,9 +7828,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -7890,10 +7841,7 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7910,10 +7858,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7957,12 +7902,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aDh" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, +/obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/button/door/indestructible{ @@ -7999,9 +7943,7 @@ /turf/open/floor/iron, /area/centcom/control) "aDl" = ( -/obj/machinery/computer/auxiliary_base{ - pixel_y = 32 - }, +/obj/machinery/computer/auxiliary_base/directional/north, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/radio/headset/headset_cent, @@ -8036,10 +7978,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8069,12 +8008,7 @@ /turf/open/floor/iron, /area/centcom/evac) "aDq" = ( -/obj/structure/table/wood/bar, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/storage/toolbox/mechanical, -/obj/item/multitool, -/turf/open/floor/wood, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aDr" = ( /obj/machinery/door/airlock/centcom{ @@ -8103,25 +8037,14 @@ /turf/open/floor/iron, /area/centcom/control) "aDv" = ( -/obj/machinery/seed_extractor, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/structure/mopbucket, +/obj/item/mop, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aDw" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -8190,9 +8113,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 }, @@ -8230,9 +8151,18 @@ /turf/closed/indestructible/riveted, /area/tdome/tdomeobserve) "aDW" = ( -/obj/structure/table, -/obj/item/book/manual/chef_recipes, -/turf/open/floor/iron/cafeteria, +/obj/machinery/light, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aDY" = ( /obj/structure/table/reinforced, @@ -8256,7 +8186,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aEa" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/control) @@ -8299,9 +8229,7 @@ /obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/supply) "aEf" = ( @@ -8310,9 +8238,6 @@ /area/centcom/control) "aEg" = ( /obj/machinery/vending/cigarette, -/obj/machinery/newscaster{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8452,6 +8377,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aEF" = ( @@ -8482,9 +8408,7 @@ }, /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8514,6 +8438,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "aEO" = ( @@ -8525,7 +8450,8 @@ /area/centcom/ferry) "aEQ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "aER" = ( @@ -8643,10 +8569,7 @@ id = "XCCsec3"; name = "CC Main Access Control" }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8663,9 +8586,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8676,6 +8597,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "aFi" = ( @@ -8722,10 +8644,7 @@ /area/centcom/evac) "aFt" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -8735,11 +8654,8 @@ /turf/open/floor/engine/cult, /area/wizard_station) "aFy" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/grass, +/obj/machinery/smartfridge, +/turf/closed/indestructible/wood, /area/centcom/holding) "aFB" = ( /turf/open/floor/circuit/green, @@ -8772,9 +8688,8 @@ name = "CentCom Stand"; req_access_txt = "109" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "aFH" = ( @@ -8793,25 +8708,17 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aFI" = ( -/obj/machinery/biogenerator, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aFK" = ( /obj/machinery/vending/security, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/control) "aFM" = ( @@ -8879,7 +8786,9 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aFU" = ( -/obj/machinery/computer/arcade/orion_trail, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, /turf/open/floor/wood, /area/centcom/holding) "aFV" = ( @@ -8888,16 +8797,12 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/plating/asteroid, /area/tdome/tdomeadmin) "aFX" = ( /obj/structure/closet/secure_closet/ert_engi, -/obj/machinery/airalarm{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -8955,10 +8860,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9004,9 +8906,7 @@ /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9029,8 +8929,12 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "aGw" = ( -/obj/structure/mopbucket, -/obj/item/mop, +/obj/structure/closet/secure_closet/freezer/meat/open, +/obj/item/food/fishmeat/carp, +/obj/item/food/fishmeat/carp, +/obj/item/food/fishmeat/carp, +/obj/item/food/fishmeat/carp, +/obj/item/food/fishmeat/carp, /turf/open/floor/iron/cafeteria, /area/centcom/holding) "aGx" = ( @@ -9043,9 +8947,7 @@ pixel_x = -8 }, /obj/item/kitchen/knife, -/obj/machinery/newscaster{ - pixel_x = -32 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9081,9 +8983,9 @@ /turf/open/floor/iron, /area/centcom/supply) "aGC" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeadmin) +/obj/structure/closet/secure_closet/freezer/fridge/open, +/turf/open/floor/iron/cafeteria, +/area/centcom/holding) "aGE" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/stripes/line{ @@ -9097,13 +8999,10 @@ }, /area/centcom/control) "aGI" = ( -/mob/living/simple_animal/bot/medbot{ - desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern."; - name = "Hattori"; - radio_key = null; - stationary_mode = 1 +/obj/structure/closet/secure_closet/freezer/kitchen{ + locked = 0 }, -/turf/open/floor/wood, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aGK" = ( /obj/structure/table/reinforced, @@ -9120,11 +9019,8 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9273,33 +9169,18 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aHb" = ( -/obj/machinery/light_switch{ - pixel_y = 24 - }, +/obj/machinery/light_switch/directional/north, /turf/open/floor/wood, /area/centcom/ferry) "aHd" = ( -/obj/machinery/door/airlock/wood{ - id_tag = "lmrestroom" - }, -/turf/open/floor/wood, +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aHe" = ( /obj/structure/table, -/obj/item/book/manual/hydroponics_pod_people, -/obj/item/seeds/pumpkin/blumpkin, -/obj/item/paper/guides/jobs/hydroponics, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aHg" = ( /obj/structure/chair/stool, @@ -9343,12 +9224,9 @@ /turf/open/floor/iron, /area/centcom/control) "aHn" = ( -/obj/structure/rack, -/obj/item/nullrod/claymore{ - damtype = "stamina"; - force = 30 - }, -/turf/open/floor/wood, +/obj/structure/table, +/obj/item/stack/package_wrap, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aHo" = ( /obj/machinery/shower{ @@ -9446,10 +9324,8 @@ /turf/open/floor/iron, /area/centcom/control) "aHJ" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/iron/white, +/obj/structure/table, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aHK" = ( /obj/structure/chair{ @@ -9463,14 +9339,9 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "aHL" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9528,9 +9399,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -9583,8 +9452,11 @@ }, /area/awaymission/errorroom) "aHZ" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/wood, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/wiki/barman_recipes, +/obj/structure/closet/crate, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aIb" = ( /obj/structure/table/reinforced, @@ -9691,33 +9563,21 @@ /turf/open/floor/iron, /area/centcom/control) "aIv" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/structure/closet/chefcloset, +/turf/open/floor/iron/cafeteria, /area/centcom/holding) "aIx" = ( -/obj/structure/mineral_door/paperframe{ - name = "Dojo" +/obj/structure/toilet{ + dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/iron/white, /area/centcom/holding) "aIA" = ( /obj/structure/sign/warning/securearea, /turf/closed/indestructible/riveted, /area/centcom/ferry) "aIC" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9728,6 +9588,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "aIE" = ( @@ -9757,14 +9618,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "aII" = ( /obj/machinery/computer/security, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/control) "aIK" = ( @@ -9794,6 +9654,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "aIN" = ( @@ -9802,11 +9663,7 @@ }, /area/abductor_ship) "aIO" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Commander's Office APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -9845,6 +9702,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/ferry) "aIV" = ( @@ -9942,23 +9800,20 @@ /turf/open/floor/plating/asteroid, /area/tdome/tdomeobserve) "aJw" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 1 +/obj/structure/urinal{ + pixel_y = 28 }, -/obj/item/soap/deluxe, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/white, /area/centcom/holding) "aJx" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/tdome/tdomeobserve) "aJy" = ( @@ -9980,8 +9835,8 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aJC" = ( -/obj/effect/spawner/randomarcade, -/turf/open/floor/wood, +/obj/machinery/washing_machine, +/turf/open/floor/iron/white, /area/centcom/holding) "aJD" = ( /obj/machinery/door/poddoor{ @@ -9997,9 +9852,7 @@ /obj/structure/table/wood, /obj/item/storage/photo_album, /obj/item/camera, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10023,14 +9876,14 @@ /turf/open/floor/iron/dark, /area/centcom/supplypod) "aJH" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/light{ - dir = 4 +/obj/structure/curtain, +/obj/structure/window/reinforced/tinted{ + dir = 8 }, -/turf/open/floor/grass, +/obj/machinery/shower{ + pixel_y = 12 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aJL" = ( /obj/machinery/door/airlock/centcom{ @@ -10069,10 +9922,8 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aJQ" = ( -/obj/structure/window/paperframe{ - CanAtmosPass = 0 - }, -/turf/open/floor/wood, +/obj/machinery/vending/boozeomat, +/turf/closed/indestructible/wood, /area/centcom/holding) "aJS" = ( /obj/structure/table/wood, @@ -10187,20 +10038,15 @@ /turf/open/floor/carpet, /area/wizard_station) "aKj" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28; - use_power = 0 - }, -/turf/open/floor/iron/cafeteria, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/closed/indestructible/wood, /area/centcom/holding) "aKl" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "aKm" = ( @@ -10240,6 +10086,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/control) "aKv" = ( @@ -10284,7 +10131,7 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "aKG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -10311,9 +10158,9 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "aKP" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/centcom/supply) +/obj/machinery/chem_dispenser/drinks, +/turf/closed/indestructible/wood, +/area/centcom/holding) "aKQ" = ( /obj/structure/chair/office{ dir = 8 @@ -10344,9 +10191,9 @@ /area/centcom/supply) "aKV" = ( /obj/machinery/light{ - dir = 4 + dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/iron/white, /area/centcom/holding) "aKX" = ( /obj/machinery/processor, @@ -10368,6 +10215,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "aLc" = ( @@ -10395,7 +10243,7 @@ /turf/open/space/transit, /area/space) "aLh" = ( -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/white, /area/centcom/holding) "aLj" = ( /obj/structure/chair, @@ -10407,9 +10255,7 @@ "aLk" = ( /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/machinery/newscaster/security_unit/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10439,10 +10285,7 @@ /obj/item/clipboard, /obj/item/folder/white, /obj/item/pen/blue, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10514,21 +10357,18 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aLD" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 +/obj/structure/musician/piano, +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/button/door/indestructible{ - id = "lmrestroom"; - name = "Lock Control"; - pixel_y = -28 - }, -/turf/open/floor/iron/white, +/turf/open/floor/carpet/black, /area/centcom/holding) "aLF" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/turf/open/floor/iron/cafeteria, +/obj/structure/sign/barsign{ + pixel_y = 32 + }, +/obj/structure/chair/stool, +/turf/open/floor/carpet/black, /area/centcom/holding) "aLG" = ( /obj/effect/turf_decal/tile/neutral{ @@ -10548,8 +10388,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aLK" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/machinery/light{ dir = 4 }, /turf/open/floor/carpet/black, @@ -10602,18 +10441,8 @@ /turf/open/floor/iron, /area/tdome/arena) "aLR" = ( -/obj/machinery/vending/hydroseeds, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, /area/centcom/holding) "aLS" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -10649,10 +10478,7 @@ /turf/open/floor/grass, /area/centcom/evac) "aLY" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "aLZ" = ( @@ -10695,9 +10521,7 @@ }, /obj/item/stamp, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10708,6 +10532,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/dark, /area/centcom/control) "aMm" = ( @@ -10731,9 +10556,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10797,6 +10620,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aMs" = ( @@ -10812,9 +10636,7 @@ /turf/open/floor/iron, /area/centcom/control) "aMu" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark, /area/centcom/supplypod) @@ -10822,9 +10644,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "aMw" = ( @@ -10841,9 +10661,7 @@ /turf/open/floor/iron, /area/centcom/ferry) "aMx" = ( -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, +/obj/machinery/status_display/ai/directional/north, /obj/item/kirbyplants{ icon_state = "plant-15"; pixel_x = -6; @@ -10890,9 +10708,7 @@ /area/centcom/evac) "aMI" = ( /obj/structure/filingcabinet/medical, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11035,15 +10851,12 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "aNj" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/grimy, /area/centcom/ferry) "aNk" = ( @@ -11083,15 +10896,11 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/machinery/light_switch/directional/south, /turf/open/floor/wood, /area/centcom/ferry) "aNq" = ( -/obj/machinery/computer/auxiliary_base{ - pixel_y = 32 - }, +/obj/machinery/computer/auxiliary_base/directional/north, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/yellow, @@ -11109,19 +10918,21 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "aNr" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/sink{ + dir = 4; + pixel_x = -12; + pixel_y = 2 }, -/turf/open/floor/wood, +/obj/machinery/button/door/indestructible{ + id = "lmrestroom"; + name = "Lock Control"; + pixel_y = -28 + }, +/turf/open/floor/iron/white, /area/centcom/holding) "aNu" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/machinery/recharge_station, +/turf/open/floor/iron/white, /area/centcom/holding) "aNv" = ( /obj/structure/table/reinforced, @@ -11141,10 +10952,10 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aNw" = ( -/obj/structure/chair/wood/wings{ - dir = 1 - }, -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/item/instrument/piano_synth, +/obj/item/instrument/guitar, +/turf/open/floor/carpet/black, /area/centcom/holding) "aNx" = ( /obj/machinery/light/small{ @@ -11232,17 +11043,11 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aNL" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/wood, +/turf/open/floor/carpet/black, /area/centcom/holding) "aNM" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/supply) @@ -11292,15 +11097,16 @@ /turf/open/floor/plating, /area/syndicate_mothership/control) "aNX" = ( -/obj/structure/window/reinforced, -/turf/open/floor/carpet/black, +/obj/structure/table/wood, +/obj/item/food/chawanmushi, +/turf/open/floor/wood, /area/centcom/holding) "aNY" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/supply) "aOb" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -11336,15 +11142,11 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, +/obj/machinery/newscaster/directional/east, /turf/open/floor/iron/grimy, /area/centcom/control) "aOj" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/dark, @@ -11366,11 +11168,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "aOn" = ( -/mob/living/simple_animal/cow, -/turf/open/floor/grass, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/centcom/holding) "aOp" = ( /obj/structure/table/reinforced, @@ -11378,9 +11181,7 @@ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11394,9 +11195,7 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aOq" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -11433,15 +11232,13 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aOv" = ( -/obj/effect/landmark/holding_facility, +/obj/structure/table/wood, +/obj/item/food/sashimi, /turf/open/floor/wood, /area/centcom/holding) "aOx" = ( -/obj/machinery/light, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, +/obj/machinery/light/directional/south, +/obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -11452,6 +11249,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "aOB" = ( @@ -11481,9 +11279,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aOG" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11497,18 +11293,15 @@ /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "aOH" = ( -/obj/structure/chair/wood/wings{ - dir = 8 - }, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/sake, /turf/open/floor/wood, /area/centcom/holding) "aOI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "aOK" = ( @@ -11533,23 +11326,25 @@ /turf/closed/indestructible/riveted, /area/centcom/control) "aOR" = ( -/obj/machinery/light, +/obj/machinery/door/airlock/wood{ + id_tag = "lmrestroom" + }, /turf/open/floor/wood, /area/centcom/holding) "aOS" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, /obj/item/gun/ballistic/automatic/ar, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/ferry) "aOT" = ( -/obj/machinery/status_display/ai, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/wood, +/area/centcom/holding) "aOV" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -11564,7 +11359,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/evac) "aOY" = ( @@ -11588,10 +11383,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11607,12 +11399,8 @@ "aPa" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11631,10 +11419,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11648,19 +11433,14 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aPe" = ( -/obj/machinery/light_switch{ - pixel_x = -24 - }, +/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/grimy, /area/centcom/ferry) "aPf" = ( /obj/machinery/computer/med_data{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -11718,24 +11498,20 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aPq" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_x = -3; - pixel_y = 3 +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/open/floor/wood, /area/centcom/holding) "aPr" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "aPu" = ( @@ -11747,6 +11523,7 @@ /area/centcom/control) "aPv" = ( /obj/machinery/modular_computer/console/preset/id/centcom, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/grimy, /area/centcom/ferry) "aPx" = ( @@ -11803,13 +11580,7 @@ /turf/open/floor/wood, /area/syndicate_mothership/control) "aPH" = ( -/obj/structure/chair/wood/wings{ - dir = 3 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood, +/turf/open/floor/iron/stairs, /area/centcom/holding) "aPI" = ( /obj/effect/turf_decal/stripes/line{ @@ -11818,10 +11589,7 @@ /turf/open/floor/iron, /area/centcom/control) "aPJ" = ( -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, +/obj/structure/noticeboard/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11838,7 +11606,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -11951,8 +11719,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aQb" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/sake, +/obj/structure/chair/stool/bar, /turf/open/floor/wood, /area/centcom/holding) "aQd" = ( @@ -11962,21 +11729,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/evac) "aQe" = ( /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/machinery/light/directional/east, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12033,9 +11794,7 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "aQo" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, +/obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12049,8 +11808,10 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aQp" = ( -/obj/structure/closet/chefcloset, -/turf/open/floor/iron/cafeteria, +/obj/structure/chair/wood/wings{ + dir = 3 + }, +/turf/open/floor/wood, /area/centcom/holding) "aQs" = ( /obj/structure/chair/stool, @@ -12065,10 +11826,10 @@ /turf/closed/indestructible/riveted, /area/centcom/ferry) "aQu" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/centcom/holding) "aQw" = ( /obj/effect/turf_decal/tile/green{ @@ -12093,7 +11854,7 @@ /turf/open/floor/iron, /area/centcom/control) "aQE" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -12115,9 +11876,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aQI" = ( -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/computer/med_data{ dir = 1 }, @@ -12147,19 +11906,20 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/control) "aQL" = ( -/obj/machinery/gibber, +/obj/structure/chair/wood/wings{ + dir = 3 + }, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/wood, /area/centcom/holding) "aQM" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -12199,9 +11959,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "aQW" = ( @@ -12225,10 +11983,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12266,9 +12021,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -12346,10 +12099,14 @@ /turf/open/floor/iron, /area/syndicate_mothership/control) "aRp" = ( -/turf/open/floor/iron/white, +/obj/structure/table/wood/fancy, +/obj/item/candle/infinite{ + pixel_y = 6 + }, +/turf/open/floor/wood, /area/centcom/holding) "aRq" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12365,25 +12122,19 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "aRt" = ( -/obj/structure/dresser, -/obj/machinery/light{ +/obj/structure/chair/wood/wings{ dir = 1 }, /turf/open/floor/wood, /area/centcom/holding) "aRu" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 +/obj/structure/chair/wood/wings{ + dir = 4 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/wood, /area/centcom/holding) "aRw" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12480,7 +12231,9 @@ /turf/open/floor/iron/dark, /area/centcom/evac) "aRI" = ( -/obj/structure/chair/stool, +/obj/structure/chair/wood/wings{ + dir = 8 + }, /turf/open/floor/wood, /area/centcom/holding) "aRJ" = ( @@ -12501,25 +12254,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/centcom/control) "aRL" = ( /obj/structure/toilet{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/iron/white, /area/centcom/ferry) "aRM" = ( /obj/structure/bookcase/random, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, +/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12558,6 +12306,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/centcom/control) "aRP" = ( @@ -12590,10 +12339,15 @@ /turf/open/floor/iron/grimy, /area/centcom/ferry) "aRS" = ( -/obj/structure/urinal{ - pixel_y = 28 +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/iron/white, +/turf/open/floor/grass, /area/centcom/holding) "aRT" = ( /obj/effect/turf_decal/tile/brown{ @@ -12612,22 +12366,12 @@ /turf/open/floor/carpet, /area/wizard_station) "aRZ" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "sink"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/grass, /area/centcom/holding) "aSa" = ( /obj/structure/table/reinforced, @@ -12667,7 +12411,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/genericbush, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/grass, /area/centcom/evac) "aSf" = ( @@ -12688,18 +12432,12 @@ /area/centcom/ferry) "aSl" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light, +/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/evac) "aSm" = ( -/obj/structure/curtain, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/machinery/shower{ - pixel_y = 12 - }, -/turf/open/floor/iron/white, +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, /area/centcom/holding) "aSn" = ( /obj/structure/chair/stool, @@ -12721,8 +12459,11 @@ /turf/open/floor/iron, /area/centcom/control) "aSq" = ( -/obj/machinery/door/window/eastright, -/turf/open/floor/carpet/black, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/grass, /area/centcom/holding) "aSr" = ( /obj/structure/table/reinforced, @@ -12780,9 +12521,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "aSB" = ( @@ -12823,15 +12562,14 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "aSM" = ( /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -12848,9 +12586,7 @@ /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/item/paper/pamphlet/centcom/visitor_info, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -12860,6 +12596,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/control) "aSP" = ( @@ -12887,10 +12624,7 @@ /obj/item/ammo_box/a357, /obj/item/gun/ballistic/revolver/mateba, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -12903,6 +12637,7 @@ /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/control) "aTb" = ( @@ -12917,10 +12652,11 @@ /turf/open/floor/plating, /area/centcom/supply) "aTd" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/grass, /area/centcom/holding) "aTf" = ( /obj/machinery/door/poddoor/shutters{ @@ -12951,7 +12687,7 @@ req_access_txt = "102" }, /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12962,10 +12698,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "aTi" = ( -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12977,24 +12714,34 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/centcom/supply) "aTj" = ( -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/grass, /area/centcom/holding) "aTk" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/grass, /area/centcom/holding) "aTl" = ( -/obj/structure/table/wood, -/obj/item/food/chawanmushi, -/turf/open/floor/wood, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/light, +/turf/open/floor/grass, /area/centcom/holding) "aTm" = ( /obj/structure/table/reinforced, @@ -13099,15 +12846,8 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "aTB" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/grass, +/obj/machinery/light, +/turf/open/floor/wood, /area/centcom/holding) "aTC" = ( /obj/effect/turf_decal/tile/green{ @@ -13129,9 +12869,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/fernybush, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /turf/open/floor/iron{ dir = 6; icon_state = "asteroid8"; @@ -13178,6 +12916,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) "aTT" = ( @@ -13192,13 +12931,10 @@ /turf/open/floor/iron, /area/tdome/tdomeobserve) "aTV" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/light, -/turf/open/floor/grass, +/obj/structure/window/paperframe{ + CanAtmosPass = 0 + }, +/turf/open/floor/wood, /area/centcom/holding) "aTW" = ( /obj/item/clipboard, @@ -13244,7 +12980,7 @@ "aUd" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13258,9 +12994,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aUg" = ( -/obj/structure/chair/wood{ - dir = 1 - }, +/obj/structure/mineral_door/paperframe, /turf/open/floor/wood, /area/centcom/holding) "aUh" = ( @@ -13286,15 +13020,14 @@ /turf/open/floor/iron, /area/centcom/ferry) "aUn" = ( -/turf/closed/indestructible/wood, +/obj/effect/spawner/randomarcade, +/turf/open/floor/wood, /area/centcom/holding) "aUo" = ( /obj/machinery/computer/communications{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -13329,7 +13062,7 @@ /obj/machinery/computer/secure_data{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13376,26 +13109,15 @@ /turf/open/floor/iron/grimy, /area/tdome/tdomeobserve) "aUy" = ( -/obj/structure/table/wood, -/obj/item/camera/detective{ - desc = "A polaroid camera with extra capacity for social media marketing."; - name = "Professional camera" +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -3; + pixel_y = 3 }, -/obj/item/camera_film, -/obj/item/wallframe/newscaster, -/obj/item/paper_bin, -/obj/item/pen/fountain, /turf/open/floor/wood, /area/centcom/holding) "aUz" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/nullrod/claymore/glowing{ - damtype = "stamina"; - force = 30 - }, +/obj/machinery/computer/arcade/battle, /turf/open/floor/wood, /area/centcom/holding) "aUA" = ( @@ -13453,15 +13175,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "aUK" = ( /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13475,16 +13196,11 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aUL" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "aUM" = ( @@ -13500,9 +13216,7 @@ dir = 8; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -13516,9 +13230,8 @@ /turf/open/floor/iron, /area/centcom/control) "aUT" = ( -/obj/machinery/modular_computer/console/preset/research, -/obj/machinery/light{ - dir = 1 +/obj/item/kirbyplants{ + icon_state = "plant-10" }, /turf/open/floor/wood, /area/centcom/holding) @@ -13574,9 +13287,7 @@ /obj/machinery/computer/security{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -13590,18 +13301,8 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aVd" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/machinery/computer/arcade/orion_trail, +/turf/open/floor/wood, /area/centcom/holding) "aVe" = ( /obj/structure/bed, @@ -13619,10 +13320,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aVf" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -13637,9 +13335,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/evac) "aVk" = ( @@ -13671,12 +13367,10 @@ /turf/open/floor/iron, /area/centcom/control) "aVp" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/grass, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/wood, /area/centcom/holding) "aVs" = ( /obj/machinery/door/airlock{ @@ -13737,14 +13431,22 @@ /turf/open/floor/iron/white, /area/tdome/tdomeobserve) "aVC" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/nullrod/claymore/darkblade{ - damtype = "stamina"; - force = 30 +/obj/structure/closet{ + anchored = 1; + desc = "A storage unit for plasmaman internals, courtesy of the Spider Clan."; + icon_state = "emergency"; + name = "Plasmaman emergency closet" }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, /turf/open/floor/wood, /area/centcom/holding) "aVF" = ( @@ -13890,15 +13592,26 @@ pixel_y = 5 }, /obj/item/radio, -/obj/machinery/airalarm{ - pixel_y = 23 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/control) "aWc" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/indestructible/wood, +/obj/structure/closet{ + anchored = 1; + name = "Plasmaman suits" + }, +/obj/item/clothing/under/plasmaman, +/obj/item/clothing/under/plasmaman, +/obj/item/clothing/under/plasmaman, +/obj/item/clothing/under/plasmaman, +/obj/item/clothing/under/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/turf/open/floor/wood, /area/centcom/holding) "aWd" = ( /obj/effect/turf_decal/stripes/line{ @@ -13908,10 +13621,7 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/centcom/ferry) "aWf" = ( @@ -13924,10 +13634,7 @@ /turf/open/floor/iron, /area/centcom/control) "aWg" = ( -/obj/structure/table/wood/bar, -/obj/structure/mirror{ - pixel_y = 28 - }, +/obj/structure/chair/stool, /turf/open/floor/wood, /area/centcom/holding) "aWi" = ( @@ -13993,9 +13700,7 @@ dir = 4; pixel_x = -12 }, -/obj/structure/mirror{ - pixel_x = -28 - }, +/obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -14012,20 +13717,13 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "aWz" = ( -/obj/structure/closet/secure_closet/hydroponics{ - locked = 0 +/mob/living/simple_animal/bot/medbot{ + desc = "A little medical robot. You can make out the word \"sincerity\" on its chassis."; + name = "Hijikata"; + radio_key = null; + stationary_mode = 1 }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/turf/open/floor/wood, /area/centcom/holding) "aWA" = ( /turf/closed/indestructible/riveted, @@ -14078,20 +13776,8 @@ /turf/open/floor/iron/grimy, /area/centcom/control) "aWL" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/glass/beaker/large, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, +/obj/effect/landmark/holding_facility, +/turf/open/floor/wood, /area/centcom/holding) "aWM" = ( /obj/effect/turf_decal/tile/neutral{ @@ -14113,9 +13799,7 @@ /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) "aWP" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -14136,9 +13820,7 @@ /turf/open/floor/engine/cult, /area/wizard_station) "aWT" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14152,10 +13834,10 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aWU" = ( -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/mineral_door/paperframe{ + name = "Arcade" }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/centcom/holding) "aWX" = ( /obj/effect/turf_decal/tile/blue, @@ -14277,7 +13959,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14288,14 +13970,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/tdome/tdomeadmin) "aXr" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/mineral_door/paperframe{ + name = "Dojo" }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/centcom/holding) "aXs" = ( /obj/structure/chair/comfy/brown{ @@ -14311,10 +13993,7 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -14405,8 +14084,12 @@ /turf/open/space, /area/wizard_station) "aXH" = ( -/obj/machinery/washing_machine, -/turf/open/floor/iron/white, +/obj/structure/rack, +/obj/item/nullrod/claymore/katana{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, /area/centcom/holding) "aXI" = ( /obj/effect/turf_decal/tile/neutral{ @@ -14422,8 +14105,13 @@ /turf/open/floor/iron/dark, /area/centcom/supply) "aXJ" = ( -/obj/machinery/door/window/westleft, -/turf/open/floor/carpet/black, +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 28 + }, +/turf/open/floor/wood, /area/centcom/holding) "aXM" = ( /obj/item/kirbyplants{ @@ -14519,8 +14207,11 @@ /turf/open/floor/iron/dark, /area/centcom/control) "aYi" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 }, /turf/open/floor/carpet/black, /area/centcom/holding) @@ -14540,6 +14231,7 @@ /area/centcom/control) "aYk" = ( /obj/machinery/computer/communications, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/grimy, /area/centcom/ferry) "aYn" = ( @@ -14563,6 +14255,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/centcom/ferry) "aYs" = ( @@ -14630,9 +14323,7 @@ /turf/open/floor/plating/asteroid, /area/tdome/tdomeadmin) "aYJ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/centcom/supplypod) "aYK" = ( @@ -14665,12 +14356,19 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "aYP" = ( -/obj/machinery/status_display/evac, -/turf/closed/indestructible/riveted, -/area/tdome/tdomeobserve) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/centcom/holding) "aYQ" = ( -/obj/structure/closet/crate/freezer/blood, -/turf/open/floor/wood, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/carpet/black, /area/centcom/holding) "aYR" = ( /obj/structure/fans/tiny, @@ -14699,9 +14397,14 @@ /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) "aZa" = ( -/obj/machinery/computer/security/telescreen/entertainment, -/turf/closed/indestructible/riveted, -/area/centcom/ferry) +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 28 + }, +/turf/open/floor/wood, +/area/centcom/holding) "aZb" = ( /obj/machinery/light/small{ brightness = 3; @@ -14713,9 +14416,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -14723,6 +14424,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/control) "aZf" = ( @@ -14744,9 +14446,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/control) "aZj" = ( @@ -14765,9 +14465,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/centcom/supplypod) "aZp" = ( @@ -14836,7 +14534,7 @@ /area/centcom/supplypod) "aZz" = ( /obj/structure/bookcase/random, -/obj/machinery/light, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14864,9 +14562,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14942,14 +14638,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/centcom/evac) "aZO" = ( -/obj/machinery/processor, -/turf/open/floor/iron/cafeteria, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/nullrod/claymore/saber{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, /area/centcom/holding) "aZP" = ( /obj/machinery/door/poddoor/shutters{ @@ -14982,10 +14684,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aZR" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -15006,9 +14705,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/north, /turf/open/floor/plating/asteroid, /area/centcom/evac) "aZU" = ( @@ -15062,6 +14759,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/centcom/ferry) "aZY" = ( @@ -15103,6 +14801,14 @@ }, /turf/open/floor/iron/dark, /area/tdome/arena_source) +"cza" = ( +/obj/structure/rack, +/obj/item/nullrod/scythe/vibro{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, +/area/centcom/holding) "cKb" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, @@ -15132,6 +14838,14 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"djy" = ( +/obj/structure/rack, +/obj/item/nullrod/claymore{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, +/area/centcom/holding) "dMK" = ( /turf/closed/indestructible/riveted, /area/space) @@ -15171,6 +14885,10 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"gmO" = ( +/obj/machinery/door/window/eastright, +/turf/open/floor/carpet/black, +/area/centcom/holding) "gnI" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -15180,12 +14898,26 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/centcom/ferry) +"hSo" = ( +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/wood, +/area/centcom/holding) "iuG" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, /turf/open/floor/iron, /area/tdome/arena_source) +"iyr" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/holding) +"iUH" = ( +/obj/machinery/door/window/westleft, +/turf/open/floor/carpet/black, +/area/centcom/holding) "jgd" = ( /obj/structure/rack, /obj/item/clothing/under/color/red, @@ -15199,6 +14931,23 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"joa" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/holding) +"jpD" = ( +/obj/structure/closet, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/iv_drip, +/obj/item/roller, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/medigel/synthflesh, +/obj/item/reagent_containers/medigel/synthflesh, +/obj/item/reagent_containers/medigel/synthflesh, +/turf/open/floor/wood, +/area/centcom/holding) "jqq" = ( /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, @@ -15264,6 +15013,10 @@ "ngV" = ( /turf/closed/indestructible/riveted, /area/start) +"niY" = ( +/obj/structure/window/reinforced, +/turf/open/floor/carpet/black, +/area/centcom/holding) "nmH" = ( /obj/effect/landmark/start/new_player, /turf/open/floor/plating, @@ -15295,6 +15048,13 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"oId" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/holding) "oRi" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -15320,11 +15080,33 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"qFo" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/nullrod/claymore/glowing{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, +/area/centcom/holding) "qNJ" = ( /obj/item/trash/sosjerky, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/centcom/control) +"qWE" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/nullrod/claymore/saber/red{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, +/area/centcom/holding) "rcU" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -15373,6 +15155,23 @@ }, /turf/open/floor/iron/dark, /area/centcom/control) +"txB" = ( +/mob/living/simple_animal/bot/medbot{ + desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern."; + name = "Hattori"; + radio_key = null; + stationary_mode = 1 + }, +/turf/open/floor/wood, +/area/centcom/holding) +"tzj" = ( +/obj/item/clothing/under/costume/jabroni, +/obj/item/clothing/under/costume/geisha, +/obj/item/clothing/under/costume/kilt, +/obj/structure/closet, +/obj/item/clothing/under/costume/roman, +/turf/open/floor/wood, +/area/centcom/holding) "tOv" = ( /turf/open/floor/circuit/green, /area/tdome/arena_source) @@ -15384,6 +15183,13 @@ "vfL" = ( /turf/open/floor/iron, /area/tdome/arena_source) +"voE" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/holding) "wgi" = ( /obj/effect/landmark/ctf, /turf/open/space/basic, @@ -15404,6 +15210,17 @@ }, /turf/open/floor/iron, /area/tdome/arena_source) +"wQu" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/nullrod/claymore/darkblade{ + damtype = "stamina"; + force = 30 + }, +/turf/open/floor/wood, +/area/centcom/holding) (1,1,1) = {" aaa @@ -39487,38 +39304,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank aaa aaa aaa @@ -39744,38 +39561,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ant +ant +ant +atY +ant +ant +ant +ank +aIx +aKV +aNr +ank +aQp +aRp +aRt +aRS +ape +ape +aRu +aTV +aUn +aWg +ape +aTV +ape +atv +ape +ape +atv +ape +ank aaa aaa aaa @@ -40001,38 +39818,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +anP +aoq +aoq +aoq +aoq +aoq +aoq +ank +aJw +aLh +aLh +aOR +ape +ape +ape +aRZ +ape +ape +aRp +aTV +aUy +ape +ape +aTV +ape +ape +ape +ape +ape +ape +ank aaa aaa aaa @@ -40258,38 +40075,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aoc +arr +asI +aui +awp +ayb +aDW +ank +aJC +aLh +aLh +ank +ape +ape +ape +ape +ape +ape +aRI +aTV +aUn +aWg +ape +aTV +ape +ape +ape +ape +ape +aTB +ank aaa aaa aaa @@ -40515,38 +40332,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aoq +aoq +aoq +aoq +aoq +aoq +aoq +ank +aJH +aLh +aNu +ank +ape +ape +ape +aSm +ape +aRZ +aTl +ank +aQu +ape +ape +aWU +ape +ape +ape +ape +ape +ape +ank aaa aaa aaa @@ -40772,38 +40589,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aoq +arW +asN +aoq +axt +ayh +aoq +ank +ank +ank +ank +ank +ape +ape +aRu +aSq +ape +ape +aRu +aTV +aUz +aWg +ape +aTV +ape +ape +ape +ape +ape +aTB +ank aaa aaa aaa @@ -41029,38 +40846,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ank +ank +ank +asc +ank +ank +aFy +ank +ape +atv +ape +asc +ape +ape +aRp +aRZ +ape +ape +aRp +aTV +aUT +ape +ape +aTV +ape +ape +ape +ape +ape +ape +ank aaa aaa aaa @@ -41286,38 +41103,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aoD +ape +atv +ape +ape +ape +ape +aFU +ape +ank +ank +ank +aQu +ape +aRI +aRZ +ape +ape +aRI +aTV +aVd +aWg +ape +aTV +ape +atT +ape +ape +atT +ape +ank aaa aaa aaa @@ -41543,38 +41360,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aoS +ape +atP +auu +ank +ayq +aDq +aGw +ank +ank +aNw +aOT +ape +ape +ape +ape +ape +ape +aTB +ank +ape +ape +ape +ank +ank +ank +ank +ank +ank +ank +ank aaa aaa aaa @@ -41800,38 +41617,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ape +ape +atR +auS +ank +ayA +aDq +aGC +ank +aLD +aNL +aOT +ape +ape +aNL +aNL +aNL +aNL +aNL +aUg +ape +ape +ape +aTV +aXH +aZO +tzj +tzj +qFo +cza +ank aaa aaa aaa @@ -42057,38 +41874,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ape +ape +atR +auX +ank +ayQ +aDq +aGI +ank +aLF +aNL +aOT +ape +ape +aNL +aNL +aNL +aNL +aNL +ank +aQu +aWz +ape +aXr +ape +ape +ape +ape +ape +ape +ank aaa aaa aaa @@ -42314,38 +42131,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ank +asc +ank +ank +ank +azY +aDq +aHd +ank +aLK +aNL +aPq +ape +ape +aNL +aNL +aNL +aNL +aNL +aUg +ape +ape +ape +aTV +aXJ +aRu +ape +aRu +aRu +ape +ank aaa aaa aaa @@ -42571,38 +42388,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +app +ape +atv +ape +ank +aAb +aDq +aHe +ank +ank +aNL +aPH +ape +ape +ape +ape +ape +ape +aTB +ank +aVp +aWL +aWL +aTV +aYi +iyr +iUH +iyr +voE +ape +ank aaa aaa aaa @@ -42828,38 +42645,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +apv +ape +ape +ape +ank +aAz +aDq +aHn +ank +ank +ank +ank +aQu +ape +aRu +aRZ +ape +ape +aRu +aTV +ape +aWL +aWL +aTV +aYP +aNL +aNL +aNL +niY +ape +ank aaa aaa aaa @@ -43085,38 +42902,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +apN +ape +ape +ape +ank +aAK +aDq +aHJ +aJQ +atv +aNX +aQb +ape +ape +aRp +aTd +ape +ape +aRp +aTV +aVC +aWL +aWL +aTV +aYP +aNL +aNL +aNL +niY +txB +ank aaa aaa aaa @@ -43342,38 +43159,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +apT +ape +ape +ape +ank +aBR +aDq +aDq +aFy +ape +aOn +aQb +ape +ape +aRI +aRZ +ape +ape +aRI +aTV +aWc +aWL +aWL +aTV +aYP +aNL +aNL +aNL +niY +ape +ank aaa aaa aaa @@ -43599,38 +43416,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aqD +ape +ape +ape +ank +aCu +aDq +aDq +aKj +ape +aOv +aQb +ape +ape +ape +aSm +ape +aTk +aTl +ank +aQu +aWL +aWL +aTV +aYQ +joa +gmO +joa +oId +ape +ank aaa aaa aaa @@ -43856,38 +43673,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aqG +ape +ape +ape +ank +aCZ +aDq +aHZ +aKP +ape +aOn +aQb +ape +ape +ape +ape +ape +ape +aRu +aTV +ape +ape +ape +aTV +aZa +aRI +ape +aRI +aRI +ape +ank aaa aaa aaa @@ -44113,38 +43930,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +aqI +asA +ape +ape +asc +aDq +aDq +aDq +asc +ape +aOH +aQb +ape +ape +ape +aRZ +ape +ape +aRp +aTV +ape +ape +ape +aXr +ape +ape +ape +ape +ape +ape +ank aaa aaa aaa @@ -44370,38 +44187,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +arf +ape +atT +avD +ank +aDv +aFI +aIv +ank +aLR +ank +ank +aQL +aRp +aRt +aTj +ape +ape +aRI +aTV +ape +ape +ape +aTV +aXH +qWE +jpD +hSo +wQu +djy +ank aaa aaa aaa @@ -44627,38 +44444,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank +ank aaa aaa aaa @@ -47238,38 +47055,38 @@ aaa aaa aaa aaa -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -47495,38 +47312,38 @@ aaa aaa aaa aaa -aUn -aVd -aVd -aVd -aui -aVd -aVd -aVd -aUn -aHJ -aTd -aLD -aUn -aoS -atv -aNw -aTB -auX -auX -aBR -aJQ -aJC -aRI -auX -aJQ -auX -aNr -auX -auX -aNr -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -47752,38 +47569,38 @@ aaa aaa aaa aaa -aUn -aRZ -aCZ -aCZ -aCZ -aCZ -aCZ -aCZ -aUn -aRS -aRp -aRp -aHd -auX -auX -auX -aVp -auX -auX -atv -aJQ -aPq -auX -auX -aJQ -auX -auX -auX -auX -auX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -48009,38 +47826,38 @@ aaa aaa aaa aaa -aUn -ajA -atR -aWL -aio -aLR -aFI -aIv -aUn -aXH -aRp -aRp -aUn -auX -auX -auX -auX -auX -auX -aOH -aJQ -aJC -aRI -auX -aJQ -auX -auX -auX -auX -auX -aOR -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -48266,38 +48083,38 @@ aaa aaa aaa aaa -aUn -aCZ -aCZ -aCZ -aCZ -aCZ -aCZ -aCZ -aUn -aSm -aRp -alt -aUn -auX -auX -auX -asI -auX -aVp -aTV -aUn -aTk -auX -auX -ajx -auX -auX -auX -auX -auX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -48523,38 +48340,38 @@ aaa aaa aaa aaa -aUn -aCZ -aHe -aDv -aCZ -ayb -aWz -aCZ -aUn -aUn -aUn -aUn -aUn -auX -auX -aBR -aFy -auX -auX -aBR -aJQ -axt -aRI -auX -aJQ -auX -auX -auX -auX -auX -aOR -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -48780,38 +48597,38 @@ aaa aaa aaa aaa -aUn -aUn -aUn -aUn -aln -aUn -aUn -aqI -aUn -auX -aNr -auX -aln -auX -auX -atv -aVp -auX -auX -atv -aJQ -anP -auX -auX -aJQ -auX -auX -auX -auX -auX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -49037,38 +48854,38 @@ aaa aaa aaa aaa -aUn -amg -auX -aNr -auX -auX -auX -auX -asN -auX -aUn -aUn -aUn -aTk -auX -aOH -aVp -auX -auX -aOH -aJQ -aFU -aRI -auX -aJQ -auX -aKV -auX -auX -aKV -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -49294,38 +49111,38 @@ aaa aaa aaa aaa -aUn -aDq -auX -apT -aeW -aUn -aQL -aLh -ank -aUn -aUn -alZ -aNL -auX -auX -auX -auX -auX -auX -aOR -aUn -auX -auX -auX -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -49497,8 +49314,8 @@ aaa aaa aMF aMF -aOT -ahF +aWA +aWA aMF aMF ahC @@ -49551,38 +49368,38 @@ aaa aaa aaa aaa -aUn -auX -auX -aTj -alm -aUn -aZO -aLh -aLF -aUn -ant -ahu -aNL -auX -auX -ahu -ahu -ahu -ahu -ahu -arf -auX -auX -auX -aJQ -aoc -ape -ayQ -ayQ -aUz -afI -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -49808,38 +49625,38 @@ aaa aaa aaa aaa -aUn -auX -auX -aTj -aOn -aUn -aDW -aLh -aqG -aUn -aff -ahu -aNL -auX -auX -ahu -ahu -ahu -ahu -ahu -aUn -aTk -aju -auX -aIx -auX -auX -auX -auX -auX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -50065,38 +49882,38 @@ aaa aaa aaa aaa -aUn -aUn -aln -aUn -aUn -aUn -ajk -aLh -avE -aUn -aYi -ahu -aNu -auX -auX -ahu -ahu -ahu -ahu -ahu -arf -auX -auX -auX -aJQ -afe -aBR -auX -aBR -aBR -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -50322,38 +50139,38 @@ aaa aaa aaa aaa -aUn -aAb -auX -aNr -auX -aUn -aRu -aLh -akR -aUn -aUn -ahu -arr -auX -auX -auX -auX -auX -auX -aOR -aUn -akc -aOv -aOv -aJQ -ahq -aqD -aXJ -aqD -aXr -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -50528,13 +50345,13 @@ ayU ahA aXv awC -aOT +aWA aXZ kOX kOX oRi aki -ahF +aWA ata aMF aYs @@ -50579,38 +50396,38 @@ aaa aaa aaa aaa -aUn -aRt -auX -auX -auX -aUn -aJw -aLh -aoq -aUn -aUn -aUn -aUn -aTk -auX -aBR -aVp -auX -auX -aBR -aJQ -auX -aOv -aOv -aJQ -aWU -ahu -ahu -ahu -aNX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -50780,12 +50597,12 @@ aaa aaa aaa aaa -ahF +aWA amK aeU ahM alE -ahF +aWA aXZ kOX kOX @@ -50836,38 +50653,38 @@ aaa aaa aaa aaa -aUn -aWg -auX -auX -auX -aUn -afP -aLh -app -aWc -aNr -aTl -ayq -auX -auX -atv -ayh -auX -auX -atv -aJQ -asc -aOv -aOv -aJQ -aWU -ahu -ahu -ahu -aNX -aGI -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -51093,38 +50910,38 @@ aaa aaa aaa aaa -aUn -aHZ -auX -auX -auX -aUn -auS -aLh -aLh -aqI -auX -auu -ayq -auX -auX -aOH -aVp -auX -auX -aOH -aJQ -aeY -aOv -aOv -aJQ -aWU -ahu -ahu -ahu -aNX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -51308,7 +51125,7 @@ aoO aWA arj aoT -aoT +alZ aoT aAX aMF @@ -51350,38 +51167,38 @@ aaa aaa aaa aaa -aUn -apN -auX -auX -auX -aUn -avD -aLh -aLh -aAK -auX -atY -ayq -auX -auX -auX -asI -auX -avM -aTV -aUn -aTk -aOv -aOv -aJQ -aiw -aQu -aSq -aQu -aLK -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -51565,7 +51382,7 @@ aWA aWA aAy aMF -ahF +aWA aMF aAy aWA @@ -51607,38 +51424,38 @@ aaa aaa aaa aaa -aUn -aUT -auX -auX -auX -aUn -aKj -aLh -aAz -axQ -auX -auu -ayq -auX -auX -auX -auX -auX -auX -aBR -aJQ -auX -auX -auX -aJQ -asA -aOH -auX -aOH -aOH -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -51864,38 +51681,38 @@ aaa aaa aaa aaa -aUn -alb -aUg -auX -auX -aln -aLh -aLh -aLh -aln -auX -aQb -ayq -auX -auX -auX -aVp -auX -auX -atv -aJQ -auX -auX -auX -aIx -auX -auX -auX -auX -auX -auX -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -52121,38 +51938,38 @@ aaa aaa aaa aaa -aUn -aUy -auX -aKV -agS -aUn -aGw -aCu -aQp -aUn -akw -aUn -aUn -aPH -atv -aNw -aJH -auX -auX -aOH -aJQ -auX -auX -auX -aJQ -aoc -arW -awp -aYQ -aVC -aHn -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -52378,38 +52195,38 @@ aaa aaa aaa aaa -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn -aUn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa "} @@ -52579,7 +52396,7 @@ aLC ahW aKw aLs -ahF +aWA ana ats aGZ @@ -52588,8 +52405,8 @@ awx aWA aBo aIZ -aXv -ahF +akR +aWA aAk aEr aQj @@ -52597,7 +52414,7 @@ amm aMB aEr aOm -aOT +aWA aaa aaa aaa @@ -52854,7 +52671,7 @@ aNK aVQ aNK afj -ahF +aWA aaa aaa aaa @@ -53099,7 +52916,7 @@ avK aKw aKw aBw -aOT +aWA aki apM agu @@ -53341,7 +53158,7 @@ aaa aaa aaa aaa -aZa +aWA aRL aFf aPN @@ -53350,7 +53167,7 @@ akF akF akF aqY -ahF +aWA aub aNg aPV @@ -53360,7 +53177,7 @@ anh aAf awz aEQ -aOT +aWA aoi aDQ aZf @@ -53607,7 +53424,7 @@ aRR anR aCK aIH -aZa +aWA asY akA apn @@ -53858,7 +53675,7 @@ aaa aWA aWA aWA -aOT +aWA aPv aDO aRP @@ -54115,7 +53932,7 @@ aaa aaa aaa aaa -ahF +aWA aYk aCK aNj @@ -54125,7 +53942,7 @@ aWA aCt aEO akP -aKw +akc anv aWA aeU @@ -54373,7 +54190,7 @@ aaa aaa aaa aWA -aZa +aWA aZw aWA aWA @@ -54382,14 +54199,14 @@ aWA aWA azP aWA -ahF +aWA aWA aWA aeU apM ahM aQt -awl +aln aNK aoi aOe @@ -54626,8 +54443,8 @@ aaa aaa aDC aDC -agO -aKP +azc +azc azc aWA arC @@ -54635,7 +54452,7 @@ aCK aPe akH amp -ahF +aWA aIO aVG akU @@ -54646,13 +54463,13 @@ aeU apM ahM aWA -aOT +aWA aIA aky aiV aky aIA -ahF +aWA aWA aaa aaa @@ -54896,7 +54713,7 @@ aQt aAa avi aNi -ahF +aWA aEV aMF aeU @@ -55149,7 +54966,7 @@ aZX aQe amS aYr -aOT +aWA akQ aLG aWd @@ -55401,8 +55218,8 @@ aLV aKT asD aWA -aOT -ahF +aWA +aWA aWA aWA aWA @@ -55657,13 +55474,13 @@ avI aTg akY akt -agO +azc atb aRE ayx aVF -aKF -ahF +aiw +aWA aCz aRj aSV @@ -55696,9 +55513,9 @@ atG azj atG atG -aYP +atG aDS -aYP +atG atG atG aIQ @@ -55914,7 +55731,7 @@ auF aLV akY aTi -aKP +azc aXI aRQ aRD @@ -55938,7 +55755,7 @@ anz aoi aoi aOz -aOT +aWA aaa aaa aaa @@ -56176,8 +55993,8 @@ aXI aLV aHl akY -aXI -aOT +ajk +aWA avr aoi ajL @@ -56205,7 +56022,7 @@ aCV aJn aBg aSE -aYP +atG aMr aRd aqF @@ -56424,7 +56241,7 @@ aQW aHl akY azc -aoD +aKF agT aQl aHL @@ -56445,13 +56262,13 @@ axJ aYN axJ aWA -aOT +aWA aIA aWA aWA aWA aIA -ahF +aWA aWA aPu agj @@ -56679,8 +56496,8 @@ aHl aNY aQW aHl -akY -aKP +agS +azc azc azc aJd @@ -56719,7 +56536,7 @@ aqP aoW aGb aoG -aYP +atG aDg aRd aKG @@ -56954,11 +56771,11 @@ azc agp agp agj -atT +agj aLz als aLz -atT +agj agj agp agp @@ -56966,9 +56783,9 @@ agj auv agj agp -atT +agj aCY -atP +agj agp agj amx @@ -57229,7 +57046,7 @@ aMk aFg agj atG -aYP +atG atG azj atG @@ -57255,7 +57072,7 @@ asE aWa aWM aXq -ayA +arp arp arp aaa @@ -57444,7 +57261,7 @@ alT amy aZj aZj -alj +aff axq aNM axq @@ -57701,7 +57518,7 @@ azc azc azc azc -aKP +azc azc azc azc @@ -57741,7 +57558,7 @@ aAY aIm aGS aQK -atT +agj atC asb aCc @@ -58501,8 +58318,8 @@ akp aWi aNS afN -atT -aJY +agj +alt aQw agp aZP @@ -58797,7 +58614,7 @@ aey auo aWM aTh -aGC +arp avy arp aaa @@ -59015,8 +58832,8 @@ aSc aWi aNS aUr -atT -aJY +agj +alt anl als aZP @@ -59797,7 +59614,7 @@ aNE aGA aiW aKt -atT +agj atC ard aCc @@ -60281,7 +60098,7 @@ ahR aOk aCF aOP -atT +agj agp aLz als @@ -60309,11 +60126,11 @@ agj anj afC awF -aBs +axQ aLr agj atG -aYP +atG atG azj atG @@ -60339,7 +60156,7 @@ asE aWa aWM ahd -ayA +arp arp arp aaa @@ -60518,7 +60335,7 @@ aaa aaa aaa aaa -atT +agj aSL awF aZh @@ -60538,7 +60355,7 @@ atn awF aJT aPC -aih +ahQ aNR aPI aPI @@ -60552,11 +60369,11 @@ agj ayv aDu agj -atT +agj aBM als aBM -atT +agj agj agp agp @@ -60564,9 +60381,9 @@ agj awc agj agp -atT -awF -atP +agj +avE +agj agp agj aBn @@ -60778,7 +60595,7 @@ aaa aOP aNz awF -aUs +aeW akL akL akL @@ -60790,7 +60607,7 @@ akL akL akL akL -akL +afP aNd awF aJT @@ -60831,7 +60648,7 @@ aYb ayM agV aoG -aYP +atG avN aSH aOb @@ -61035,7 +60852,7 @@ aaa agj agp agp -atT +agj agp awf agp @@ -61047,7 +60864,7 @@ agp agp awf agp -atT +agj agp agp agj @@ -61058,24 +60875,24 @@ agp agp aQP ayd -atT +agj agp agj agj agp -atT +agj aDr agj -atT +agj aLz als aLz -atT +agj agj agp agp -atP -atT +agj +agj agj agj agj @@ -61307,7 +61124,7 @@ aGE aTo asQ aIt -atT +agj akB awF aNS @@ -61320,15 +61137,15 @@ ami agp aAB aVy -awF +ajx aBL agj aSO aTC avp aTC -aXU -atT +alb +agj aNn ajp aeZ @@ -61345,7 +61162,7 @@ aJv aJn avl aSE -aYP +atG aBj aSH aSH @@ -61546,18 +61363,18 @@ aaa aaa aaa aaa -atP +agj aCM awF awF awF awF aFK -atT -aQP +agj +afe awF -azD -atT +afI +agj aII awF awF @@ -61569,8 +61386,8 @@ awF awF aWi aRk -atT -aQP +agj +afe azD agp aAL @@ -61579,13 +61396,13 @@ ahs aVy alD aor -azY -aty +agj +akw aJY aJY aJY -awP -azY +alm +agj aOf aJY aUC @@ -61821,7 +61638,7 @@ aGT aRm aJp aZA -atT +agj aEN awF aNS @@ -61852,7 +61669,7 @@ ami agp awF agj -aIC +avM awF atG aJn @@ -61864,9 +61681,9 @@ atG azj atG atG -aYP atG -aYP +atG +atG atG atG aPY @@ -62063,7 +61880,7 @@ aaa agj agp agp -atT +agj agp awf agp @@ -62075,7 +61892,7 @@ agp agp awf agp -atT +agj agp agp agj @@ -62086,9 +61903,9 @@ agp agp aQP ayd -atT +agj agp -atT +agj aFh aVy awF @@ -62107,7 +61924,7 @@ aOx agj agp agj -aIC +avM aJT awF awF @@ -62320,7 +62137,7 @@ aaa aOP aDY awF -aNR +aeY aPI aPI aPI @@ -62332,7 +62149,7 @@ aPI aPI aPI aPI -aPI +agO atn awF aJT @@ -62574,7 +62391,7 @@ aaa aaa aaa aaa -atT +agj aSY awF aCg @@ -62851,7 +62668,7 @@ ahR aOk aCF aOP -atT +agj agp awf als @@ -62862,7 +62679,7 @@ agj agj asX awF -arR +ajA aDn agp aZd @@ -63119,14 +62936,14 @@ aMO aMO aMO apo -apv +aMO aMO agj -atT +agj aBM als aBM -atT +agj agj agj agj @@ -63621,7 +63438,7 @@ aih awF aGn agj -ayk +ahF aWi aWi aWi @@ -63636,11 +63453,11 @@ ayf aMO aMO aMO -ahQ +aMO aCE avS aCE -ahQ +aMO aMO aMO aMO @@ -64133,8 +63950,8 @@ aCB aYY asS ald -aCB -atT +ahq +agj aqf aif aiC @@ -64659,8 +64476,8 @@ aGn agj aRA aLW -ahQ -aLj +aMO +aju aMJ aHM amV @@ -64672,8 +64489,8 @@ aHM aHM aHM auH -aKm -ahQ +amg +aMO aRA aMO aRH @@ -65155,17 +64972,17 @@ aaa aaa aaa aaa -atP +agj ayk aWi aJz -atT +agj agp atf agp agp agp -atT +agj aIC asx aWi @@ -65926,7 +65743,7 @@ aaa aaa aaa aaa -atT +agj aKZ aCB auQ @@ -66440,7 +66257,7 @@ aaa aaa aaa aaa -atT +agj aRO aCB aSB @@ -66715,8 +66532,8 @@ anb agj aRA aLW -ahQ -aLj +aMO +aju aMJ aHM aHM @@ -66728,8 +66545,8 @@ ahU awr aHM auH -aKm -ahQ +amg +aMO aLW aMO alf @@ -67211,17 +67028,17 @@ aaa aaa aaa aaa -atP +agj ayk aWi aqN -atT +agj aos aop aFR akk aop -atT +agj aIC asx aWi @@ -67731,10 +67548,10 @@ arl awK aOP aPJ -aAo +ahu aCo aOi -aAo +aio aDd awF arJ @@ -67988,10 +67805,10 @@ agj agj agj agj -atP agj agj -atT +agj +agj agj agj agj diff --git a/code/game/machinery/bounty_board.dm b/code/game/machinery/bounty_board.dm index 64021656713..d00872bb083 100644 --- a/code/game/machinery/bounty_board.dm +++ b/code/game/machinery/bounty_board.dm @@ -19,6 +19,22 @@ GLOBAL_LIST_EMPTY(request_list) ///Text of the currently written bounty var/bounty_text = "" +/obj/machinery/bounty_board/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/bounty_board/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/bounty_board/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/bounty_board/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/bounty_board/Initialize(mapload, ndir, building) . = ..() GLOB.allbountyboards += src diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 4b5245de34f..606d6c8e8c9 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -27,7 +27,6 @@ panel_open = TRUE update_appearance() - if(!built && !device && device_type) device = new device_type(src) @@ -189,6 +188,22 @@ var/specialfunctions = OPEN // Bitflag, see assembly file var/sync_doors = TRUE +/obj/machinery/button/door/directional/north + dir = SOUTH + pixel_y = 24 + +/obj/machinery/button/door/directional/south + dir = NORTH + pixel_y = -24 + +/obj/machinery/button/door/directional/east + dir = WEST + pixel_x = 24 + +/obj/machinery/button/door/directional/west + dir = EAST + pixel_x = -24 + /obj/machinery/button/door/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 110c1349483..a3423724680 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -276,6 +276,22 @@ var/icon_state_off = "entertainment_blank" var/icon_state_on = "entertainment" +/obj/machinery/computer/security/telescreen/entertainment/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/computer/security/telescreen/entertainment/Initialize() . = ..() RegisterSignal(src, COMSIG_CLICK, .proc/BigClick) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index a0790247679..87e8a4e76c5 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -18,10 +18,42 @@ /// the type of wallframe it 'disassembles' into var/wallframe_type = /obj/item/wallframe/defib_mount +/obj/machinery/defibrillator_mount/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/defibrillator_mount/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/defibrillator_mount/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/defibrillator_mount/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/defibrillator_mount/loaded/Initialize() //loaded subtype for mapping use . = ..() defib = new/obj/item/defibrillator/loaded(src) +/obj/machinery/defibrillator_mount/loaded/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/defibrillator_mount/loaded/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/defibrillator_mount/loaded/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/defibrillator_mount/loaded/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/defibrillator_mount/Destroy() if(defib) QDEL_NULL(defib) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 6073334bb0b..36fb3814f4b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -17,6 +17,22 @@ var/last_flash = 0 //Don't want it getting spammed like regular flashes var/strength = 100 //How knocked down targets are when flashed. +/obj/machinery/flasher/directional/north + dir = SOUTH + pixel_y = 26 + +/obj/machinery/flasher/directional/south + dir = NORTH + pixel_y = -26 + +/obj/machinery/flasher/directional/east + dir = WEST + pixel_x = 26 + +/obj/machinery/flasher/directional/west + dir = EAST + pixel_x = -26 + /obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored name = "portable flasher" desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index fe54485e067..4f7eca4a6cb 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -69,6 +69,22 @@ var/last_spark = 0 var/datum/effect_system/spark_spread/spark_system +/obj/machinery/sparker/directional/north + dir = SOUTH + pixel_y = 26 + +/obj/machinery/sparker/directional/south + dir = NORTH + pixel_y = -26 + +/obj/machinery/sparker/directional/east + dir = WEST + pixel_x = 26 + +/obj/machinery/sparker/directional/west + dir = EAST + pixel_x = -26 + /obj/machinery/sparker/toxmix id = INCINERATOR_TOXMIX_IGNITER diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 10e7f854c1c..d7b0e705e62 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -10,6 +10,22 @@ /// instead of the switch's location. var/area/area = null +/obj/machinery/light_switch/directional/north + dir = SOUTH + pixel_y = 26 + +/obj/machinery/light_switch/directional/south + dir = NORTH + pixel_y = -26 + +/obj/machinery/light_switch/directional/east + dir = WEST + pixel_x = 26 + +/obj/machinery/light_switch/directional/west + dir = EAST + pixel_x = -26 + /obj/machinery/light_switch/Initialize() . = ..() if(istext(area)) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index be6065ba7c7..7f2c5779d69 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -70,6 +70,22 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) max_integrity = 300 armor = list(MELEE = 70, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90) +/obj/machinery/requests_console/directional/north + dir = SOUTH + pixel_y = 30 + +/obj/machinery/requests_console/directional/south + dir = NORTH + pixel_y = -30 + +/obj/machinery/requests_console/directional/east + dir = WEST + pixel_x = 30 + +/obj/machinery/requests_console/directional/west + dir = EAST + pixel_x = -30 + /obj/machinery/requests_console/update_appearance(updates=ALL) . = ..() if(machine_stat & NOPOWER) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 24923d2a087..00839b4a0ca 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -158,6 +158,23 @@ var/friendc = FALSE // track if Friend Computer mode var/last_picture // For when Friend Computer mode is undone + +/obj/machinery/status_display/evac/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/status_display/evac/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/status_display/evac/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/status_display/evac/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/status_display/evac/Initialize() . = ..() // register for radio system @@ -323,6 +340,22 @@ AI_EMOTION_RED_GLOW = "ai_hal", ) +/obj/machinery/status_display/ai/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/status_display/ai/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/status_display/ai/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/status_display/ai/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/status_display/ai/Initialize() . = ..() GLOB.ai_status_displays.Add(src) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index b04f2ab9e01..58e06e39f0b 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -172,6 +172,22 @@ anchored = TRUE density = FALSE +/obj/item/storage/secure/safe/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/item/storage/secure/safe/directional/south + dir = NORTH + pixel_y = -32 + +/obj/item/storage/secure/safe/directional/east + dir = WEST + pixel_x = 32 + +/obj/item/storage/secure/safe/directional/west + dir = EAST + pixel_x = -32 + /obj/item/storage/secure/safe/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index f14828bddb7..fb2a091fb66 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -10,6 +10,22 @@ var/obj/item/extinguisher/stored_extinguisher var/opened = FALSE +/obj/structure/extinguisher_cabinet/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/structure/extinguisher_cabinet/directional/south + dir = NORTH + pixel_y = -32 + +/obj/structure/extinguisher_cabinet/directional/east + dir = WEST + pixel_x = 32 + +/obj/structure/extinguisher_cabinet/directional/west + dir = EAST + pixel_x = -32 + /obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building) . = ..() if(building) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 38ff0b224ad..d92c182145d 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -12,6 +12,22 @@ var/open = FALSE var/obj/item/fireaxe/fireaxe +/obj/structure/fireaxecabinet/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/structure/fireaxecabinet/directional/south + dir = NORTH + pixel_y = -32 + +/obj/structure/fireaxecabinet/directional/east + dir = WEST + pixel_x = 32 + +/obj/structure/fireaxecabinet/directional/west + dir = EAST + pixel_x = -32 + /obj/structure/fireaxecabinet/Initialize() . = ..() fireaxe = new diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 56f5be23708..ffd542217d5 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -9,6 +9,22 @@ max_integrity = 200 integrity_failure = 0.5 +/obj/structure/mirror/directional/north + dir = SOUTH + pixel_y = 28 + +/obj/structure/mirror/directional/south + dir = NORTH + pixel_y = -28 + +/obj/structure/mirror/directional/east + dir = WEST + pixel_x = 28 + +/obj/structure/mirror/directional/west + dir = EAST + pixel_x = -28 + /obj/structure/mirror/Initialize(mapload) . = ..() if(icon_state == "mirror_broke" && !broken) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index a40b462b991..e13fc820f97 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -8,6 +8,22 @@ max_integrity = 150 var/notices = 0 +/obj/structure/noticeboard/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/structure/noticeboard/directional/south + dir = NORTH + pixel_y = -32 + +/obj/structure/noticeboard/directional/east + dir = WEST + pixel_x = 32 + +/obj/structure/noticeboard/directional/west + dir = EAST + pixel_x = -32 + /obj/structure/noticeboard/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index fefa0c2bbfc..f35e891250d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -157,6 +157,22 @@ var/exposed = 0 // can you currently put an item inside var/obj/item/hiddenitem = null // what's in the urinal +/obj/structure/urinal/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/structure/urinal/directional/south + dir = NORTH + pixel_y = -32 + +/obj/structure/urinal/directional/east + dir = WEST + pixel_x = 32 + +/obj/structure/urinal/directional/west + dir = EAST + pixel_x = -32 + /obj/structure/urinal/Initialize() . = ..() hiddenitem = new /obj/item/food/urinalcake diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 807d0f74915..78ce793a169 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -31,6 +31,22 @@ /// If blind drop option is available var/blind_drop_ready = TRUE +/obj/machinery/computer/auxiliary_base/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/computer/auxiliary_base/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/computer/auxiliary_base/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/computer/auxiliary_base/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/computer/auxiliary_base/Initialize() . = ..() AddComponent(/datum/component/gps, "NT_AUX") diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index 3a5526d60c0..8fcf83b6ca1 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -22,6 +22,22 @@ var/list/ticket_holders = list() var/list/obj/item/ticket_machine_ticket/tickets = list() +/obj/machinery/ticket_machine/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/ticket_machine/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/ticket_machine/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/ticket_machine/directional/west + dir = EAST + pixel_x = -32 + /obj/machinery/ticket_machine/multitool_act(mob/living/user, obj/item/I) if(!multitool_check_buffer(user, I)) //make sure it has a data buffer return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index d01201d759a..ffc96868d65 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -206,8 +206,6 @@ fixture_type = "bulb" sheets_refunded = 1 - - // the standard tube light fixture /obj/machinery/light name = "light fixture" @@ -266,7 +264,6 @@ status = LIGHT_EMPTY update(0) - /obj/machinery/light/no_nightlight nightshift_enabled = FALSE @@ -636,9 +633,6 @@ if(prob(damage_amount * 5)) break_light_tube() - - - /obj/machinery/light/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) @@ -1024,5 +1018,241 @@ light_type = /obj/item/light/bulb fitting = "bulb" +// -------- Directional presets +// The directions are backwards on the lights we have now +/obj/machinery/light/directional/north + dir = NORTH + +/obj/machinery/light/directional/south + dir = SOUTH + +/obj/machinery/light/directional/east + dir = EAST + +/obj/machinery/light/directional/west + dir = WEST + +// ---- Broken tube +/obj/machinery/light/broken/directional/north + dir = NORTH + +/obj/machinery/light/broken/directional/south + dir = SOUTH + +/obj/machinery/light/broken/directional/east + dir = EAST + +/obj/machinery/light/broken/directional/west + dir = WEST + +// ---- Tube construct +/obj/structure/light_construct/directional/north + dir = NORTH + +/obj/structure/light_construct/directional/south + dir = SOUTH + +/obj/structure/light_construct/directional/east + dir = EAST + +/obj/structure/light_construct/directional/west + dir = WEST + +// ---- Tube frames +/obj/machinery/light/built/directional/north + dir = NORTH + +/obj/machinery/light/built/directional/south + dir = SOUTH + +/obj/machinery/light/built/directional/east + dir = EAST + +/obj/machinery/light/built/directional/west + dir = WEST + +// ---- No nightlight tubes +/obj/machinery/light/no_nightlight/directional/north + dir = NORTH + +/obj/machinery/light/no_nightlight/directional/south + dir = SOUTH + +/obj/machinery/light/no_nightlight/directional/east + dir = EAST + +/obj/machinery/light/no_nightlight/directional/west + dir = WEST + +// ---- Warm light tubes +/obj/machinery/light/warm/directional/north + dir = NORTH + +/obj/machinery/light/warm/directional/south + dir = SOUTH + +/obj/machinery/light/warm/directional/east + dir = EAST + +/obj/machinery/light/warm/directional/west + dir = WEST + +// ---- No nightlight warm light tubes +/obj/machinery/light/warm/no_nightlight/directional/north + dir = NORTH + +/obj/machinery/light/warm/no_nightlight/directional/south + dir = SOUTH + +/obj/machinery/light/warm/no_nightlight/directional/east + dir = EAST + +/obj/machinery/light/warm/no_nightlight/directional/west + dir = WEST + +// ---- Cold light tubes +/obj/machinery/light/cold/directional/north + dir = NORTH + +/obj/machinery/light/cold/directional/south + dir = SOUTH + +/obj/machinery/light/cold/directional/east + dir = EAST + +/obj/machinery/light/cold/directional/west + dir = WEST + +// ---- No nightlight cold light tubes +/obj/machinery/light/cold/no_nightlight/directional/north + dir = NORTH + +/obj/machinery/light/cold/no_nightlight/directional/south + dir = SOUTH + +/obj/machinery/light/cold/no_nightlight/directional/east + dir = EAST + +/obj/machinery/light/cold/no_nightlight/directional/west + dir = WEST + +// ---- Red tubes +/obj/machinery/light/red/directional/north + dir = NORTH + +/obj/machinery/light/red/directional/south + dir = SOUTH + +/obj/machinery/light/red/directional/east + dir = EAST + +/obj/machinery/light/red/directional/west + dir = WEST + +// ---- Blacklight tubes +/obj/machinery/light/blacklight/directional/north + dir = NORTH + +/obj/machinery/light/blacklight/directional/south + dir = SOUTH + +/obj/machinery/light/blacklight/directional/east + dir = EAST + +/obj/machinery/light/blacklight/directional/west + dir = WEST + +// ---- Dim tubes +/obj/machinery/light/dim/directional/north + dir = NORTH + +/obj/machinery/light/dim/directional/south + dir = SOUTH + +/obj/machinery/light/dim/directional/east + dir = EAST + +/obj/machinery/light/dim/directional/west + dir = WEST + + +// -------- Bulb lights +/obj/machinery/light/small/directional/north + dir = NORTH + +/obj/machinery/light/small/directional/south + dir = SOUTH + +/obj/machinery/light/small/directional/east + dir = EAST + +/obj/machinery/light/small/directional/west + dir = WEST + +// ---- Bulb construct +/obj/structure/light_construct/small/directional/north + dir = NORTH + +/obj/structure/light_construct/small/directional/south + dir = SOUTH + +/obj/structure/light_construct/small/directional/east + dir = EAST + +/obj/structure/light_construct/small/directional/west + dir = WEST + +// ---- Bulb frames +/obj/machinery/light/small/built/directional/north + dir = NORTH + +/obj/machinery/light/small/built/directional/south + dir = SOUTH + +/obj/machinery/light/small/built/directional/east + dir = EAST + +/obj/machinery/light/small/built/directional/west + dir = WEST + +// ---- Broken bulbs +/obj/machinery/light/small/broken/directional/north + dir = NORTH + +/obj/machinery/light/small/broken/directional/south + dir = SOUTH + +/obj/machinery/light/small/broken/directional/east + dir = EAST + +/obj/machinery/light/small/broken/directional/west + dir = WEST + +// ---- Red bulbs +/obj/machinery/light/small/red/directional/north + dir = NORTH + +/obj/machinery/light/small/red/directional/south + dir = SOUTH + +/obj/machinery/light/small/red/directional/east + dir = EAST + +/obj/machinery/light/small/red/directional/west + dir = WEST + +// ---- Blacklight bulbs +/obj/machinery/light/small/blacklight/directional/north + dir = NORTH + +/obj/machinery/light/small/blacklight/directional/south + dir = SOUTH + +/obj/machinery/light/small/blacklight/directional/east + dir = EAST + +/obj/machinery/light/small/blacklight/directional/west + dir = WEST + #undef LIGHT_DRAIN_TIME #undef LIGHT_POWER_GAIN diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 837250acbc4..359c9dfd62e 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -150,12 +150,27 @@ density = FALSE reagent_id = /datum/reagent/consumable/condensedcapsaicin +/obj/structure/reagent_dispensers/peppertank/directional/north + dir = SOUTH + pixel_y = 30 + +/obj/structure/reagent_dispensers/peppertank/directional/south + dir = NORTH + pixel_y = -30 + +/obj/structure/reagent_dispensers/peppertank/directional/east + dir = WEST + pixel_x = 30 + +/obj/structure/reagent_dispensers/peppertank/directional/west + dir = EAST + pixel_x = -30 + /obj/structure/reagent_dispensers/peppertank/Initialize() . = ..() if(prob(1)) desc = "IT'S PEPPER TIME, BITCH!" - /obj/structure/reagent_dispensers/water_cooler//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE name = "liquid cooler" desc = "A machine that dispenses liquid to drink." @@ -206,6 +221,21 @@ density = FALSE reagent_id = /datum/reagent/consumable/virus_food +/obj/structure/reagent_dispensers/virusfood/directional/north + dir = SOUTH + pixel_y = 30 + +/obj/structure/reagent_dispensers/virusfood/directional/south + dir = NORTH + pixel_y = -30 + +/obj/structure/reagent_dispensers/virusfood/directional/east + dir = WEST + pixel_x = 30 + +/obj/structure/reagent_dispensers/virusfood/directional/west + dir = EAST + pixel_x = -30 /obj/structure/reagent_dispensers/cooking_oil name = "vat of cooking oil" diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index b6493d1849d..6caf69922d9 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -22,6 +22,22 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) var/mob/triggerer = null var/waiting = FALSE +/obj/machinery/keycard_auth/directional/north + dir = SOUTH + pixel_y = 26 + +/obj/machinery/keycard_auth/directional/south + dir = NORTH + pixel_y = -26 + +/obj/machinery/keycard_auth/directional/east + dir = WEST + pixel_x = 26 + +/obj/machinery/keycard_auth/directional/west + dir = EAST + pixel_x = -26 + /obj/machinery/keycard_auth/Initialize() . = ..() ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, .proc/triggerEvent)) diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 08db02ee1f4..f55ef05f0b5 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -23,6 +23,22 @@ tiltable = FALSE light_mask = "wallmed-light-mask" +/obj/machinery/vending/wallmed/directional/north + dir = SOUTH + pixel_y = 32 + +/obj/machinery/vending/wallmed/directional/south + dir = NORTH + pixel_y = -32 + +/obj/machinery/vending/wallmed/directional/east + dir = WEST + pixel_x = 32 + +/obj/machinery/vending/wallmed/directional/west + dir = EAST + pixel_x = -32 + /obj/item/vending_refill/wallmed machine_name = "NanoMed" icon_state = "refill_medical"