From bafd03bc1936dceed76d2a426c2706f773cacef6 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 11 Dec 2019 12:11:09 +0100 Subject: [PATCH] Mapping. --- _maps/map_files/BoxStation/BoxStation.dmm | 1185 +++++++------ .../map_files/Deltastation/DeltaStation2.dmm | 1514 +++++++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 894 +++++----- _maps/map_files/OmegaStation/OmegaStation.dmm | 458 ++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 1309 +++++++------- code/game/area/Space_Station_13_areas.dm | 30 +- 6 files changed, 2933 insertions(+), 2457 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 820ffd0be4..286971078c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -226,6 +226,9 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/security/prison) +"aaK" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/seven) "aaL" = ( /obj/machinery/computer/libraryconsole/bookmanagement, /obj/structure/table, @@ -1133,15 +1136,8 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acN" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - on = 0; - pixel_x = -7; - pixel_y = 12 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/seven) "acO" = ( /obj/structure/closet/l3closet/security, /obj/machinery/camera{ @@ -5726,19 +5722,18 @@ /turf/open/floor/plasteel, /area/security/courtroom) "alK" = ( -/obj/machinery/button/door{ - id = "Room Two"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 7; - pixel_y = -24; - specialfunctions = 4 +/obj/structure/mirror{ + pixel_y = 32 }, -/obj/structure/chair/comfy/brown{ - dir = 8 +/obj/structure/sink{ + dir = 1; + pixel_y = 25 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/seven) "alL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ @@ -6175,18 +6170,11 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "amJ" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/obj/structure/toilet{ - dir = 4 +/obj/machinery/shower{ + dir = 8 }, /turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "amK" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -6211,11 +6199,9 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness) "amO" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/light/small, /turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "amP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, @@ -6365,12 +6351,8 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "anc" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/item/soap, /turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "and" = ( /obj/machinery/light/small{ dir = 4 @@ -6474,8 +6456,8 @@ /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) "anr" = ( -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) "ans" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -6589,11 +6571,15 @@ /turf/open/floor/plating, /area/security/courtroom) "anD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/structure/window/reinforced/tinted{ + dir = 8 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/curtain, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/seven) "anE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -6640,15 +6626,9 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "anM" = ( -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/curtain, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/obj/structure/chair/sofa/right, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/seven) "anN" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -7008,9 +6988,12 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "aoI" = ( -/obj/structure/fireplace, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/chair/sofa/left, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "aoJ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -7273,13 +7256,12 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "apu" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 +/obj/machinery/shower{ + dir = 4 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/item/soap, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/six) "apv" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -7466,13 +7448,18 @@ /turf/open/floor/plating, /area/maintenance/fore) "apX" = ( -/obj/structure/bed, -/obj/item/bedsheet/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/mirror{ + pixel_y = 32 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/structure/sink{ + dir = 1; + pixel_y = 25 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/six) "apY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -7584,40 +7571,20 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "aql" = ( -/obj/structure/mirror{ - pixel_y = 32 +/obj/structure/closet/secure_closet/personal/cabinet{ + desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; + name = "Personal ID-Locked Closet"; + pixel_y = 15 }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/seven) "aqm" = ( -/obj/structure/chair/sofa/right, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "aqn" = ( -/obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/machinery/button/door{ - id = "Dorm4"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/fireplace, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "aqo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7753,38 +7720,32 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aqC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aqD" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aqE" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/item/radio/intercom{ dir = 4; - pixel_y = 5 - }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 + name = "Station Intercom (General)"; + pixel_x = 27 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) +"aqD" = ( +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/six) +"aqE" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/six) "aqF" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + on = 0; + pixel_x = -7; + pixel_y = 12 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "aqG" = ( /obj/docking_port/stationary/random{ dir = 4; @@ -7841,11 +7802,19 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqN" = ( -/obj/structure/toilet{ +/obj/machinery/button/door{ + id = "Room Two"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 7; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/seven) "aqO" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -7899,13 +7868,11 @@ /turf/open/floor/plating, /area/maintenance/fore) "aqU" = ( -/obj/structure/closet/secure_closet/personal{ - desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful."; - name = "Personal ID-Locked Locker"; - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) "aqV" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -7972,8 +7939,12 @@ /turf/open/floor/wood, /area/lawoffice) "arf" = ( -/turf/closed/wall, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/seven) "arg" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -7990,25 +7961,27 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "ari" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"arj" = ( -/obj/machinery/door/airlock{ - id_tag = "Room Two"; - name = "Room Seven - Luxury Suite" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) -"ark" = ( /obj/structure/bed, /obj/item/bedsheet/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/seven) +"arj" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/curtain, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms_cabin/six) +"ark" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/seven) "arl" = ( /obj/structure/sign/poster/official/ion_rifle, /turf/closed/wall/r_wall, @@ -8063,17 +8036,14 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "ars" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 +/obj/machinery/door/airlock{ + id_tag = "Room Two"; + name = "Room Seven - Luxury Suite" }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/seven) "art" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -8104,11 +8074,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ary" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) "arz" = ( /obj/item/coin/gold, /obj/item/coin/iron, @@ -8130,13 +8097,8 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "arD" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "arE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/yellow{ @@ -8340,11 +8302,8 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "asd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/closed/wall, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/five) "ase" = ( /obj/structure/cable{ icon_state = "2-4" @@ -8406,12 +8365,8 @@ /turf/open/floor/plating, /area/security/vacantoffice/b) "ask" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) "asl" = ( /obj/machinery/firealarm{ dir = 4; @@ -8474,25 +8429,27 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ast" = ( -/obj/machinery/airalarm{ - pixel_y = 23 +/obj/item/flashlight/lamp/green{ + pixel_x = -3; + pixel_y = 22 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/dresser{ + desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; + name = "Dresser"; + pixel_y = 7 }, -/obj/structure/chair/sofa/left, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/six) "asu" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm5"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) "asv" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ @@ -8741,12 +8698,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "ate" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/closet/secure_closet/personal{ + desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful."; + name = "Personal ID-Locked Locker"; + pixel_y = 10 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/three) "atf" = ( /obj/machinery/camera{ c_tag = "Bar Storage" @@ -8757,21 +8715,29 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "atg" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm4"; - name = "Room Three" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) -"ath" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/light/small{ + dir = 1 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/three) +"ath" = ( +/obj/structure/bed, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/machinery/button/door{ + id = "Dorm4"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "ati" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -8800,15 +8766,19 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "atl" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) "atm" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; + name = "Personal ID-Locked Closet"; + pixel_y = 15 + }, /turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/four) "atn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -9081,18 +9051,12 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness) "aua" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm6"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/four) "aub" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow, @@ -9238,11 +9202,12 @@ /turf/closed/wall, /area/security/vacantoffice/b) "aur" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/light/small, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "aus" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -9251,22 +9216,18 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aut" = ( -/obj/machinery/door/airlock{ - id_tag = "Room One"; - name = "Room Six - Luxury Suite" +/obj/item/flashlight/lamp/green{ + pixel_x = -3; + pixel_y = 22 }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) -"auu" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 +/obj/structure/dresser{ + desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; + name = "Dresser"; + pixel_y = 7 }, /turf/open/floor/wood, -/area/crew_quarters/dorms) -"auv" = ( +/area/crew_quarters/dorms_cabin/five) +"auu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/closet/secure_closet/personal/cabinet{ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; @@ -9274,25 +9235,21 @@ pixel_y = 15 }, /turf/open/floor/wood, -/area/crew_quarters/dorms) -"auw" = ( -/obj/structure/bed, +/area/crew_quarters/dorms_cabin/five) +"auv" = ( /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/machinery/button/door{ - id = "Dorm3"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) +"auw" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; + name = "Personal ID-Locked Closet"; + pixel_y = 15 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/six) "aux" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -9682,15 +9639,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "avw" = ( -/obj/machinery/button/door{ - id = "Room One"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, +/obj/structure/fireplace, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/six) "avx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -10078,15 +10029,10 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "awo" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, +/obj/structure/bed, +/obj/item/bedsheet/random, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/six) "awp" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -10165,7 +10111,7 @@ dir = 4 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/three) "awz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -10177,13 +10123,12 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness) "awA" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm5"; - name = "Room Four" +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "awB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, @@ -10381,13 +10326,11 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "awX" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm6"; - name = "Room Five" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "awY" = ( /obj/machinery/light{ dir = 1 @@ -10759,15 +10702,18 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "axN" = ( -/obj/structure/chair/comfy/black{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = "Dorm4"; + name = "Room Three" }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/three) "axO" = ( -/obj/machinery/light/small, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "axP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10837,15 +10783,9 @@ /turf/open/floor/plating, /area/maintenance/port) "axT" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm3"; - name = "Room Two" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "axU" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/sign/warning/fire{ @@ -10879,12 +10819,12 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "axX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" }, -/obj/machinery/light/small, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "axY" = ( /obj/structure/cable{ icon_state = "2-8" @@ -11255,23 +11195,8 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "ayV" = ( -/obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/machinery/button/door{ - id = "Dorm2"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) "ayW" = ( /turf/closed/wall, /area/ai_monitored/storage/eva) @@ -14097,15 +14022,9 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "aFe" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm2"; - name = "Room One" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) "aFf" = ( /obj/structure/piano{ icon_state = "piano" @@ -15226,10 +15145,12 @@ /turf/open/floor/plasteel, /area/gateway) "aHw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/landmark/event_spawn, +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, /turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/five) "aHx" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -28361,9 +28282,12 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "blU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) "blV" = ( /obj/machinery/light/small, /turf/open/floor/plating, @@ -51712,6 +51636,19 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cmM" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "cmN" = ( /obj/structure/sign/warning/nosmoking{ pixel_y = 32 @@ -51727,6 +51664,56 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cmO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) +"cmP" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) +"cmQ" = ( +/obj/machinery/button/door{ + id = "Room One"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) +"cmR" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -29 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) +"cmS" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) +"cmT" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/six) "cmU" = ( /obj/machinery/light/small, /turf/open/floor/engine/n2, @@ -51832,6 +51819,17 @@ /obj/item/clipboard, /turf/open/floor/plating, /area/maintenance/aft) +"cnh" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"cni" = ( +/obj/structure/closet/secure_closet/personal{ + desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful."; + name = "Personal ID-Locked Locker"; + pixel_y = 10 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "cnj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -51883,6 +51881,12 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) +"cno" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "cnp" = ( /obj/structure/cable{ icon_state = "1-8" @@ -51897,6 +51901,24 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) +"cnq" = ( +/obj/structure/bed, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/machinery/button/door{ + id = "Dorm3"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "cnr" = ( /obj/machinery/door/window/southleft{ name = "Engineering Delivery"; @@ -51905,6 +51927,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) +"cns" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) "cnt" = ( /obj/machinery/camera{ c_tag = "Engineering West"; @@ -51919,11 +51947,23 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cnu" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm5"; + name = "Room Four" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/four) "cnv" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) +"cnw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "cnx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -51940,6 +51980,14 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel, /area/engine/engineering) +"cnz" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm6"; + name = "Room Five" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/five) "cnA" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -52014,6 +52062,18 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cnI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/five) +"cnJ" = ( +/obj/machinery/door/airlock{ + id_tag = "Room One"; + name = "Room Six - Luxury Suite" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/six) "cnK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52115,6 +52175,10 @@ }, /turf/open/floor/plasteel, /area/engine/engine_smes) +"cnT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) "cnU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -52128,6 +52192,18 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/engine/engineering) +"cnV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"cnW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "cnX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -52196,6 +52272,79 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"cod" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm3"; + name = "Room Two" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin/two) +"coe" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"cof" = ( +/obj/structure/closet/secure_closet/personal{ + desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful."; + name = "Personal ID-Locked Locker"; + pixel_y = 10 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin) +"cog" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin) +"coh" = ( +/obj/structure/bed, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/machinery/button/door{ + id = "Dorm2"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin) +"coi" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"coj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin) +"cok" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin) +"col" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm2"; + name = "Room One" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms_cabin) "cop" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 1 @@ -89729,16 +89878,16 @@ anT aoA apn aqe -arf -arf -arf -arf -arf -arf -arf -arf -arf -dgz +ary +ary +ary +ary +cnh +cnh +cnh +coe +coe +coe dgz dgz dgz @@ -89986,16 +90135,16 @@ anz aoB aod aqe -arf -aqU +ary +ate awy -arf -aqU -awy -arf -aqU -awy -dgz +ary +cni +cnV +cnh +cof +coj +coe tqg ujF ujF @@ -90243,16 +90392,16 @@ anz aoz aod aqe -arf -ari -ate -arf -ari -ath -arf -ari -ath -dgz +ary +atg +awA +ary +cno +cnW +cnh +cog +cok +coe fvY dvc dzi @@ -90500,16 +90649,16 @@ anz aoD aod aqe -arf -aqn +ary ath -arf -auw -ath -arf -ayV -ath -dgz +awX +ary +cnq +cnW +cnh +coh +cok +coe aCd qIw gfD @@ -90757,16 +90906,16 @@ anz aoC aod aqe -arf -asd -atg -arf -asd -axT -arf -asd -aFe -dgz +ary +atl +axN +ary +cns +cod +cnh +coi +col +coe iVU aDK vHj @@ -91528,11 +91677,11 @@ anU anC cSA aqe -arf -arf -arf -arf -arf +arD +arD +arD +arD +arD auC aKg awr @@ -91785,11 +91934,11 @@ ajp aoG cSA aqe -arf -auu +arD atm -atm -arf +axO +axO +arD aAd auW awr @@ -92042,11 +92191,11 @@ anW aoH cSA aqe -arf -aqC -blU -blU -awA +arD +aua +axT +axT +cnu auy aKh awr @@ -92299,11 +92448,11 @@ anV ajo cSA aqe -arf -aqD -ask -asu -aun +arD +aur +axX +cmM +cnw awv aKg aYI @@ -92556,11 +92705,11 @@ anY ajo apq aqe -arf -arf -arf -arf -arf +asd +asd +asd +asd +asd auC aKN aYP @@ -92813,11 +92962,11 @@ anX ajo app aqi -arf -ars -atm -atm -arf +asd +aut +ayV +ayV +asd aHt aKO aZb @@ -93070,11 +93219,11 @@ amu ajo aps aqk -arf -auv -blU -aHw -awX +asd +auu +aFe +cmO +cnz axR aKq aZZ @@ -93327,11 +93476,11 @@ anV ajo apr aqj -arf -ary -ask -aua -aun +asd +auv +aHw +cmP +cnI axU awr awr @@ -93578,17 +93727,17 @@ ajn trb ajn amr -ajp +acN ajp ajp ajo apt arn -arf -arf -arf -arf -arf +asd +asd +asd +asd +asd asX awr awr @@ -94098,11 +94247,11 @@ anb ahT anZ aqo -arf -arf -arf -arf -arf +anr +anr +anr +anr +anr aDW avl avm @@ -94355,11 +94504,11 @@ aif apw aqH aqI -arf -apu -atl -avw -aut +anr +auw +blU +cmQ +cnJ axM avx avn @@ -94608,15 +94757,15 @@ aod ahn apx ahn -ahn -ahn -ahn -ahn -arf -aoI -aqF -awo -arf +anr +anr +anr +anr +anr +avw +ask +cmR +anr aoY awr awr @@ -94865,15 +95014,15 @@ aod aoK amI aqp -ahn -anc anr -anM -aqF -aqF -aqF -aur -aun +apu +aqD +arj +ask +ask +ask +cmS +cnT aEr awr awr @@ -95122,15 +95271,15 @@ aoe aoL apy aqq -ahn -aql -aqN -arf +anr +apX aqE -ark -aqF -axN -arf +anr +ast +awo +ask +cmT +anr aKi avm aAn @@ -95376,18 +95525,18 @@ aaa ahn khB ahn -ahn -ahn -ahn -ahn -arf -arf -arf -asd -arf -arf -arf -arf +aaK +aaK +aaK +aaK +aaK +aaK +aaK +asu +anr +anr +anr +anr aMJ azn aAo @@ -95633,13 +95782,13 @@ aaa aag aag aag -arf -amJ -axO -arf -apu -acN -amP +aaK +alK +amO +aaK +aql +aqF +ark atz axL atQ @@ -95890,13 +96039,13 @@ aaa aaa aaa aaa -arf -amO -anr -anM -aqF -alK -arf +aaK +amJ +anc +anD +aqm +aqN +aaK axZ amN atZ @@ -96147,13 +96296,13 @@ aaa aaa aaa aaa -arf -arf -arf -arf -aoI -anD -arj +aaK +aaK +aaK +aaK +aqn +aqU +ars art amN amN @@ -96406,11 +96555,11 @@ aaa aaa aaa aaa -arf +aaK +anM aqm -aqF -axX arf +aaK asb asr avu @@ -96663,11 +96812,11 @@ aaa aaa aaa aaa -arf -ast -arD -apX -arf +aaK +aoI +aqC +ari +aaK arO aup atV @@ -96920,11 +97069,11 @@ aaa aae aaa aaa -arf -arf -arf -arf -arf +aaK +aaK +aaK +aaK +aaK asZ att avA diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ac7d291b2f..885e52c4f8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -255,10 +255,109 @@ }, /turf/open/floor/plating, /area/security/prison) +"aaC" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"aaD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms_cabin) "aaE" = ( /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) +"aaF" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"aaG" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"aaH" = ( +/obj/structure/dresser, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/crew_quarters/dorms_cabin) +"aaI" = ( +/obj/structure/table_frame/wood, +/obj/item/crowbar/red, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/plating, +/area/crew_quarters/dorms_cabin) +"aaJ" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaK" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaL" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket/letterman_nanotrasen, +/obj/item/clothing/suit/toggle/lawyer, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_x = 26; + pixel_y = 26 + }, +/obj/item/clothing/under/kilt, +/obj/item/clothing/head/beret, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaM" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"aaN" = ( +/obj/structure/bed, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "aaO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -266,9 +365,124 @@ "aaP" = ( /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) +"aaQ" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "detective"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/purple, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_x = 26; + pixel_y = 26 + }, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/item/clothing/under/geisha, +/obj/item/clothing/head/fedora{ + icon_state = "curator" + }, +/obj/item/clothing/suit/jacket{ + desc = "This looks awfully familiar..."; + icon_state = "curator" + }, +/obj/item/clothing/under/rank/curator/treasure_hunter, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"aaR" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) "aaS" = ( /turf/closed/wall/mineral/plastitanium, /area/construction/mining/aux_base) +"aaT" = ( +/obj/item/flashlight/seclite, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/crew_quarters/dorms_cabin) +"aaU" = ( +/obj/structure/table/wood, +/obj/item/folder, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/item/razor, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaV" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaW" = ( +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"aaX" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/pen, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"aaY" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"aaZ" = ( +/obj/item/clipboard{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/newspaper{ + pixel_x = 7; + pixel_y = 11 + }, +/obj/item/newspaper, +/obj/item/pen/red, +/turf/open/floor/wood{ + icon_state = "wood-broken2" + }, +/area/crew_quarters/dorms_cabin) +"aba" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) +"abb" = ( +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"abc" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"abd" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "abe" = ( /obj/effect/turf_decal/delivery, /obj/item/twohanded/required/kirbyplants/random, @@ -277,6 +491,27 @@ "abf" = ( /turf/closed/wall, /area/hallway/secondary/entry) +"abg" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"abh" = ( +/obj/machinery/button/door{ + id = "Dorm1"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) "abi" = ( /turf/closed/wall, /area/construction/mining/aux_base) @@ -284,6 +519,64 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"abk" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/drinks/beer{ + desc = "Whatever it is, it reeks of foul, putrid froth."; + icon_state = "beer"; + list_reagents = list("bacchus_blessing" = 15); + name = "Delta-Down"; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/crew_quarters/dorms_cabin) +"abl" = ( +/obj/machinery/button/door{ + id = "Dorm2"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"abm" = ( +/obj/structure/dresser, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"abn" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/machinery/button/door{ + id = "Dorm3"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"abo" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "abp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -307,6 +600,20 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"abr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm5"; + name = "Cabin 1" + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/crew_quarters/dorms_cabin) "abs" = ( /obj/docking_port/stationary{ dir = 1; @@ -319,11 +626,50 @@ /obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) +"abt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"abu" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm2"; + name = "Cabin 2" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) "abv" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) +"abw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"abx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"aby" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm3"; + name = "Cabin 3" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"abz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"abA" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) +"abB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "abC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -376,6 +722,40 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"abI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm4"; + name = "Cabin 4" + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"abJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) +"abK" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/five) +"abL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/five) +"abM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm5"; + name = "Cabin 5" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"abN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/five) +"abO" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) "abP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -424,6 +804,39 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"abU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) +"abV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + id_tag = "Dorm6"; + name = "Cabin 6" + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"abW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) +"abX" = ( +/obj/machinery/button/door{ + id = "Dorm4"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"abY" = ( +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "abZ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -487,6 +900,84 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"acg" = ( +/obj/structure/dresser, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_x = 26; + pixel_y = 26 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"ach" = ( +/obj/machinery/button/door{ + id = "Dorm5"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"aci" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"acj" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_x = 26; + pixel_y = 26 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"ack" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/pen/blue, +/obj/machinery/button/door{ + id = "Dorm6"; + name = "Dormitory Door Lock"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"acl" = ( +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"acm" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_x = 26; + pixel_y = 26 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"acn" = ( +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "aco" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -574,6 +1065,74 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"acw" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acx" = ( +/obj/structure/table/wood, +/obj/item/storage/briefcase{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/briefcase, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/item/cane, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"acy" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"acz" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"acA" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/structure/sign/nanotrasen{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"acB" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acC" = ( +/obj/structure/chair/office/dark, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acD" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/pen, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"acE" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) "acF" = ( /obj/docking_port/stationary{ dir = 2; @@ -740,6 +1299,41 @@ }, /turf/open/space, /area/solar/starboard/fore) +"acR" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acS" = ( +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/pen, +/obj/machinery/light, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/item/paicard, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acT" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket/letterman_nanotrasen, +/obj/item/clothing/suit/toggle/lawyer, +/obj/item/clothing/under/maid, +/obj/item/clothing/head/kitty, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) +"acU" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "acV" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -804,6 +1398,33 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"acZ" = ( +/obj/structure/bed, +/obj/machinery/light, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"ada" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "detective"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/purple, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/item/clothing/under/lawyer/female, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "adb" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -923,6 +1544,38 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"adk" = ( +/obj/structure/dresser, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"adl" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/light, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "greydet"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/black, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/item/clothing/head/fedora, +/obj/item/clothing/under/redeveninggown, +/obj/item/clothing/head/rabbitears, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) +"adm" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/six) "adq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/engineering{ @@ -78018,22 +78671,6 @@ "cAw" = ( /turf/closed/wall, /area/crew_quarters/dorms) -"cAx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "cAy" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -79074,110 +79711,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) -"cCc" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/crew_quarters/dorms) -"cCd" = ( -/obj/structure/table_frame/wood, -/obj/item/crowbar/red, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/plating, -/area/crew_quarters/dorms) -"cCe" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cCf" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cCg" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket/letterman_nanotrasen, -/obj/item/clothing/suit/toggle/lawyer, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 26 - }, -/obj/item/clothing/under/kilt, -/obj/item/clothing/head/beret, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cCh" = ( -/obj/structure/dresser, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cCi" = ( -/obj/structure/bed, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cCj" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "detective"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/purple, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 26 - }, -/obj/item/clothing/head/fedora{ - icon_state = "detective" - }, -/obj/item/clothing/under/geisha, -/obj/item/clothing/head/fedora{ - icon_state = "curator" - }, -/obj/item/clothing/suit/jacket{ - desc = "This looks awfully familiar..."; - icon_state = "curator" - }, -/obj/item/clothing/under/rank/curator/treasure_hunter, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "cCk" = ( /obj/machinery/light{ dir = 8 @@ -80050,50 +80583,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"cDC" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cDD" = ( -/obj/item/flashlight/seclite, -/turf/open/floor/wood{ - icon_state = "wood-broken3" - }, -/area/crew_quarters/dorms) -"cDE" = ( -/obj/structure/table/wood, -/obj/item/folder, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/item/razor, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cDF" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cDG" = ( -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cDH" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/pen, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cDI" = ( -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "cDJ" = ( /obj/structure/table, /obj/item/paper_bin, @@ -81135,53 +81624,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"cFw" = ( -/obj/item/clipboard{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/newspaper{ - pixel_x = 7; - pixel_y = 11 - }, -/obj/item/newspaper, -/obj/item/pen/red, -/turf/open/floor/wood{ - icon_state = "wood-broken2" - }, -/area/crew_quarters/dorms) -"cFx" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cFy" = ( -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cFz" = ( -/obj/structure/bed, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cFA" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cFB" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "cFC" = ( /obj/structure/table, /obj/item/folder, @@ -81931,79 +82373,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) -"cGT" = ( -/obj/machinery/button/door{ - id = "Dorm1"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cGU" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/beer{ - desc = "Whatever it is, it reeks of foul, putrid froth."; - icon_state = "beer"; - list_reagents = list("bacchus_blessing" = 15); - name = "Delta-Down"; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken4" - }, -/area/crew_quarters/dorms) -"cGV" = ( -/obj/machinery/button/door{ - id = "Dorm2"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cGW" = ( -/obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cGX" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/machinery/button/door{ - id = "Dorm3"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cGY" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "cGZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -82605,44 +82974,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"cIf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm5"; - name = "Cabin 1" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/crew_quarters/dorms) -"cIg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/crew_quarters/dorms) -"cIh" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm2"; - name = "Cabin 2" - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cIi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/crew_quarters/dorms) -"cIj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm3"; - name = "Cabin 3" - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "cIk" = ( /obj/machinery/firealarm{ dir = 8; @@ -86055,30 +86386,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cNT" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm4"; - name = "Cabin 4" - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cNU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm5"; - name = "Cabin 5" - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cNV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm6"; - name = "Cabin 6" - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "cNW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -87059,91 +87366,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cPQ" = ( -/obj/machinery/button/door{ - id = "Dorm4"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cPR" = ( -/obj/structure/dresser, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cPS" = ( -/obj/machinery/button/door{ - id = "Dorm5"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cPT" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cPU" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/pen/blue, -/obj/machinery/button/door{ - id = "Dorm6"; - name = "Dormitory Door Lock"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"cPV" = ( -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"cPW" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "cPX" = ( /obj/machinery/vending/cola/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -87957,36 +88179,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cRt" = ( -/obj/structure/table/wood, -/obj/item/storage/briefcase{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/briefcase, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/item/cane, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cRu" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"cRv" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/structure/sign/nanotrasen{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "cRw" = ( /obj/machinery/vending/snack/random, /obj/structure/extinguisher_cabinet{ @@ -89020,24 +89212,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cTa" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cTb" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cTc" = ( -/obj/structure/bed, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "cTd" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -90214,88 +90388,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cUV" = ( -/obj/structure/table/wood, -/obj/item/folder, -/obj/item/pen, -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/item/paicard, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cUW" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket/letterman_nanotrasen, -/obj/item/clothing/suit/toggle/lawyer, -/obj/item/clothing/under/maid, -/obj/item/clothing/head/kitty, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"cUX" = ( -/obj/structure/bed, -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cUY" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "detective"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/purple, -/obj/item/clothing/head/fedora{ - icon_state = "detective" - }, -/obj/item/clothing/under/lawyer/female, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"cUZ" = ( -/obj/structure/dresser, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"cVa" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/light, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "greydet"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/black, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/item/clothing/head/fedora, -/obj/item/clothing/under/redeveninggown, -/obj/item/clothing/head/rabbitears, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"cVb" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "cVc" = ( /obj/structure/table, /obj/machinery/light{ @@ -178246,12 +178338,12 @@ cqd cJi cKX cMu -cAw -cAw -cAw -cAw -cAw -cAw +abA +abA +abA +abA +abA +abA cYg cZS dbC @@ -178494,21 +178586,21 @@ cuD cqe cqe cyX -cAw -cAw -cAw -cAw -cAw -cAw +aaC +aaC +aaC +aaC +aaC +aaC cJj cKY cMv -cIg -cPQ -cFy -cTa -cCe -cAw +abB +abX +acn +acB +acR +abA cYh cZT dbC @@ -178751,21 +178843,21 @@ cuE cwb cxs coI -cAw -cCc -cDC -cFw -cGT -cIf +aaC +aaH +aaR +aaZ +abh +abr cJk cKZ cMw -cNT -cDG -cDG -cTb -cUV -cAw +abI +abY +abY +acC +acS +abA cYi cZU dbC @@ -179008,21 +179100,21 @@ bHq bHq cne cyY -cAx -cCd -cDD -cFx -cGU -cAw +aaD +aaI +aaT +aba +abk +aaC cJl cLa cMx -cIi -cPR -cFz -cDG -cUW -cAw +abJ +acg +acw +abY +acT +abA cYg cZU dbC @@ -179265,21 +179357,21 @@ cuF cwc cne cyZ -cAw -cAw -cAw -cAw -cAw -cAw +aaC +aaC +aaC +aaC +aaC +aaC cJm cLb cMy -cAw -cAw -cAw -cAw -cAw -cAw +abK +abK +abK +abK +abK +abK cYj cZV dbC @@ -179522,21 +179614,21 @@ cuG bHq cni cza -cAw -cCe -cDE -cFy -cGV -cIg +aaF +aaJ +aaU +abb +abl +abt cJj cLc cMz -cIg -cPS -cRt -cDH -cCh -cAw +abL +ach +acx +acD +acU +abK cYk cZV dbC @@ -179779,21 +179871,21 @@ cuH bHq cxt czb -cAw -cCf -cDF -cDG -cDG -cIh +aaF +aaK +aaV +aaW +aaW +abu cJn cLd cMA -cNU -cDI -cFB -cDI -cUX -cAw +abM +aci +acy +aci +acZ +abK cYj cZV dbC @@ -180036,21 +180128,21 @@ cuI bHq cxt czc -cAw -cCg -cDG -cFz -cGW -cIi +aaF +aaL +aaW +abc +abm +abw cJo cLe cMB -cIi -cPT -cDI -cDI -cUY -cAw +abN +acj +aci +aci +ada +abK cYl cZU dbC @@ -180293,21 +180385,21 @@ cuJ bHq cnf czd -cAw -cAw -cAw -cAw -cAw -cAw +aaF +aaF +aaF +aaF +aaF +aaF cJp cLf cMC -cAw -cAw -cAw -cAw -cAw -cAw +abO +abO +abO +abO +abO +abO cYm cZW dbC @@ -180550,21 +180642,21 @@ cuK bHq cni coF -cAw -cCh -cDH -cFA -cGX -cIg +aaG +aaM +aaX +abd +abn +abx cJq cLg cMD -cIg -cPU -cRu -cPV -cUZ -cAw +abU +ack +acz +acl +adk +abO cYn cZX dbD @@ -180807,21 +180899,21 @@ bHq bHq cxt coI -cAw -cCi -cDI -cFB -cDI -cIj +aaG +aaN +aaY +abg +aaY +aby cJr cLd cMC -cNV -cPV -cPV -cPV -cVa -cAw +abV +acl +acl +acl +adl +abO cYo cZY dbE @@ -181064,21 +181156,21 @@ aad cti cxu cze -cAw -cCj -cDI -cDI -cGY -cIi +aaG +aaQ +aaY +aaY +abo +abz cJo cLi cMB -cIi -cPW -cRv -cTc -cVb -cAw +abW +acm +acA +acE +adm +abO cYp cZZ cIX @@ -181321,21 +181413,21 @@ cuL cuL cxv czf -cAw -cAw -cAw -cAw -cAw -cAw +aaG +aaG +aaG +aaG +aaG +aaG cJs cKX cME -cAw -cAw -cAw -cAw -cAw -cAw +abO +abO +abO +abO +abO +abO cYq daa cuL diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0e6feb67c6..5f69519f56 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -17,6 +17,12 @@ /obj/effect/landmark/carpspawn, /turf/open/space, /area/space) +"aad" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) +"aae" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/five) "aaf" = ( /obj/structure/lattice, /turf/open/space, @@ -257,6 +263,17 @@ }, /turf/open/floor/plating, /area/security/prison) +"aaM" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/item/lighter, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) "aaN" = ( /obj/structure/cable{ icon_state = "0-2" @@ -299,6 +316,53 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"aaU" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/clothing/under/assistantformal, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) +"aaV" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Cabin3"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) +"aaW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/six) +"aaX" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/button/door{ + id = "Cabin4"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "aaY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -333,6 +397,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/security/prison) +"abd" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/clothing/under/suit_jacket/burgundy, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "abe" = ( /turf/closed/wall, /area/security/prison) @@ -388,6 +460,13 @@ /obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/plasteel, /area/security/prison) +"abk" = ( +/obj/structure/dresser, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "abl" = ( /obj/structure/table, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -457,6 +536,12 @@ }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) +"abt" = ( +/obj/structure/chair/wood/normal{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) "abu" = ( /obj/docking_port/stationary{ dir = 1; @@ -534,6 +619,12 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/security/prison) +"abE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) "abF" = ( /obj/structure/table, /obj/structure/cable/yellow{ @@ -555,6 +646,13 @@ /obj/item/toy/cards/deck, /turf/open/floor/plasteel, /area/security/prison) +"abH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) "abI" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -737,6 +835,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/prison) +"acd" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin3"; + name = "Cabin 6" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/six) "ace" = ( /obj/machinery/vending/sustenance{ desc = "A vending machine normally reserved for work camps."; @@ -1411,6 +1519,23 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"adk" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin4"; + name = "Cabin 5" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/five) +"adl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "adm" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -1591,6 +1716,16 @@ }, /turf/open/space, /area/space/nearstation) +"adH" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) +"adI" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/five) "adJ" = ( /obj/item/radio/intercom{ freerange = 0; @@ -2062,6 +2197,9 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"aeD" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "aeE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -2929,6 +3067,12 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"afQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) "afR" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -4146,6 +4290,12 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) +"ahT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) "ahU" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, @@ -4669,6 +4819,9 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"aiT" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) "aiU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -4689,6 +4842,19 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"aiW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "aiX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -4790,6 +4956,14 @@ /obj/item/restraints/handcuffs/cable/pink, /turf/open/floor/plating, /area/maintenance/port/fore) +"ajk" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/clothing/under/suit_jacket/tan, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "ajl" = ( /obj/item/soap/deluxe, /obj/item/storage/secure/safe{ @@ -4918,6 +5092,21 @@ }, /turf/open/floor/plasteel/dark, /area/security/warden) +"aju" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Cabin2"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "ajv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -6794,6 +6983,12 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"amv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "amw" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -6830,6 +7025,19 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"amB" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Cabin5"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) "amC" = ( /obj/structure/chair{ dir = 4 @@ -7010,6 +7218,14 @@ icon_state = "platingdmg2" }, /area/maintenance/port) +"amV" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/clothing/under/assistantformal, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) "amW" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -7290,6 +7506,14 @@ /obj/item/paper, /turf/open/floor/plasteel, /area/security/main) +"anz" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/obj/item/paper, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) "anA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -7751,6 +7975,9 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/warden) +"aov" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "aow" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -8481,6 +8708,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"apP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "apQ" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 @@ -8547,6 +8780,13 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plasteel, /area/security/main) +"apX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/four) "apY" = ( /obj/structure/table, /obj/item/folder/red, @@ -8612,6 +8852,16 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"aqe" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin2"; + name = "Cabin 4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/four) "aqf" = ( /obj/structure/closet/lasertag/blue, /obj/effect/turf_decal/tile/neutral{ @@ -9119,6 +9369,16 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"arh" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin5"; + name = "Cabin 3" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) "ari" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -9351,6 +9611,13 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"arF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) "arG" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, @@ -10114,46 +10381,28 @@ /turf/open/floor/plating, /area/maintenance/fore) "asT" = ( -/obj/machinery/light/small{ +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light/small, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) +"asU" = ( +/obj/structure/chair/wood/normal{ dir = 1 }, -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/item/lighter, /turf/open/floor/wood, -/area/crew_quarters/dorms) -"asU" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/item/clothing/under/assistantformal, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/three) "asV" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Cabin3"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) "asW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/two) "asX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -10187,37 +10436,36 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "ata" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/cobweb, +/obj/structure/bed, /obj/machinery/button/door{ - id = "Cabin4"; - name = "Cabin Bolt Control"; + id = "Cabin6"; + name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; specialfunctions = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/two) "atb" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/clothing/under/suit_jacket/burgundy, +/obj/item/clothing/under/suit_jacket/navy, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/two) "atc" = ( /obj/structure/dresser, /obj/machinery/newscaster{ pixel_y = 32 }, /turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin/two) "atd" = ( /turf/open/floor/plating{ icon_state = "panelscorched" @@ -10369,6 +10617,16 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"atw" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin6"; + name = "Cabin 2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) "atx" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -10439,6 +10697,13 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"atC" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "atD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -10461,6 +10726,12 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"atF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "atG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -10504,6 +10775,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"atJ" = ( +/obj/machinery/light/small, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "atK" = ( /obj/machinery/computer/prisoner/gulag_teleporter_computer{ dir = 1 @@ -10652,34 +10927,37 @@ }, /area/maintenance/fore) "aud" = ( -/obj/structure/chair/wood/normal{ +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"aue" = ( +/obj/machinery/door/airlock{ + id_tag = "Cabin7"; + name = "Cabin 1" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) +"auf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) +"aug" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aue" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, /turf/open/floor/wood, -/area/crew_quarters/dorms) -"auf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aug" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin3"; - name = "Cabin 6" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin) "auh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -10709,32 +10987,37 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "auk" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin4"; - name = "Cabin 5" +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/assistantformal, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) +"aul" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"aum" = ( +/obj/machinery/button/door{ + id = "Cabin7"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) +"aun" = ( +/obj/structure/chair/wood/normal{ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/dorms) -"aul" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"aum" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"aun" = ( -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/area/crew_quarters/dorms_cabin) "auo" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -10972,6 +11255,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"auQ" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_x = 29; + pixel_y = 1 + }, +/obj/item/paper, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin) "auU" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -11231,12 +11523,6 @@ }, /turf/closed/wall, /area/crew_quarters/dorms) -"avp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall, -/area/crew_quarters/dorms) "avq" = ( /obj/item/cigbutt, /obj/effect/turf_decal/stripes/line{ @@ -11862,42 +12148,6 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/fore) -"awC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/dresser, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"awD" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/item/clothing/under/suit_jacket/tan, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"awE" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Cabin2"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "awF" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -11911,27 +12161,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"awG" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Cabin5"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"awH" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/table/wood, -/obj/item/paper, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "awI" = ( /obj/machinery/door/airlock/maintenance/abandoned{ name = "Storage Room"; @@ -12388,29 +12617,6 @@ "axC" = ( /turf/closed/wall, /area/crew_quarters/toilet/restrooms) -"axD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"axE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"axF" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin2"; - name = "Cabin 4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "axG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -12421,31 +12627,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"axI" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin5"; - name = "Cabin 3" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"axJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"axK" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "axL" = ( /obj/item/caution, /obj/effect/turf_decal/stripes/line{ @@ -14974,30 +15155,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aCJ" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Cabin6"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"aCK" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/item/clothing/under/suit_jacket/navy, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "aCM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15626,33 +15783,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aEd" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin6"; - name = "Cabin 2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aEe" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"aEf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"aEg" = ( -/obj/machinery/light/small, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "aEh" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/airalarm{ @@ -17043,39 +17173,11 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aGM" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin7"; - name = "Cabin 1" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "aGN" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" }, /area/maintenance/port) -"aGO" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aGP" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/assistantformal, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "aGQ" = ( /obj/structure/table, /obj/item/stack/rods/fifty, @@ -17566,36 +17668,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) -"aHS" = ( -/obj/machinery/button/door{ - id = "Cabin7"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aHT" = ( -/obj/structure/chair/wood/normal{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aHU" = ( -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_x = 29; - pixel_y = 1 - }, -/obj/item/paper, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "aHV" = ( /obj/structure/closet, /obj/item/storage/box/donkpockets, @@ -34790,12 +34862,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"boS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "boT" = ( /obj/machinery/door/window/southleft{ base_state = "left"; @@ -119323,12 +119389,12 @@ afA acP aoS acP -arB -arB -arB -arB -arB -axC +aad +aad +aad +aeD +aeD +aeD axC axC axC @@ -119580,13 +119646,13 @@ alg anF aoT aqc -arB -asT -aud -arB -awC -aun -arB +aad +aaM +abt +aeD +aiW +aov +aeD aAd aBw aCC @@ -119837,13 +119903,13 @@ ahg anG aoU aqd -arB -asU -aue -arB -awD -axD -arB +aad +aaU +abE +aeD +ajk +apP +aeD aAe aBx aCD @@ -120094,13 +120160,13 @@ agz agz aoV dhs -arB -asV -auf -arB -awE -axE -arB +aad +aaV +abH +aeD +aju +apX +aeD dhA aBx aCE @@ -120351,13 +120417,13 @@ amw dCc aoV aqf -arB -asW -aug -arB -asW -axF -arB +aad +aaW +acd +aeD +amv +aqe +aeD arB aBy aCF @@ -121379,20 +121445,20 @@ amA anK aoZ aqj -arB -arB -auk -avo -arB -axI -avo +aae +aae +adk +afQ +aiT +arh +afQ aAi -arB -avo -aEd -arB -aGM -avo +asV +asW +atw +aud +aue +aul aJh aKs aLV @@ -121636,20 +121702,20 @@ alk anK aoZ aqk -arB -ata -aul -avp -awG -axJ -avp +aae +aaX +adl +ahT +amB +arF +ahT aAj -arB -aCJ -aEe -arB -boS -aHS +asV +ata +atC +aud +auf +aum aJh aKt aLW @@ -121893,20 +121959,20 @@ aiX anL aoZ aql -arB -atb -aum -arB -asU -axK -arB +aae +abd +adH +aiT +amV +asT +aiT aAk -arB -aCK -aEf -arB -aGO -aHT +asV +atb +atF +aud +aug +aun aJh aKu aLX @@ -122150,20 +122216,20 @@ amC amC apa aqm -arB -atc -aun -arB -awH -aud -arB +aae +abk +adI +aiT +anz +asU +aiT aAl -arB +asV atc -aEg -arB -aGP -aHU +atJ +aud +auk +auQ aJh aKv aLY @@ -122407,20 +122473,20 @@ amD amD amD aqn -arB -arB -arB -arB -arB -arB -arB +aae +aae +aae +aiT +aiT +aiT +aiT aHQ -arB -arB -arB -arB -arB -arB +asV +asV +asV +aud +aud +aud aJh aJh aJh diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index bd3d72dc85..74135af146 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1677,6 +1677,25 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard) +"acz" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"acA" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms_cabin) +"acB" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"acC" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket/letterman_nanotrasen, +/obj/item/clothing/suit/toggle/lawyer, +/obj/item/clothing/under/maid, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) "acD" = ( /obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, @@ -2116,6 +2135,40 @@ /obj/structure/sign/warning/vacuum, /turf/open/floor/plating, /area/quartermaster/storage) +"adr" = ( +/obj/structure/dresser, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"ads" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "detective"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/purple, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/item/clothing/under/geisha, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"adt" = ( +/obj/structure/dresser, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) +"adu" = ( +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) "adv" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -2134,6 +2187,14 @@ /obj/item/clothing/head/helmet/space/orange, /turf/open/floor/plating, /area/asteroid/nearstation) +"ady" = ( +/obj/structure/bed, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/item/bedsheet/blue, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) "adz" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -2279,6 +2340,9 @@ /obj/structure/closet/crate/bin, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"adM" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "adN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/radio/intercom{ @@ -2380,6 +2444,14 @@ "adX" = ( /turf/closed/wall, /area/crew_quarters/heads/hop) +"adY" = ( +/obj/structure/bed, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/item/bedsheet/red, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/three) "adZ" = ( /obj/item/radio/intercom{ name = "Station Intercom"; @@ -2410,6 +2482,9 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"aeb" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms_cabin/three) "aec" = ( /obj/machinery/conveyor{ dir = 8; @@ -2452,6 +2527,19 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"aef" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Cabin" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms_cabin) "aeg" = ( /obj/machinery/conveyor{ dir = 8; @@ -2477,6 +2565,35 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"aei" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Cabin" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms_cabin/three) +"aej" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"aek" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Cabin" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms_cabin/two) "ael" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -2490,6 +2607,9 @@ icon_state = "platingdmg3" }, /area/asteroid/nearstation) +"aen" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/four) "aeo" = ( /obj/structure/table, /obj/item/extinguisher/mini, @@ -2872,6 +2992,19 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/quartermaster/storage) +"aeR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Cabin" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms_cabin/four) "aeS" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, @@ -2889,6 +3022,13 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"aeV" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms_cabin/four) +"aeW" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) "aeX" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line{ @@ -2896,6 +3036,14 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"aeY" = ( +/obj/structure/bed, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/item/bedsheet/brown, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) "aeZ" = ( /obj/docking_port/stationary{ dir = 4; @@ -2907,6 +3055,9 @@ }, /turf/open/space/basic, /area/space) +"afa" = ( +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/four) "afb" = ( /obj/structure/door_assembly/door_assembly_mhatch, /obj/effect/turf_decal/stripes/line{ @@ -2917,6 +3068,14 @@ }, /turf/open/floor/plating, /area/asteroid/nearstation) +"afc" = ( +/obj/structure/bed, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/item/bedsheet/black, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/four) "afd" = ( /obj/structure/table/wood, /obj/item/taperecorder, @@ -3380,6 +3539,30 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/storage) +"afJ" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "detective"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/purple, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/item/clothing/under/lawyer/female, +/obj/machinery/light/small, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/two) +"afK" = ( +/obj/structure/dresser, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/crew_quarters/dorms_cabin/two) "afL" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, @@ -3395,6 +3578,19 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/asteroid/nearstation) +"afO" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "greydet"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/toggle/lawyer/black, +/obj/item/clothing/head/fedora, +/obj/item/clothing/under/blacktango, +/obj/machinery/light/small, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/four) "afP" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -3666,6 +3862,13 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"agm" = ( +/obj/structure/dresser, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin/four) "agn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/white, @@ -3812,6 +4015,9 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"agy" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms_cabin/two) "agz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -13844,47 +14050,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) -"axH" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket/letterman_nanotrasen, -/obj/item/clothing/suit/toggle/lawyer, -/obj/item/clothing/under/maid, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"axI" = ( -/obj/structure/dresser, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"axJ" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "detective"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/purple, -/obj/item/clothing/head/fedora{ - icon_state = "detective" - }, -/obj/item/clothing/under/geisha, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"axK" = ( -/obj/structure/dresser, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "axM" = ( /obj/structure/table/wood, /obj/item/lipstick/random{ @@ -14211,28 +14376,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"ayz" = ( -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"ayA" = ( -/obj/structure/bed, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/item/bedsheet/blue, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"ayB" = ( -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"ayC" = ( -/obj/structure/bed, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/item/bedsheet/red, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "ayE" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -14750,19 +14893,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"azD" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Cabin" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "azE" = ( /obj/structure/table/wood, /obj/item/staff/broom, @@ -16817,26 +16947,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aDG" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aDH" = ( -/obj/structure/bed, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/item/bedsheet/brown, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aDI" = ( -/obj/structure/bed, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/item/bedsheet/black, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "aDJ" = ( /obj/structure/table/wood, /obj/item/lipstick/random{ @@ -17519,50 +17629,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) -"aEO" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "detective"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/purple, -/obj/item/clothing/head/fedora{ - icon_state = "detective" - }, -/obj/item/clothing/under/lawyer/female, -/obj/machinery/light/small, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"aEP" = ( -/obj/structure/dresser, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/crew_quarters/dorms) -"aEQ" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket{ - desc = "All the class of a trenchcoat without the security fibers."; - icon_state = "greydet"; - name = "trenchcoat" - }, -/obj/item/clothing/suit/toggle/lawyer/black, -/obj/item/clothing/head/fedora, -/obj/item/clothing/under/blacktango, -/obj/machinery/light/small, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aER" = ( -/obj/structure/dresser, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "aES" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baguette, @@ -81051,16 +81117,16 @@ asW atQ auU avZ -awQ -awQ -awQ -sDl +acz +acz +acz +acA aAH bxK -awQ -awQ -awQ -awQ +aej +aej +aej +aej arY awe sIK @@ -81308,16 +81374,16 @@ asX atR auV awa -sDl -axH -ayz -azD +acA +acC +adu +aef aAH aBQ -azD -aDG -aEO -sDl +aek +aeW +afJ +agy aGD aHM aIE @@ -81565,16 +81631,16 @@ asY atS auW awb -awQ -axI -ayA -awQ +acz +adr +ady +acz aAH aBQ -awQ -aDH -aEP -awQ +aej +aeY +afK +aej aGE aHL aIF @@ -81822,16 +81888,16 @@ asZ atT auX awc -awQ -awQ -awQ -awQ +acB +acB +acB +acB aAI aBR -awQ -awQ -awQ -awQ +aen +aen +aen +aen bxN sIB cfz @@ -82079,16 +82145,16 @@ aHF atU apI apI -awQ -axJ -ayB -azD +acB +ads +adM +aei aAH aBS -azD -ayz -aEQ -sDl +aeR +afa +afO +aeV arY aHM aIG @@ -82336,16 +82402,16 @@ atb atV auY awd -awQ -axK -ayC -awQ +acB +adt +adY +acB abn aBT -awQ -aDI -aER -awQ +aen +afc +agm +aen aGG aHM aIH @@ -82593,16 +82659,16 @@ atc aoM atc awe +acB +acB +aeb +acB awQ awQ -sDl -awQ -awQ -awQ -sDl -awQ -awQ -awQ +aeV +aen +aen +aen arY sIB aII diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 9f1c1824cd..48ad754721 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -59,10 +59,590 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) +"aag" = ( +/turf/closed/wall/mineral/iron, +/area/chapel/main/monastery_cabin) +"aah" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/chaplain/holidaypriest, +/obj/item/clothing/suit/chaplain/nun, +/obj/item/clothing/head/nun_hood, +/obj/machinery/button/door{ + id = "Cell1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aai" = ( +/obj/structure/dresser, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aaj" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/flashlight/lantern, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aak" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin) +"aal" = ( +/obj/machinery/door/airlock{ + id_tag = "Cell1"; + name = "Cell 1" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aam" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aan" = ( +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aao" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aap" = ( +/obj/machinery/door/airlock{ + name = "Bathroom" + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aaq" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin) +"aar" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/mineral/iron, +/area/chapel/main/monastery_cabin) +"aas" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/instrument/violin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aat" = ( +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aau" = ( +/obj/structure/bed, +/obj/item/bedsheet/green, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin) +"aav" = ( +/obj/machinery/shower{ + dir = 8; + pixel_y = -4 + }, +/obj/item/soap/homemade, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin) +"aaw" = ( +/turf/closed/wall/mineral/iron, +/area/chapel/main/monastery_cabin/two) +"aax" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/chaplain/holidaypriest, +/obj/item/clothing/suit/chaplain/nun, +/obj/item/clothing/head/nun_hood, +/obj/machinery/button/door{ + id = "Cell2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -25; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aay" = ( +/obj/structure/dresser, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaz" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/easel, +/obj/item/canvas/twentythreeXnineteen, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaA" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin/two) +"aaB" = ( +/obj/machinery/door/airlock{ + id_tag = "Cell2"; + name = "Cell 2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaD" = ( +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaF" = ( +/obj/machinery/door/airlock{ + name = "Bathroom" + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaG" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin/two) +"aaH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/mineral/iron, +/area/chapel/main/monastery_cabin/two) +"aaI" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/item/storage/crayons, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaJ" = ( +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaK" = ( +/obj/structure/bed, +/obj/item/bedsheet/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/chapel/main/monastery_cabin/two) +"aaL" = ( +/obj/machinery/shower{ + dir = 8; + pixel_y = -4 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/item/bikehorn/rubberducky, +/turf/open/floor/plasteel/showroomfloor, +/area/chapel/main/monastery_cabin/two) +"aaM" = ( +/obj/machinery/door/airlock/command{ + name = "MiniSat Access"; + req_access_txt = "65" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"aaN" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Bridge External Access"; + req_access_txt = "10;13" + }, +/turf/open/floor/plating, +/area/bridge) +"aaO" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"aaP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"aaQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Dorm3Shutters"; + name = "Dorm Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/dorms_cabin/three) +"aaR" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm3Shutters"; + name = "Privacy Shutters Control"; + pixel_y = 26 + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) +"aaS" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) +"aaT" = ( +/obj/machinery/button/door{ + id = "Dorm3"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) +"aaU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/three) +"aaV" = ( +/obj/machinery/door/airlock/command{ + name = "MiniSat Access"; + req_access_txt = "65" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/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/plasteel/dark, +/area/bridge) +"aaW" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Bridge External Access"; + req_access_txt = "10;13" + }, +/turf/open/floor/plating, +/area/bridge) +"aaX" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/crew_quarters/dorms_cabin/three) +"aaY" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/crew_quarters/dorms_cabin/three) +"aaZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/crew_quarters/dorms_cabin/three) +"aba" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm3"; + name = "Dorm 3" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/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/plasteel/dark, +/area/crew_quarters/dorms_cabin/three) +"abb" = ( +/obj/machinery/door/airlock/command{ + name = "External Access"; + req_one_access_txt = "19; 65" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/bridge) +"abc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Dorm2Shutters"; + name = "Dorm Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/dorms_cabin/two) +"abd" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm2Shutters"; + name = "Privacy Shutters Control"; + pixel_y = 26; + req_access_txt = "0" + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"abe" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, /area/maintenance/department/science) +"abg" = ( +/obj/machinery/button/door{ + id = "Dorm2"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + req_access_txt = "0"; + specialfunctions = 4 + }, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"abh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"abi" = ( +/obj/structure/table/wood, +/obj/item/storage/book/bible, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"abj" = ( +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"abk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms_cabin/two) +"abl" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm2"; + name = "Dorm 2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/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/plasteel/dark, +/area/crew_quarters/dorms_cabin/two) +"abm" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin/two) +"abn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Dorm1Shutters"; + name = "Dorm Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/dorms_cabin) +"abo" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm1Shutters"; + name = "Privacy Shutters Control"; + pixel_y = 26; + req_access_txt = "0" + }, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abp" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abq" = ( +/obj/machinery/button/door{ + id = "Dorm1"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 25; + req_access_txt = "0"; + specialfunctions = 4 + }, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) +"abs" = ( +/obj/structure/table/wood, +/obj/item/storage/book/bible, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abt" = ( +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/dorms_cabin) +"abv" = ( +/obj/machinery/door/airlock{ + id_tag = "Dorm1"; + name = "Dorm 1" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/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/plasteel/dark, +/area/crew_quarters/dorms_cabin) +"abw" = ( +/turf/closed/wall, +/area/crew_quarters/dorms_cabin) "aby" = ( /obj/structure/lattice, /obj/structure/grille, @@ -7981,16 +8561,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/bridge) -"atM" = ( -/obj/machinery/door/airlock/command{ - name = "MiniSat Access"; - req_access_txt = "65" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "atN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -8109,14 +8679,6 @@ "atY" = ( /turf/closed/wall, /area/bridge) -"atZ" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Bridge External Access"; - req_access_txt = "10;13" - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) "aua" = ( /obj/structure/closet/secure_closet/freezer/money, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, @@ -8233,10 +8795,6 @@ }, /turf/open/floor/plasteel/dark, /area/gateway) -"auj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/crew_quarters/dorms) "auk" = ( /obj/machinery/door/airlock{ name = "Laundry Room" @@ -8611,48 +9169,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/gateway) -"avd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Dorm3Shutters"; - name = "Dorm Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/dorms) -"ave" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm3Shutters"; - name = "Privacy Shutters Control"; - pixel_y = 26 - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"avf" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"avg" = ( -/obj/machinery/button/door{ - id = "Dorm3"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "avh" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -9015,28 +9531,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"avQ" = ( -/obj/machinery/door/airlock/command{ - name = "MiniSat Access"; - req_access_txt = "65" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/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/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "avR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -9133,16 +9627,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"awc" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Bridge External Access"; - req_access_txt = "10;13" - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) "awd" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9236,43 +9720,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"awn" = ( -/obj/structure/dresser, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"awo" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/crew_quarters/dorms) -"awp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/crew_quarters/dorms) -"awq" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm3"; - name = "Dorm 3" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/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/plasteel/dark, -/area/crew_quarters/dorms) "awr" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -10019,17 +10466,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"aye" = ( -/obj/machinery/door/airlock/command{ - name = "External Access"; - req_one_access_txt = "19; 65" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "ayf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -10064,52 +10500,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/stairs, /area/hallway/primary/central) -"ayi" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Dorm2Shutters"; - name = "Dorm Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/dorms) -"ayj" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm2Shutters"; - name = "Privacy Shutters Control"; - pixel_y = 26; - req_access_txt = "0" - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"ayk" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"ayl" = ( -/obj/machinery/button/door{ - id = "Dorm2"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "aym" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -10601,43 +10991,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) -"azr" = ( -/obj/structure/table/wood, -/obj/item/storage/book/bible, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"azs" = ( -/obj/structure/chair/wood/normal{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"azt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"azu" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm2"; - name = "Dorm 2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/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/plasteel/dark, -/area/crew_quarters/dorms) "azv" = ( /obj/structure/chair/comfy{ dir = 4 @@ -11522,52 +11875,6 @@ /obj/item/crowbar, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aBL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Dorm1Shutters"; - name = "Dorm Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/dorms) -"aBM" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm1Shutters"; - name = "Privacy Shutters Control"; - pixel_y = 26; - req_access_txt = "0" - }, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aBN" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aBO" = ( -/obj/machinery/button/door{ - id = "Dorm1"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) "aBP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -12188,43 +12495,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aDb" = ( -/obj/structure/table/wood, -/obj/item/storage/book/bible, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aDc" = ( -/obj/structure/chair/wood/normal{ - dir = 8 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aDd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/dorms) -"aDe" = ( -/obj/machinery/door/airlock{ - id_tag = "Dorm1"; - name = "Dorm 1" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/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/plasteel/dark, -/area/crew_quarters/dorms) "aDf" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -47448,48 +47718,6 @@ /obj/item/seeds/sugarcane, /turf/open/floor/grass, /area/hydroponics/garden/monastery) -"cgL" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/chaplain/holidaypriest, -/obj/item/clothing/suit/chaplain/nun, -/obj/item/clothing/head/nun_hood, -/obj/machinery/button/door{ - id = "Cell1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"cgM" = ( -/obj/structure/dresser, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"cgN" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/flashlight/lantern, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"cgO" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/chapel/main/monastery) "cgP" = ( /obj/structure/transit_tube, /turf/open/floor/plating/airless, @@ -47605,42 +47833,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"chp" = ( -/obj/machinery/door/airlock{ - id_tag = "Cell1"; - name = "Cell 1" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chr" = ( -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"cht" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chu" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/chapel/main/monastery) "chv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -47716,42 +47908,6 @@ }, /turf/closed/wall, /area/chapel/main/monastery) -"chK" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/instrument/violin, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chL" = ( -/obj/structure/chair/wood/normal{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chM" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"chN" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, -/obj/item/soap/homemade, -/turf/open/floor/plasteel/showroomfloor, -/area/chapel/main/monastery) "chU" = ( /obj/structure/sink{ dir = 4; @@ -47816,34 +47972,6 @@ /obj/structure/transit_tube/crossing, /turf/open/floor/plating/airless, /area/space/nearstation) -"cio" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/chaplain/holidaypriest, -/obj/item/clothing/suit/chaplain/nun, -/obj/item/clothing/head/nun_hood, -/obj/machinery/button/door{ - id = "Cell2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"cip" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/easel, -/obj/item/canvas/twentythreeXnineteen, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"ciq" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/chapel/main/monastery) "cit" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -47898,16 +48026,6 @@ }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) -"ciF" = ( -/obj/machinery/door/airlock{ - id_tag = "Cell2"; - name = "Cell 2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) "ciG" = ( /obj/machinery/camera{ c_tag = "Engineering Supermatter Aft"; @@ -47982,37 +48100,6 @@ /obj/structure/flora/ausbushes/pointybush, /turf/open/floor/grass, /area/hydroponics/garden/monastery) -"ciX" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/item/storage/crayons, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"ciY" = ( -/obj/structure/bed, -/obj/item/bedsheet/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/grimy, -/area/chapel/main/monastery) -"ciZ" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/obj/item/bikehorn/rubberducky, -/turf/open/floor/plasteel/showroomfloor, -/area/chapel/main/monastery) "cjf" = ( /obj/machinery/light/small{ dir = 8 @@ -81203,15 +81290,15 @@ cdB cfm cfm cfH -cfm -cfm -chp -cuQ -cfm -cfm -ciF -cuQ -cfm +aag +aag +aal +aar +aaw +aaw +aaB +aaH +aaw cfm fwo cfm @@ -81460,15 +81547,15 @@ cen bWV ctQ cfI -cfm -cgL -chq -chK -cfm -cio -chq -ciX -cfm +aag +aah +aam +aas +aaw +aax +aaC +aaI +aaw cfN cwA cfN @@ -81717,15 +81804,15 @@ bWV bWV bWV cfJ -cfm -cgM -chr -chL -cfm -cgM -chr -chL -cfm +aag +aai +aan +aat +aaw +aay +aaD +aaJ +aaw cfN xyT cfN @@ -81974,15 +82061,15 @@ cdD ceo bOw bQg -cfm -cgN -chs -chM -cfm -cip -chs -ciY -cfm +aag +aaj +aao +aau +aaw +aaz +aaE +aaK +aaw cfN cwA cfN @@ -82231,15 +82318,15 @@ bQg bQg bQg cfL -cfm -cfm -cht -cfm -cfm -cfm -cht -cfm -cfm +aag +aag +aap +aag +aaw +aaw +aaF +aaw +aaw cfN cwA cfN @@ -82488,15 +82575,15 @@ bQe bOw bUC bQg -cfm -cgO -chu -chN -cfm -ciq -chu -ciZ -cfm +aag +aak +aaq +aav +aaw +aaA +aaG +aaL +aaw cfN cwA cfN @@ -82745,15 +82832,15 @@ bNs bNs bNs bNs -cfm -cfm -cfm -cfm -cfm -cfm -cfm -cfm -cfm +aag +aag +aag +aag +aaw +aaw +aaw +aaw +aaw cfN cwA cjm @@ -90363,7 +90450,7 @@ aoz aqG arC asN -atM +aaM auL avO awV @@ -90879,7 +90966,7 @@ arE arA atO auM -avQ +aaV awW axW azc @@ -94736,7 +94823,7 @@ arA arA arA arA -aye +abb arA aAF aAH @@ -95246,9 +95333,9 @@ aaa aaa aaa ahi -atZ +aaN auV -awc +aaW axg ayg azp @@ -99358,16 +99445,16 @@ aiS aiS aiS aiS -apX -avd -avd -apX -ayi -ayi -apX -aBL -aBL -apX +aaO +aaQ +aaQ +aaO +abc +abc +abm +abn +abn +abw aET rYC aET @@ -99615,16 +99702,16 @@ ale ale asb coe -apX -ave -awn -apX -ayj -azr -apX -aBM -aDb -apX +aaO +aaR +aaX +aaO +abd +abi +abm +abo +abs +abw oFo jOB qbZ @@ -99872,16 +99959,16 @@ apX apX asc atf -apX -avf -awo -apX -ayk -azs -apX -aBN -aDc -apX +aaO +aaS +aaY +aaO +abe +abj +abm +abp +abt +abw aET cor aET @@ -100129,16 +100216,16 @@ apX aqT asd atg -auj -avg -awp -apX -ayl -azt -apX -aBO -aDd -apX +aaP +aaT +aaZ +aaO +abg +abk +abm +abq +abu +abw aEU aFE aGA @@ -100386,16 +100473,16 @@ apX aqU ase ath -apX -atf -awq -apX -atf -azu -apX -atf -aDe -apX +aaO +aaU +aba +aaO +abh +abl +abm +abr +abv +abw aFF vuP aGB diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 733a5ace75..44dad718e7 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -404,6 +404,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Dormitories" icon_state = "Sleep" +/area/crew_quarters/dorms/Initialize() + sub_areas = typesof(/area/crew_quarters/dorms_cabin) + return ..() + /area/crew_quarters/dorms/male name = "Male Dorm" icon_state = "Sleep" @@ -412,27 +416,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Female Dorm" icon_state = "Sleep" -/area/crew_quarters/dorms/cabin +/area/crew_quarters/dorms_cabin name = "Dorms Cabin One" icon_state = "sleep_cabin" safe = TRUE -/area/crew_quarters/dorms/cabin/two +/area/crew_quarters/dorms_cabin/two name = "Dorms Cabin Two" -/area/crew_quarters/dorms/cabin/three +/area/crew_quarters/dorms_cabin/three name = "Dorms Cabin Three" -/area/crew_quarters/dorms/cabin/four +/area/crew_quarters/dorms_cabin/four name = "Dorms Cabin Four" -/area/crew_quarters/dorms/cabin/five +/area/crew_quarters/dorms_cabin/five name = "Dorms Cabin Five" -/area/crew_quarters/dorms/cabin/six +/area/crew_quarters/dorms_cabin/six name = "Dorms Cabin Six" -/area/crew_quarters/dorms/cabin/seven +/area/crew_quarters/dorms_cabin/seven name = "Dorms Cabin Seven" /area/crew_quarters/rehab_dome @@ -563,6 +567,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel/main/monastery name = "Monastery" +/area/chapel/main/monastery/Initialize() + sub_areas = typesof(/area/chapel/main/monastery_cabin) + return ..() + +/area/chapel/main/monastery_cabin + name = "Monastery Cabin One" + icon_state = "sleep_cabin" + safe = TRUE + +/area/chapel/main/monastery_cabin/two + name = "Monastery Cabin Two" + /area/chapel/office name = "Chapel Office" icon_state = "chapeloffice"