diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9e766cb173f4..1b65d0b049c0 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -19147,14 +19147,8 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bri" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/table/glass, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, +/obj/item/storage/box/disks, /turf/open/floor/plasteel/white, /area/medical/genetics) "brk" = ( @@ -19654,30 +19648,23 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bst" = ( -/obj/item/radio/intercom{ - frequency = 1485; - name = "Station Intercom (Medbay)"; - pixel_x = 30 - }, /obj/machinery/camera{ c_tag = "Medbay East"; dir = 8; network = list("ss13","medbay"); pixel_y = -22 }, +/obj/item/radio/intercom{ + frequency = 1485; + name = "Station Intercom (Medbay)"; + pixel_x = 30 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bsu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/medical/morgue) -"bsv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "bsw" = ( /obj/machinery/door/airlock/research{ name = "Robotics Lab"; @@ -19949,16 +19936,16 @@ /turf/open/floor/plasteel/white, /area/science) "bti" = ( +/obj/item/book/manual/wiki/medical_cloning{ + pixel_y = 6 + }, +/obj/structure/table, +/obj/item/storage/box/bodybags, /obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/box/bodybags, -/obj/structure/table, /obj/item/pen, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, /turf/open/floor/plasteel/white, /area/medical/genetics) "btj" = ( @@ -20403,7 +20390,7 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bum" = ( -/obj/machinery/holopad, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, /area/medical/genetics) "bun" = ( @@ -20411,7 +20398,6 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/closet/secure_closet/medical1, /turf/open/floor/plasteel/white, /area/medical/genetics) "buo" = ( @@ -20431,11 +20417,14 @@ /turf/open/floor/plasteel/white, /area/science) "buq" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Research"; + req_access_txt = "5; 9; 68" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/medical/genetics) "bur" = ( /obj/structure/cable{ @@ -20846,10 +20835,28 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bvn" = ( -/obj/machinery/clonepod, +/obj/machinery/camera{ + c_tag = "Genetics Cloning"; + dir = 4; + network = list("ss13","medbay") + }, +/obj/machinery/button/door{ + desc = "A remote control switch for the genetics doors."; + id = "GeneticsDoor"; + name = "Genetics Exit Button"; + normaldoorcontrol = 1; + pixel_x = -24; + pixel_y = -9 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24; + pixel_y = 6 + }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/clonepod, /turf/open/floor/plasteel/white, /area/medical/genetics) "bvo" = ( @@ -20865,8 +20872,6 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bvq" = ( -/obj/structure/chair, -/obj/effect/landmark/start/geneticist, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -20893,14 +20898,10 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bvt" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/closed/wall, /area/medical/genetics) "bvu" = ( /obj/effect/turf_decal/tile/purple{ @@ -21350,36 +21351,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bwL" = ( -/obj/machinery/camera{ - c_tag = "Genetics Cloning"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24; - pixel_y = 6 - }, -/obj/structure/closet/wardrobe/grey, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/rank/civilian/janitor/maid, -/obj/item/clothing/under/dress/skirt, -/obj/item/clothing/under/misc/assistantformal, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret, -/obj/machinery/button/door{ - desc = "A remote control switch for the genetics doors."; - id = "GeneticsDoor"; - name = "Genetics Exit Button"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -9 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "bwM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26187,11 +26158,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bIq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/storage/box/rxglasses, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bIs" = ( @@ -43042,7 +43013,6 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "dkW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/item/radio/intercom{ pixel_y = 22 }, @@ -44404,6 +44374,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white/side, /area/hallway/primary/starboard) +"evM" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/secure_closet/medical1, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "evR" = ( /turf/open/floor/plating, /area/maintenance/bar) @@ -50159,9 +50137,6 @@ /turf/open/floor/plasteel, /area/science/circuit) "jgo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/hos{ name = "Representative Office" }, @@ -50241,6 +50216,18 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"jjN" = ( +/obj/item/clothing/head/beret, +/obj/structure/closet/wardrobe/grey, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/under/misc/assistantformal, +/obj/item/clothing/under/dress/skirt, +/obj/item/clothing/under/rank/civilian/janitor/maid, +/obj/item/clothing/under/costume/kilt, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "jkx" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/computer/slot_machine, @@ -52472,7 +52459,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/security/warden) "laN" = ( @@ -53539,6 +53525,7 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/security/warden) "lRt" = ( @@ -53909,6 +53896,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mfB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/security/warden) "mfI" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible, /obj/structure/lattice, @@ -53930,6 +53921,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/closed/wall, /area/service/lawoffice) "mhM" = ( @@ -54899,6 +54893,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mWV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/ai_monitored/command/storage/eva) "mXf" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -57883,7 +57883,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/security{ @@ -60868,6 +60867,10 @@ }, /turf/open/space/basic, /area/space) +"sae" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -61929,6 +61932,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/service/bar) +"sUd" = ( +/obj/machinery/holopad, +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "sUo" = ( /obj/structure/railing{ dir = 8 @@ -63125,6 +63133,7 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/security/warden) "tOV" = ( @@ -65336,6 +65345,7 @@ name = "Firing Range APC"; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/security/warden) "vIj" = ( @@ -66770,7 +66780,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, /area/security/warden) @@ -93028,7 +93037,7 @@ xkk lRb vIi tOx -agn +mfB gCJ lKN ncK @@ -95360,7 +95369,7 @@ edW vym vym kIS -axz +mWV ayO ltc aBp @@ -95617,9 +95626,9 @@ gJk auf auf eIf -axA ayW ayW +axA vdE ayW ayW @@ -95875,7 +95884,7 @@ vxt eiM rVb qhR -uSp +aph qpY fwR wWs @@ -96132,7 +96141,7 @@ are sjN qfK fAO -uSp +aph fsZ sEw sqp @@ -96646,7 +96655,7 @@ eno pUK dyo tAc -uSp +aph lwW sTg ata @@ -106963,8 +106972,8 @@ bqQ bsx bst bfJ -btk bhh +btk bwK bhh bhh @@ -107220,9 +107229,9 @@ bqW brh bua bua -bua ajB bua +bua lAw lAw lAw @@ -107477,8 +107486,8 @@ bra bpE bua bvn -bwL bsL +jjN bua sRj rik @@ -107732,7 +107741,7 @@ bmW bom bIq bri -bpE +sae bpL bsL bvo @@ -107989,8 +107998,8 @@ bmY bsL bsL bsL -bpE -bKQ +sae +sUd bum bvq bua @@ -108246,7 +108255,7 @@ bmZ bKQ bsL bsL -bpE +sae bti bul bvp @@ -108760,8 +108769,8 @@ bmZ bpG bqZ brk -bsv buf +evM bun bvr bon diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2d0182c74849..abd825e83893 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -78841,7 +78841,7 @@ dir = 4 }, /obj/machinery/button/door{ - id = "Xeno Dorms"; + id = "Cabin9"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; @@ -81204,7 +81204,7 @@ dir = 4 }, /obj/machinery/button/door{ - id = "Space Dorms"; + id = "Cabin8"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; @@ -86652,8 +86652,8 @@ /area/engineering/main) "vJf" = ( /obj/machinery/door/airlock{ - id_tag = "Cabin7"; - name = "Cabin 1" + id_tag = "Cabin9"; + name = "Cabin 6" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -87516,8 +87516,8 @@ /area/command/heads_quarters/ce) "wdQ" = ( /obj/machinery/door/airlock{ - id_tag = "Cabin6"; - name = "Cabin 2" + id_tag = "Cabin8"; + name = "Cabin 5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm index 7752a359b4ab..a2450b19b6b6 100644 --- a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm +++ b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm @@ -26837,14 +26837,8 @@ /turf/open/floor/mineral/plastitanium, /area/medical/medbay/central) "bri" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/table/glass, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, +/obj/item/storage/box/disks, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "brj" = ( @@ -27351,13 +27345,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"bsv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/mineral/plastitanium, -/area/medical/genetics) "bsw" = ( /obj/machinery/door/airlock/research{ name = "Robotics Lab"; @@ -27631,16 +27618,16 @@ /turf/open/floor/mineral/plastitanium, /area/science) "bti" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/medical_cloning{ + pixel_y = 6 + }, +/obj/item/storage/box/bodybags, /obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/box/bodybags, -/obj/structure/table, /obj/item/pen, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "btj" = ( @@ -28108,6 +28095,7 @@ /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bum" = ( +/obj/effect/landmark/start/geneticist, /obj/machinery/holopad, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) @@ -28116,7 +28104,6 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/closet/secure_closet/medical1, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "buo" = ( @@ -28136,10 +28123,13 @@ /turf/open/floor/mineral/plastitanium, /area/science) "buq" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Research"; + req_access_txt = "5; 9; 68" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bur" = ( @@ -28546,10 +28536,28 @@ /turf/open/floor/mineral/plastitanium, /area/medical/medbay/central) "bvn" = ( -/obj/machinery/clonepod, +/obj/machinery/camera{ + c_tag = "Genetics Cloning"; + dir = 4; + network = list("ss13","medbay") + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24; + pixel_y = 6 + }, +/obj/machinery/button/door{ + desc = "A remote control switch for the genetics doors."; + id = "GeneticsDoor"; + name = "Genetics Exit Button"; + normaldoorcontrol = 1; + pixel_x = -24; + pixel_y = -9 + }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/clonepod, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bvo" = ( @@ -28565,15 +28573,13 @@ /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bvq" = ( -/obj/structure/chair, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bvr" = ( @@ -28596,14 +28602,10 @@ /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bvt" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/turf/closed/wall, /area/medical/genetics) "bvu" = ( /obj/effect/turf_decal/tile/purple{ @@ -29084,36 +29086,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/medical/medbay/central) -"bwL" = ( -/obj/machinery/camera{ - c_tag = "Genetics Cloning"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24; - pixel_y = 6 - }, -/obj/structure/closet/wardrobe/grey, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/rank/civilian/janitor/maid, -/obj/item/clothing/under/dress/skirt, -/obj/item/clothing/under/misc/assistantformal, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret, -/obj/machinery/button/door{ - desc = "A remote control switch for the genetics doors."; - id = "GeneticsDoor"; - name = "Genetics Exit Button"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -9 - }, -/turf/open/floor/mineral/plastitanium, -/area/medical/genetics) "bwM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -34262,11 +34234,11 @@ /turf/open/floor/carpet/blackred, /area/medical/medbay/zone2) "bIq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/storage/box/rxglasses, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/open/floor/mineral/plastitanium, /area/medical/genetics) "bIr" = ( @@ -59712,6 +59684,14 @@ /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/security/prison) +"nIN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/secure_closet/medical1, +/turf/open/floor/mineral/plastitanium, +/area/medical/genetics) "nJP" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -60363,6 +60343,18 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"oCA" = ( +/obj/structure/closet/wardrobe/grey, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/under/misc/assistantformal, +/obj/item/clothing/under/dress/skirt, +/obj/item/clothing/under/rank/civilian/janitor/maid, +/obj/item/clothing/under/costume/kilt, +/turf/open/floor/mineral/plastitanium, +/area/medical/genetics) "oCF" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -60948,12 +60940,12 @@ /turf/open/floor/plasteel/kitchen_coldroom, /area/commons/dorms) "puV" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium/red, /area/maintenance/bar) "pvJ" = ( @@ -67171,6 +67163,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"ydO" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/space/basic, +/area/medical/genetics) "yeA" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall/syndicate{ @@ -89491,7 +89487,7 @@ bCq mqZ rVy cNW -rgW +aCr bcU dfL aXL @@ -89748,7 +89744,7 @@ bCq mqZ fLN fxa -aCr +rgW bcU dfL aLt @@ -90782,7 +90778,7 @@ fxa puV rVy fxa -sAH +oKh bLv bUs bLv @@ -91033,13 +91029,13 @@ bCq mqZ usO xJa -oKh +sAH usO mpI -oKh +sAH usO izv -oKh +sAH bCq bUs bCq @@ -105657,8 +105653,8 @@ bqQ bsx bst bfJ -buf bxQ +buf bwK bxQ bxQ @@ -105913,9 +105909,9 @@ boc bqW brh bua -bua bGU wXg +bGU bua bEh bEh @@ -106168,11 +106164,11 @@ bkR bfL bpE bFE -bpE +ydO bua bvn -bwL brd +oCA bua bKQ bBJ @@ -107454,8 +107450,8 @@ bmZ bpG bqZ brk -bsv bzp +nIN bun bvr bua