diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 509d6e3bb43..17cf19c5e27 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -2891,7 +2891,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -3870,7 +3870,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -4709,7 +4709,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/blue{ @@ -5585,7 +5585,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/research/exterior) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 590000aabfb..f88e6571db4 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5166,10 +5166,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"akV" = ( -/obj/effect/mapping_helpers/iannewyear, -/turf/open/floor/carpet, -/area/crew_quarters/heads/hop) "akW" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ @@ -25210,7 +25206,7 @@ "bmX" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "bmY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -25222,7 +25218,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/science/genetics) "bna" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -25724,7 +25720,7 @@ /area/medical/medbay/central) "bon" = ( /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/science/genetics) "boo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -26203,7 +26199,7 @@ "bpE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics) +/area/science/genetics) "bpF" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ @@ -26217,38 +26213,31 @@ /area/medical/pharmacy) "bpG" = ( /obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; + areastring = "/area/medical/genetics/cloning"; dir = 1; - name = "Genetics APC"; + name = "Cloning APC"; pixel_y = 23 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpH" = ( -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/radio/headset/headset_medsci, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpI" = ( -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"bpH" = ( /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) +"bpI" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "bpJ" = ( /obj/machinery/light{ dir = 1 @@ -26256,18 +26245,32 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpK" = ( -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) -"bpL" = ( -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/chair/office/light{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"bpK" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"bpL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/chair/office/light{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "bpM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/smartfridge/chemistry, @@ -26393,8 +26396,15 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bqe" = ( -/turf/closed/wall/r_wall, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bqf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26532,6 +26542,9 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/primary/central) +"bqz" = ( +/turf/open/floor/carpet, +/area/crew_quarters/heads/hop) "bqA" = ( /obj/machinery/computer/card{ dir = 1 @@ -26738,42 +26751,19 @@ "bqZ" = ( /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bra" = ( -/obj/structure/table/glass, -/obj/item/storage/box/rxglasses, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "brb" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "brc" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "brd" = ( -/turf/open/floor/plasteel, -/area/medical/genetics) -"bre" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/obj/structure/closet/secure_closet/personal/patient, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "brg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -26809,7 +26799,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "brm" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -26845,13 +26835,12 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "brr" = ( -/obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/science/explab) +/area/science/genetics) "brs" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ @@ -26867,7 +26856,6 @@ }, /obj/item/folder/white, /obj/item/pen, -/obj/item/relic, /turf/open/floor/plating, /area/science/robotics/lab) "brt" = ( @@ -26884,21 +26872,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"brv" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"brv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26911,8 +26902,8 @@ /area/science/research) "bry" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "47" + name = "Genetics Lab Maintenance"; + req_access_txt = "47, 9" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -26930,15 +26921,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 6 - }, -/obj/item/pen, -/obj/item/hand_labeler, /obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/machinery/computer/scan_consolenew, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brE" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "8;12" @@ -27253,12 +27242,12 @@ }, /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bsv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bsw" = ( /obj/machinery/door/airlock/research{ name = "Robotics Lab"; @@ -27298,29 +27287,20 @@ }, /area/science/research) "bsH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/science/explab) -"bsK" = ( -/obj/structure/table/glass, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bsL" = ( /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bsN" = ( -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "9" +/obj/structure/chair/office/light{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "bsO" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, @@ -27432,18 +27412,17 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"bti" = ( -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "btk" = ( /obj/structure/closet/wardrobe/white, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "btl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/chair/office/light{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "btm" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -27773,7 +27752,7 @@ /area/medical/medbay/central) "bua" = ( /turf/closed/wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "bub" = ( /obj/machinery/light, /obj/item/radio/intercom{ @@ -27818,25 +27797,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) -"buf" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bug" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "bui" = ( /obj/machinery/airalarm{ dir = 1; @@ -27866,11 +27826,11 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bum" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bun" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -27878,7 +27838,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "buo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27891,7 +27851,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "bur" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27900,8 +27860,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "but" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27912,11 +27873,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "buu" = ( +/obj/machinery/vending/wardrobe/gene_wardrobe, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bux" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27924,13 +27886,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "buy" = ( /obj/structure/disposalpipe/sorting/mail{ sortType = 23 @@ -27999,7 +27958,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "buH" = ( /obj/machinery/door/airlock/research{ name = "Genetics Research Access"; @@ -28272,65 +28231,54 @@ layer = 2.9 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/awaymission/research/interior/clonestorage) "bvo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/structure/chair, -/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bvr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvs" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvt" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Cloning Storage"; + req_access_txt = "5; 9" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvu" = ( -/obj/structure/window/reinforced, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) -"bvv" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "bvw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvx" = ( /turf/closed/wall/r_wall, /area/science/research) @@ -28347,12 +28295,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -28368,7 +28313,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "bvB" = ( /obj/machinery/camera{ c_tag = "Genetics Access"; @@ -28452,9 +28397,6 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"bvO" = ( -/turf/open/floor/plasteel/white, -/area/science/explab) "bvQ" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -28801,7 +28743,7 @@ name = "Cloning Recovery" }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "bwM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -29228,7 +29170,7 @@ name = "Cloning Recovery" }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/awaymission/research/interior/clonestorage) "bxY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29289,7 +29231,7 @@ "bye" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "byf" = ( /turf/closed/wall/r_wall, /area/science/server) @@ -29816,7 +29758,7 @@ }, /obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bzm" = ( /obj/structure/table, /obj/item/storage/box/rxglasses{ @@ -29841,7 +29783,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bzn" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue, @@ -29849,7 +29791,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bzo" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -29859,23 +29801,7 @@ pixel_y = -28 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzp" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzq" = ( -/obj/structure/closet/secure_closet/medical1, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzr" = ( -/obj/item/radio/intercom{ - pixel_y = -29 - }, -/obj/machinery/vending/wardrobe/gene_wardrobe, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "bzs" = ( /turf/closed/wall, /area/maintenance/aft) @@ -30062,8 +29988,14 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "bzO" = ( -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bzP" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -30462,9 +30394,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bAR" = ( -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/glass, +/obj/item/storage/box/rxglasses, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bAS" = ( /obj/machinery/camera{ c_tag = "Quartermaster's Office"; @@ -31068,12 +31001,15 @@ dir = 1; network = list("ss13","rd") }, -/obj/machinery/light, /obj/structure/sign/warning/nosmoking{ pixel_y = -32 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, /turf/open/floor/engine, -/area/science/explab) +/area/science/genetics) "bCm" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -37710,6 +37646,10 @@ "bUq" = ( /obj/machinery/nanite_program_hub, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/dark, /area/science/nanite) "bUr" = ( @@ -49194,16 +49134,37 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cYY" = ( -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ddf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) +"ddy" = ( +/obj/machinery/door/window/westleft{ + dir = 1; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" + }, +/mob/living/carbon/monkey, +/turf/open/floor/engine, +/area/science/genetics) "dfx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -49420,6 +49381,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"eFD" = ( +/obj/structure/table/glass, +/obj/item/storage/box/disks{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "eIE" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -49492,6 +49462,11 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"flN" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plasteel, +/area/science/mixing) "fnC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -49503,6 +49478,22 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"fqQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = 30 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/science/genetics) "fqV" = ( /obj/structure/rack, /obj/item/storage/box, @@ -49668,11 +49659,27 @@ /turf/open/floor/plasteel, /area/vacant_room/commissary) "gHj" = ( -/obj/structure/closet/radiation, -/turf/open/floor/plasteel/white/corner{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"gHL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "gLd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49844,14 +49851,9 @@ /turf/open/floor/plasteel, /area/science/nanite) "ifv" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/book/manual/wiki/experimentor, -/obj/item/relic, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, -/area/science/explab) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/science/genetics) "igT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -49864,6 +49866,13 @@ /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ink" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ipA" = ( /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -50023,12 +50032,24 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "jyF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/science/explab) +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "jAD" = ( /obj/structure/grille, /turf/open/floor/plating/airless, @@ -50226,13 +50247,12 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "kxC" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "kxP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -50272,14 +50292,15 @@ /turf/open/floor/plasteel/white, /area/medical/pharmacy) "kGS" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/structure/table/glass, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/radio/headset/headset_sci{ + pixel_x = -3 }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/engine, -/area/science/explab) +/obj/item/folder/white, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "kKK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, @@ -50368,6 +50389,13 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"kXf" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, +/turf/open/floor/engine, +/area/science/genetics) "kXt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -50393,6 +50421,9 @@ }, /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"ljx" = ( +/turf/closed/wall/r_wall, +/area/medical/genetics/cloning) "lqJ" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -50469,6 +50500,12 @@ /obj/machinery/meter, /turf/open/floor/plasteel, /area/science/mixing) +"lFP" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lHR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50611,17 +50648,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Experimentor Lab"; network = list("ss13","rd") }, -/obj/structure/closet/l3closet/scientist, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "mMA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -50652,9 +50688,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"nbv" = ( -/turf/closed/wall, -/area/science/explab) "ndR" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -50671,6 +50704,23 @@ /obj/structure/girder, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"npF" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "nro" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -50835,9 +50885,19 @@ /turf/closed/wall, /area/vacant_room/commissary) "nXP" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "nXT" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -50877,18 +50937,14 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "orP" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_x = 25; - req_access_txt = "47" +/obj/machinery/computer/scan_consolenew{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/light{ + dir = 4 }, -/turf/open/floor/plasteel/white, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "orS" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, @@ -51104,8 +51160,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "ptw" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/white, @@ -51163,6 +51220,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"pBV" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plasteel, +/area/science/mixing) "pDu" = ( /obj/machinery/computer/nanite_cloud_controller, /obj/effect/turf_decal/bot, @@ -51212,6 +51277,13 @@ "pKm" = ( /obj/structure/table, /obj/item/nanite_remote, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = 30; + receive_ore_updates = 1 + }, /turf/open/floor/plasteel/dark, /area/science/nanite) "pLn" = ( @@ -51253,12 +51325,25 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "pSN" = ( -/obj/machinery/rnd/bepis, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "pUr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, @@ -51305,6 +51390,10 @@ dir = 10 }, /area/science/research) +"qbW" = ( +/obj/machinery/rnd/bepis, +/turf/open/floor/engine, +/area/science/misc_lab) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -51340,19 +51429,30 @@ }, /turf/open/floor/plasteel, /area/science/nanite) -"qor" = ( -/obj/effect/landmark/start/paramedic, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +"qrH" = ( +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" + }, +/turf/open/floor/engine, +/area/science/genetics) "qrU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/plasteel/white/corner{ +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"qsH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/area/science/explab) +/turf/closed/wall/r_wall, +/area/medical/genetics/cloning) "quT" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -51454,6 +51554,14 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"rAv" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "rFI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -51553,10 +51661,6 @@ "sjr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/loading_area, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /turf/open/floor/plasteel/dark, /area/science/nanite) "sjK" = ( @@ -51711,6 +51815,12 @@ "tav" = ( /turf/closed/wall, /area/vacant_room/commissary) +"taM" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "tbd" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -51735,17 +51845,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 3 - }, /obj/structure/cable, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "tfg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -51772,6 +51875,10 @@ /obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port/aft) +"tiO" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/genetics/cloning) "tjy" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -52031,12 +52138,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "uIv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52086,7 +52193,7 @@ layer = 2.9 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "uUy" = ( /turf/open/floor/plasteel, /area/science/mixing) @@ -52133,6 +52240,12 @@ dir = 8 }, /area/science/research) +"vhn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "vjm" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -52235,15 +52348,17 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; + abandoned = "47, 9"; + name = "Genetics Lab"; req_access_txt = "47" }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "vHp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red, @@ -52273,6 +52388,22 @@ }, /turf/open/floor/grass, /area/hydroponics/garden) +"vPt" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "vPE" = ( /obj/item/assembly/signaler{ pixel_y = 8 @@ -52419,8 +52550,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "wLh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -52480,23 +52615,32 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "xeP" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, -/turf/open/floor/plasteel/white, -/area/science/explab) -"xfD" = ( -/obj/machinery/power/apc{ - areastring = "/area/science/explab"; - dir = 4; - name = "Experimentation Lab APC"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) +"xfD" = ( +/obj/machinery/power/apc{ + areastring = "/area/science/genetics"; + dir = 4; + name = "Genetics Lab APC"; + pixel_x = 24 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "xfL" = ( /obj/structure/table/glass, /obj/item/reagent_containers/dropper, @@ -52531,6 +52675,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/hallway/secondary/service) +"xkP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xmh" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -52575,13 +52732,6 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "xEM" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = 30; - receive_ore_updates = 1 - }, /obj/structure/table, /obj/item/nanite_scanner, /turf/open/floor/plasteel/dark, @@ -52596,10 +52746,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xMT" = ( -/obj/effect/landmark/start/paramedic, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "xUg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -52613,13 +52759,9 @@ /turf/open/floor/plasteel, /area/security/prison) "xXe" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" - }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/closet/radiation, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "xYA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79036,7 +79178,7 @@ bkX bmo bnO bpb -akV +bqz bqq brS bsY @@ -88802,7 +88944,7 @@ blj bmK bog bog -qor +bhh bsx bsr bvh @@ -89841,7 +89983,7 @@ bAs bvj bCL bxO -xMT +bDR bDR bIk bJC @@ -91889,8 +92031,8 @@ bom bIq bri bsu -bsL -bsL +brc +brc bvo bzl bua @@ -92145,10 +92287,10 @@ bmY boq boq brj -bpE +tiO btk bum -bvp +vhn bzn bua bBL @@ -92399,13 +92541,13 @@ biB biB bkU bmX -bpE -bpE -bpE -bpE -bti +tiO +tiO +tiO +tiO +brb bul -bvp +vhn bzm bua bBK @@ -92655,16 +92797,16 @@ bhm bkb bhm bla -bmZ +qsH bpH -bra -bsK -bpE -bpE +bpH +bpH +tiO +tiO buq bvt bye -bon +ljx bBN bEi bEi @@ -92912,7 +93054,7 @@ bfL bfL bfL blg -bmZ +qsH bpG bqZ brk @@ -92921,7 +93063,7 @@ bsv bun bvr bzo -bon +ljx aFa bCY bEh @@ -93169,16 +93311,16 @@ biD bkd bfS cTO -bmZ +qsH bpJ brc -bsL -bug +bsN +brc btl but bvw -bzq -bon +brc +ljx bBP bCZ bEk @@ -93426,16 +93568,16 @@ biC bkc bfS blo -bmZ +qsH bpI brb -bsL -buf bvs -bur -bvp -bzp -bon +brb +bvs +gHL +vhn +bvs +ljx bBO bCY bEj @@ -93683,16 +93825,16 @@ biE bkf bfS cTO -bmZ +qsH bpL -bre +brc bsN -bre -bvv -bur -bvp -bzr -bon +brc +bsN +gHL +vhn +brb +ljx bBQ bDa bEl @@ -93940,16 +94082,16 @@ bfS bfS bfS cTO -bmZ +qsH bpK brd -bpK -bpK +bvu +brd bvu bux bvy -bon -bon +ljx +ljx bBN bBN bBN @@ -94197,15 +94339,15 @@ kQk ipA gbT cTO -bmZ -bon -bon -bon -bon -bon +qsH +ljx +ljx +ljx +ljx +ljx buG bvA -bon +ljx bAw bzg bLS @@ -101137,16 +101279,16 @@ bgc bgc bgc rKc -bqe +bon vGb brr -nbv -bqe -bqe -bqe -bqe -bqe -bqe +bpE +bpE +bpE +bpE +bpE +bon +bon byt bvK bvK @@ -101394,16 +101536,16 @@ biY bmd eRu bnr -bqe +bon pOJ jxy buu qrU kGS bzO -bzO -bzO -bqe +taM +bon +flN rYJ rYJ bFW @@ -101651,16 +101793,16 @@ bhG blO bmc bnq -bqe +bon uHA bru -bvO gHj -kGS -bzO +gHj +gHj +xeP bAR -bzO -bqe +bon +pBV fGF bEA bEA @@ -101908,16 +102050,16 @@ bky bqh bme bnx -bqe +bon mJM psy -bvO -nbv -bqe -bzO -bzO -bzO -bqe +bsH +bsL +bsL +rAv +eFD +bon +bEC uUy bED bFX @@ -102165,16 +102307,16 @@ bky btp ddf boF -bqe +bon brz -psy -bvO +brv +kxC ifv -kGS -bzO +ifv +xkP cYY bCl -bqe +bon bEC bEC bEC @@ -102194,7 +102336,7 @@ bGz bQZ oHU bZc -bTl +qbW kLM bTl bTl @@ -102422,16 +102564,16 @@ bky blP bns boF -bqe +bon tcY -psy -xeP -kxC -kGS -bzO +bvp +bsL +bsL +bsL +ink pSN -bzO -bqe +ddy +bon btp bEF bky @@ -102679,16 +102821,16 @@ bky blR bns boF -bqe -brv +bon +fqQ wJU -bvO -nbv bqe nXP -bzO -bzO bqe +npF +vPt +qrH +bon btp bEE bFY @@ -102936,16 +103078,16 @@ bky cyC bns boF -bqe -brv +bon +bur xfD jyF orP xXe -bzO -bzO -bzO -bqe +lFP +jyF +kXf +bon cMB vqI bhG @@ -103193,16 +103335,16 @@ aaf aaa bns boF -bqe +bon bry -bsH -bqe -bqe -bqe -bqe -bqe -bqe -bqe +bmZ +bon +bon +bon +bon +bon +bon +bon ddf bEG bEs diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 0c2d4b2dd0f..79a5110eb3e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -89504,88 +89504,82 @@ /area/maintenance/department/science) "djA" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "djB" = ( -/obj/item/storage/toolbox/mechanical, -/obj/item/flashlight, -/obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/science{ pixel_x = -32 }, -/obj/structure/rack, -/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/science/explab) -"djC" = ( -/obj/machinery/camera{ - c_tag = "Science - Experimentation Lab"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/bot, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/mob/living/carbon/monkey, +/obj/effect/turf_decal/stripes/end{ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/science/explab) -"djD" = ( -/obj/machinery/light{ +/area/science/genetics) +"djC" = ( +/obj/machinery/camera{ + CanAtmosPass = "science camera"; + c_tag = "Genetics Lab North"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/door/window/westleft{ + dir = 2; + name = "'Monkey Pen"; + req_access_txt = "9" + }, +/mob/living/carbon/monkey, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"djD" = ( /obj/structure/sign/warning/nosmoking{ pixel_y = 32 }, -/obj/effect/turf_decal/bot, -/obj/structure/closet/bombcloset/white, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/door/window/westright{ + dir = 2; + name = "Monkey Pen"; + req_access_txt = "9" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/mob/living/carbon/monkey, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "djE" = ( -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/structure/rack, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, +/obj/effect/turf_decal/stripes/end{ + dir = 4 }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "djF" = ( /turf/closed/wall/r_wall, /area/science/nanite) @@ -90520,60 +90514,42 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "dlo" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dlp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /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/science/explab) +/area/science/genetics) "dlr" = ( -/obj/structure/table/reinforced, -/obj/item/taperecorder, -/obj/item/folder/white, -/obj/effect/turf_decal/bot, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dlt" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/apc/auto_name/west, @@ -90948,62 +90924,26 @@ /turf/open/floor/plasteel, /area/maintenance/department/science) "dmB" = ( -/obj/machinery/light_switch{ - pixel_x = -26 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/suture, -/obj/item/stack/medical/mesh, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dmC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/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/science/explab) -"dmE" = ( -/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"dmE" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dmF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -91833,10 +91773,6 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "dos" = ( -/obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91854,6 +91790,10 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Genetics Lab"; + req_access_txt = "47, 9" + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "dot" = ( @@ -91866,76 +91806,44 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dou" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dov" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/chair/office/light, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/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{ +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dox" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91944,8 +91852,8 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -92858,107 +92766,48 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "dqj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/experimentor, -/obj/item/healthanalyzer, -/obj/machinery/light_switch{ - pixel_x = -26 - }, /obj/machinery/power/apc/auto_name/west, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable, -/obj/item/relic, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dqk" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/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/science/explab) +/area/science/genetics) "dql" = ( -/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/rdconsole/experiment{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/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/science/explab) +/area/science/genetics) "dqm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/button/door{ - id = "experimentor"; - name = "Experimentor Door Control"; - pixel_x = 24; - req_access_txt = "47" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/table/glass, +/obj/machinery/computer/med_data/laptop{ + dir = 8; + pixel_y = 1 }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dqn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93673,42 +93522,32 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "drI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drJ" = ( -/obj/machinery/door/firedoor/heavy, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drK" = ( -/obj/structure/sign/warning/securearea, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" - }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drM" = ( /obj/structure/table/reinforced, /obj/item/storage/box/disks_nanite{ @@ -94396,24 +94235,15 @@ /turf/closed/wall, /area/maintenance/department/science) "dte" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/explab) -"dtf" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dtg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -94608,17 +94438,17 @@ /area/maintenance/department/medical/central) "dtC" = ( /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "dtD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "dtE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Cloning Storage"; + req_access_txt = "9, 5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, @@ -94627,13 +94457,13 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/genetics/cloning) "dtF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "dtG" = ( /obj/machinery/power/apc{ areastring = "/area/medical/medbay/central"; @@ -95018,17 +94848,40 @@ /turf/open/floor/plasteel, /area/maintenance/port) "duw" = ( -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dux" = ( -/obj/effect/turf_decal/bot_white, -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "duy" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "duz" = ( /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/west, @@ -95333,98 +95186,75 @@ "dvi" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "dvj" = ( -/obj/structure/table/reinforced, /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/disks, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/bed, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dvk" = ( -/obj/machinery/computer/scan_consolenew, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /obj/machinery/light{ dir = 1 }, -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dvl" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dvm" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/firealarm{ - pixel_x = -26; - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) +"dvl" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"dvm" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/bed, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dvn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dvo" = ( -/obj/machinery/button/door{ - id = "geneticslab"; - name = "Genetics Lab Shutters"; - pixel_x = 26; - pixel_y = 26; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dvp" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/structure/bed, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dvq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95433,7 +95263,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "dvr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95879,19 +95709,46 @@ /turf/open/floor/plasteel, /area/maintenance/port) "dwd" = ( -/obj/machinery/camera{ - c_tag = "Science - Experimentor"; - dir = 1; - name = "science camera"; - network = list("ss13","rd") +/obj/structure/table/reinforced, +/obj/machinery/requests_console{ + department = "Medbay Storage"; + name = "Genetics Lab RC"; + pixel_y = -32 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dwe" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/reinforced, +/obj/item/storage/pill_bottle/mannitol, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dwg" = ( /obj/machinery/camera{ c_tag = "Science - Toxins Mixing Lab Fore"; @@ -96075,8 +95932,8 @@ "dwG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ - name = "Genetics Desk"; - req_access_txt = "9" + name = "Cloning Desk"; + req_access_txt = "9, 5" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -96175,119 +96032,45 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "dwN" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Medbay - Genetics Lab"; - dir = 4; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/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/medical/genetics) -"dwO" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) +"dwO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dwP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 + dir = 10 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dwQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dwR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"dwR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dwS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) +"dwT" = ( +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dwT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westright{ - name = "'Monkey Pen"; - req_access_txt = "9" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/genetics/cloning) "dwV" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -96935,149 +96718,92 @@ /area/medical/genetics) "dym" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Cloning Storage"; + req_access_txt = "9, 5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/genetics/cloning) "dyn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/structure/cable, /obj/structure/disposalpipe/segment{ 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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) -"dyo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) +"dyo" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dyp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, +/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dyq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/bed, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dyr" = ( -/obj/machinery/holopad, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ 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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dys" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dyt" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - name = "'Monkey Pen"; - req_access_txt = "9" - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dyv" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -97753,11 +97479,11 @@ }, /obj/machinery/door/window/westright{ dir = 4; - name = "Genetics Desk"; + name = "Cloning Desk"; req_access_txt = "9" }, /obj/machinery/door/window/westright{ - name = "Genetics Desk" + name = "Cloning Desk" }, /obj/item/folder/white, /obj/item/pen, @@ -97821,87 +97547,17 @@ name = "Genetics Lab Shutters" }, /turf/open/floor/plating, -/area/medical/genetics) -"dzT" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/item/radio/headset/headset_medsci, -/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/medical/genetics) -"dzU" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dzV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzW" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzX" = ( -/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, -/area/medical/genetics) +/area/medical/genetics/cloning) "dzY" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzZ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/genetics/cloning) "dAa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ @@ -98366,79 +98022,48 @@ "dAV" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/genetics/cloning) "dAW" = ( -/obj/structure/table/reinforced, -/obj/machinery/requests_console{ - department = "Medbay Storage"; - name = "Genetics Lab RC"; - pixel_y = -32 - }, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/structure/bed, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dAX" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/machinery/light, /obj/structure/sign/warning/nosmoking{ pixel_y = -32 }, -/obj/effect/turf_decal/stripes/end{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics/cloning) "dAY" = ( -/obj/machinery/dna_scannernew, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dAZ" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dBa" = ( -/obj/machinery/computer/med_data/laptop{ - dir = 1; - pixel_y = 4 - }, -/obj/structure/table/glass, /obj/structure/mirror{ - pixel_y = -28 + pixel_y = -33 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dBb" = ( /obj/machinery/newscaster{ pixel_y = -32 @@ -98446,12 +98071,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/genetics/cloning) "dBc" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -98459,7 +98084,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/genetics/cloning) "dBd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -98471,7 +98096,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "dBe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/poster/official/do_not_question{ @@ -100938,6 +100563,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/white, /area/science/research) "dFY" = ( @@ -114508,11 +114134,22 @@ /turf/open/floor/plating, /area/maintenance/port) "hFX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/radio/headset/headset_medsci, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/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/science/genetics) "hGT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -114833,12 +114470,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/mixing) -"jAD" = ( -/mob/living/simple_animal/pet/dog/pug{ - name = "Swanson" - }, -/turf/open/floor/engine, -/area/science/explab) "jDu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -115461,9 +115092,29 @@ /turf/open/floor/plating, /area/medical/medbay/central) "ncP" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/latex, +/obj/item/storage/box/disks, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = -32 + }, +/obj/machinery/camera{ + c_tag = "Genetics Lab"; + dir = 1; + name = "genetics lab camera" + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "npR" = ( /obj/structure/table, /obj/item/storage/secure/safe{ @@ -115624,9 +115275,13 @@ /turf/open/floor/plating, /area/maintenance/port) "oyx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "oHC" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -115897,6 +115552,19 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/science/research/abandoned) +"pXY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "qcx" = ( /obj/machinery/firealarm{ dir = 4; @@ -116050,12 +115718,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/nanite) -"qVd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/engine, -/area/science/explab) "qWg" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -116468,6 +116130,10 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"tHN" = ( +/obj/machinery/firealarm, +/turf/closed/wall/r_wall, +/area/medical/genetics/cloning) "tMk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -146059,7 +145725,7 @@ dmC dou dqk drJ -qVd +drK dux dwe djA @@ -146311,12 +145977,12 @@ cNd cNd cMY djD -dtf -dtf +dlp +drK dov dql drK -jAD +drK duy ncP djA @@ -146574,7 +146240,7 @@ dow dqm drL oyx -oyx +pXY hFX djA dzq @@ -158399,7 +158065,7 @@ dtC dvj dwN dyn -dzT +dsw dAW dCB dDN @@ -158656,7 +158322,7 @@ dtC dvk dwO dyo -dzU +dwS dAX dCB tGU @@ -158909,7 +158575,7 @@ dnn dpo drb dsv -dtC +tHN dvl dwP dyp @@ -159170,8 +158836,8 @@ dtD dvm dwQ dyq -dzW -dAZ +dwS +dAW dCB dDP dEX @@ -159427,7 +159093,7 @@ dtE dvn dwR dyr -dzX +dwS dBa dCB dDQ @@ -159940,8 +159606,8 @@ dsz dtC dvp dwT -dyt -dzZ +dvp +dwT dBc dCC dDR diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4c3dfbe2376..43fc77bc710 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -81,7 +81,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -259,7 +258,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -280,7 +278,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/limb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -367,12 +364,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -385,7 +380,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -418,7 +412,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/blood/old, @@ -435,7 +428,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -466,7 +458,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -486,12 +477,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel, @@ -505,7 +494,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -523,7 +511,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -561,12 +548,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -579,7 +564,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -613,7 +597,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -725,7 +708,6 @@ icon_state = "plant-16" }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/machinery/light{ @@ -762,7 +744,6 @@ /area/crew_quarters/heads/cmo) "abn" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 8 }, /obj/machinery/light{ @@ -975,7 +956,6 @@ /area/ai_monitored/turret_protected/ai) "abG" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 4 }, /obj/machinery/newscaster{ @@ -1077,7 +1057,6 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, @@ -1085,9 +1064,9 @@ /area/ai_monitored/turret_protected/ai) "abS" = ( /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/turret_protected/ai"; dir = 1; name = "AI Chamber APC"; - areastring = "/area/ai_monitored/turret_protected/ai"; pixel_y = 23 }, /obj/structure/cable, @@ -1114,7 +1093,6 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/circuit/green{ @@ -1123,7 +1101,6 @@ /area/ai_monitored/turret_protected/ai) "abW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/circuit/green{ @@ -1135,7 +1112,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/newscaster/security_unit{ @@ -1183,7 +1159,6 @@ "acc" = ( /obj/machinery/door/airlock/maintenance{ name = "security maintenance"; - req_access_txt = "0"; req_one_access_txt = "4;63" }, /turf/open/floor/plasteel/dark, @@ -1234,7 +1209,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -1247,7 +1221,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -1266,8 +1239,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -1296,7 +1268,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -1304,7 +1275,6 @@ /area/ai_monitored/turret_protected/ai) "ack" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -1314,7 +1284,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -1345,7 +1314,6 @@ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -1361,7 +1329,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -1371,7 +1338,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/noticeboard{ @@ -1381,8 +1347,7 @@ /obj/machinery/camera{ c_tag = "Detective's Office"; dir = 8; - name = "detective camera"; - network = list("ss13") + name = "detective camera" }, /turf/open/floor/wood, /area/security/detectives_office) @@ -1478,7 +1443,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "acy" = ( /obj/docking_port/stationary/random{ - dir = 1; id = "pod_lavaland3"; name = "lavaland" }, @@ -1534,8 +1498,7 @@ /obj/machinery/vending/cola/random, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/hallway/primary/port) @@ -1567,9 +1530,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "acF" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/light/small{ dir = 1 }, @@ -1710,7 +1671,6 @@ /area/maintenance/port/fore) "acR" = ( /obj/machinery/computer/monitor{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -1732,14 +1692,13 @@ /area/ai_monitored/storage/satellite) "acS" = ( /obj/machinery/computer/atmos_alert{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/turret_protected/aisat/atmos"; dir = 8; name = "MiniSat Atmospherics APC"; - areastring = "/area/ai_monitored/turret_protected/aisat/atmos"; pixel_x = -27 }, /obj/effect/turf_decal/tile/neutral, @@ -1786,7 +1745,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -1888,7 +1846,6 @@ id = "lawyer_shutters"; name = "Law Office Shutters Toggle"; pixel_x = 24; - pixel_y = 0; req_access_txt = "38" }, /turf/open/floor/plasteel/dark, @@ -2008,7 +1965,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/holopad, @@ -2032,7 +1988,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -2066,7 +2021,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, @@ -2091,7 +2045,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2140,7 +2093,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2175,7 +2127,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -2211,7 +2162,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light, @@ -2229,7 +2179,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc/highcap/five_k{ @@ -2244,10 +2193,7 @@ "adE" = ( /obj/machinery/turretid{ control_area = "/area/ai_monitored/turret_protected/aisat_interior"; - enabled = 1; - icon_state = "control_standby"; name = "Antechamber Turret Control"; - pixel_x = 0; pixel_y = 28; req_access_txt = "65" }, @@ -2261,7 +2207,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2275,7 +2220,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -2291,7 +2235,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/camera/motion{ @@ -2323,9 +2266,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -2358,7 +2299,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2373,7 +2313,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2389,7 +2328,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -2412,7 +2350,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -2612,7 +2549,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -2638,7 +2574,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -2651,7 +2586,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -2713,7 +2647,6 @@ /area/maintenance/starboard/fore) "aeq" = ( /obj/structure/transit_tube/station{ - icon_state = "closed_station0"; dir = 1 }, /obj/structure/window/reinforced, @@ -2787,7 +2720,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -2878,7 +2810,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -3058,7 +2989,6 @@ "afa" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/window/southleft{ - dir = 2; name = "Maximum Security Test Chamber"; req_access_txt = "55" }, @@ -3109,7 +3039,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3312,7 +3241,6 @@ /area/security/warden) "afu" = ( /obj/structure/transit_tube/station/reverse{ - icon_state = "closed_terminus0"; dir = 8 }, /obj/structure/window/reinforced{ @@ -3481,7 +3409,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -3499,8 +3426,7 @@ /obj/item/wirecutters, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light{ dir = 1 @@ -3542,13 +3468,11 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/camera{ c_tag = "AI Chamber SMES"; - dir = 2; name = "core camera"; network = list("aicore") }, @@ -3556,7 +3480,6 @@ /area/ai_monitored/turret_protected/ai) "afO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -3582,7 +3505,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -3661,8 +3583,7 @@ areastring = "/area/science/xenobiology"; dir = 4; name = "Xenobiology APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -3675,8 +3596,7 @@ /area/science/xenobiology) "afX" = ( /obj/machinery/door/airlock/external{ - name = "Science Escape Pod"; - req_access_txt = "0" + name = "Science Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -3710,7 +3630,6 @@ "agb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum/external{ - pixel_x = 0; pixel_y = 32 }, /obj/effect/landmark/event_spawn, @@ -3871,7 +3790,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -4044,7 +3962,6 @@ /area/maintenance/fore) "agD" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4141,7 +4058,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/sign/poster/contraband/random{ @@ -4181,7 +4097,6 @@ /area/science/xenobiology) "agN" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -4216,7 +4131,6 @@ /area/bridge) "agR" = ( /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -4340,7 +4254,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4580,7 +4493,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -4594,8 +4506,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, @@ -4635,7 +4546,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -4706,7 +4616,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -4844,9 +4753,9 @@ /area/maintenance/department/electrical) "ahQ" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/department/electrical"; dir = 1; name = "Electrical Maintenance APC"; - areastring = "/area/maintenance/department/electrical"; pixel_y = 23 }, /obj/effect/turf_decal/delivery, @@ -4877,7 +4786,6 @@ /area/hallway/primary/central) "ahT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -4982,9 +4890,8 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; - name = "Auxillary Base Construction APC"; areastring = "/area/construction/mining/aux_base"; + name = "Auxillary Base Construction APC"; pixel_y = -23 }, /obj/structure/cable, @@ -5126,7 +5033,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating{ @@ -5225,9 +5131,7 @@ /turf/open/floor/plasteel, /area/security/main) "aiz" = ( -/obj/machinery/computer/secure_data{ - dir = 2 - }, +/obj/machinery/computer/secure_data, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -5262,8 +5166,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5496,7 +5399,6 @@ /area/security/brig) "aiU" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5643,7 +5545,6 @@ /area/maintenance/port/aft) "aje" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -5723,7 +5624,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -5793,7 +5693,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -5857,7 +5756,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -5938,11 +5836,9 @@ /area/maintenance/department/electrical) "ajB" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -6037,7 +5933,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -6060,7 +5955,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -6077,7 +5971,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6186,7 +6079,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small{ @@ -6203,7 +6095,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/delivery, @@ -6216,24 +6107,20 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/light{ dir = 8 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "ajZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel, @@ -6266,7 +6153,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -6300,7 +6186,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6321,7 +6206,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6350,7 +6234,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6398,7 +6281,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6429,7 +6311,7 @@ /obj/structure/flora/junglebush/b, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "akr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -6438,7 +6320,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6453,7 +6334,6 @@ /area/engine/atmos) "akt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -6478,7 +6358,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6508,7 +6387,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6521,7 +6399,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6537,7 +6414,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -6557,7 +6433,6 @@ location = "Robotics" }, /obj/machinery/door/window/eastleft{ - dir = 4; name = "Robotics Delivery Access"; req_access_txt = "29" }, @@ -6602,7 +6477,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6640,7 +6514,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -6755,8 +6628,7 @@ /area/security/brig) "akR" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -6767,8 +6639,7 @@ /area/maintenance/fore) "akS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -6845,7 +6716,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -6864,7 +6734,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -6886,7 +6755,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -6897,7 +6765,6 @@ /area/maintenance/port/fore) "alc" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 1 }, /obj/structure/cable, @@ -7015,8 +6882,7 @@ /area/space/nearstation) "aln" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -7045,7 +6911,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -7062,7 +6927,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -7089,7 +6953,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7124,7 +6987,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -7145,7 +7007,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7198,7 +7059,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7279,7 +7139,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7296,7 +7155,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -7342,7 +7200,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -7367,11 +7224,9 @@ /area/maintenance/fore) "alH" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -7415,8 +7270,7 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) @@ -7443,7 +7297,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "47" + req_access_txt = "8" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, @@ -7458,29 +7312,31 @@ /area/crew_quarters/heads/hos) "alO" = ( /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science RC"; - pixel_x = 0; - pixel_y = 30; - receive_ore_updates = 1 - }, /obj/machinery/light{ dir = 1 }, -/obj/item/relic, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/flashlight/pen, +/obj/item/reagent_containers/syringe, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = 28 + }, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/rxglasses{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "alP" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/tile/neutral{ @@ -7560,7 +7416,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light_switch{ @@ -7575,7 +7430,6 @@ "alW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -7612,7 +7466,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -7646,8 +7499,7 @@ /obj/machinery/power/solar_control{ dir = 4; id = "aftport"; - name = "Port Quarter Solar Control"; - track = 0 + name = "Port Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/structure/sign/warning/vacuum/external{ @@ -7681,15 +7533,13 @@ areastring = "/area/maintenance/solars/port/fore"; dir = 4; name = "Port Bow Solar APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/machinery/camera{ c_tag = "Port Bow Solar"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -7710,8 +7560,7 @@ /area/maintenance/central) "amh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -7739,7 +7588,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/decal/cleanable/dirt, @@ -7846,7 +7694,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -7866,7 +7713,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -7884,7 +7730,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -7898,7 +7743,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/corner{ @@ -7914,7 +7758,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7958,7 +7801,6 @@ "amD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7971,7 +7813,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7985,7 +7826,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -8054,7 +7894,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/poster/contraband/random{ @@ -8151,7 +7990,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /mob/living/simple_animal/butterfly, @@ -8195,8 +8033,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/science/research) @@ -8296,37 +8133,23 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port) "and" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/disks{ - pixel_y = 5 - }, -/obj/item/radio/headset/headset_medsci, -/obj/structure/noticeboard{ - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "ane" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 8; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/cable, @@ -8340,7 +8163,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -8383,7 +8205,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -8413,7 +8234,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -8492,8 +8312,7 @@ /obj/machinery/flasher{ id = "PCell 1"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -8600,8 +8419,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light_switch{ pixel_x = 24; @@ -8679,14 +8497,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "anJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8740,8 +8565,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/showroomfloor, @@ -8778,7 +8602,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -8799,7 +8622,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -8816,7 +8638,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -8869,7 +8690,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -8889,7 +8709,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -8989,7 +8808,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9006,7 +8824,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9102,7 +8919,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -9152,7 +8968,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/firealarm{ @@ -9257,7 +9072,6 @@ }, /obj/machinery/camera{ c_tag = "Telecomms Server SMES"; - dir = 2; name = "telecomms camera"; network = list("ss13","tcomms") }, @@ -9355,7 +9169,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -9386,7 +9199,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9401,7 +9213,6 @@ icon_state = "plant-10" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/firealarm{ @@ -9420,7 +9231,6 @@ "aoT" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -9463,7 +9273,6 @@ }, /obj/item/reagent_containers/food/drinks/beer{ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; - icon_state = "beer"; list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30); name = "Kilo-Kocktail"; pixel_x = 5; @@ -9476,7 +9285,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9492,7 +9300,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9516,21 +9323,18 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/security/courtroom) "apb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -9553,7 +9357,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -9574,7 +9377,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -9587,7 +9389,6 @@ /area/science/xenobiology) "ape" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/wood, @@ -9604,7 +9405,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -9638,7 +9438,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -9682,7 +9481,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -9697,7 +9495,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -9780,7 +9577,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -9869,7 +9665,6 @@ "apz" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -10066,7 +9861,6 @@ "apQ" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -10088,7 +9882,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/loading_area, @@ -10106,7 +9899,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -10143,29 +9935,19 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/chair/office/light{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/radio/intercom{ pixel_x = -28; pixel_y = 22 }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "apX" = ( /turf/closed/wall/rust, /area/maintenance/central) @@ -10176,7 +9958,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10193,7 +9974,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -10212,7 +9992,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10225,14 +10004,12 @@ /area/maintenance/port/fore) "aqb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10262,7 +10039,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -10319,7 +10095,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/start/chaplain, @@ -10343,7 +10118,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/item/storage/briefcase, @@ -10386,8 +10160,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aqp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -10395,16 +10171,12 @@ /turf/open/floor/grass, /area/chapel/main) "aqq" = ( -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, -/obj/machinery/light{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/item/beacon, -/obj/machinery/rnd/bepis, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/flora/ausbushes/leafybush, +/turf/open/floor/grass, +/area/science/genetics) "aqr" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/grassybush, @@ -10412,7 +10184,6 @@ /obj/structure/flora/ausbushes/fernybush, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/grass, @@ -10493,7 +10264,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/door/airlock/engineering{ @@ -10517,7 +10287,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "47" + req_access_txt = "8" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -10528,7 +10298,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aqC" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -10575,7 +10345,6 @@ areastring = "/area/maintenance/solars/starboard/fore"; dir = 1; name = "Starboard Bow Solar APC"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/turf_decal/stripes/line{ @@ -10595,8 +10364,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "forestarboard"; - name = "Starboard Bow Solar Control"; - track = 0 + name = "Starboard Bow Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -10690,7 +10458,6 @@ /area/bridge) "aqN" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -10712,26 +10479,14 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqP" = ( -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/table, -/obj/machinery/power/apc{ - dir = 1; - name = "Genetics Lab APC"; - areastring = "/area/medical/genetics"; - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/corner, /obj/structure/cable, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "aqQ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -10793,7 +10548,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/roboticist, @@ -10811,7 +10565,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -10910,7 +10663,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -10937,8 +10689,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/lab) @@ -10964,14 +10715,12 @@ /area/bridge) "are" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -10991,7 +10740,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -11117,7 +10865,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/airalarm{ @@ -11228,7 +10975,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -11258,7 +11004,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -11280,7 +11025,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -11290,7 +11034,6 @@ /area/maintenance/starboard/fore) "arF" = ( /obj/machinery/computer/communications{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -11306,43 +11049,46 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "arG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/delivery, /obj/machinery/power/apc{ - areastring = "/area/science/explab"; + areastring = "/area/science/genetics"; dir = 1; - name = "Experimentation Lab APC"; + name = "Genetics Lab APC"; pixel_y = 26 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/vending/wardrobe/gene_wardrobe, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "arH" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/flip, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "arI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -11352,7 +11098,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11408,7 +11153,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/light_switch{ @@ -11454,9 +11198,7 @@ /area/bridge) "arQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -11476,7 +11218,6 @@ /area/chapel/main) "arR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/wood, @@ -11539,8 +11280,7 @@ dir = 4 }, /obj/item/storage/secure/safe{ - pixel_x = 34; - pixel_y = 0 + pixel_x = 34 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) @@ -11590,8 +11330,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -11680,7 +11419,6 @@ /area/security/courtroom) "asl" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11696,7 +11434,6 @@ /area/security/courtroom) "asm" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11713,7 +11450,6 @@ /area/security/courtroom) "asn" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -11740,7 +11476,6 @@ areastring = "/area/maintenance/port/fore"; dir = 1; name = "Port Bow Maintenance APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -11765,8 +11500,7 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -11800,34 +11534,24 @@ }, /area/maintenance/port/fore) "ass" = ( -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/chair/office/light{ - dir = 4 - }, /obj/machinery/newscaster{ pixel_x = 30; pixel_y = 32 }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "ast" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -11865,11 +11589,9 @@ dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -11879,7 +11601,6 @@ /area/medical/morgue) "asw" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11909,17 +11630,15 @@ dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/medical/morgue"; dir = 1; name = "Morgue APC"; - areastring = "/area/medical/morgue"; pixel_y = 24 }, /obj/structure/cable, @@ -11931,7 +11650,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -11966,8 +11684,7 @@ /obj/machinery/camera{ c_tag = "Autopsy Room"; dir = 1; - name = "detective camera"; - network = list("ss13") + name = "detective camera" }, /obj/machinery/status_display/ai{ pixel_x = 32; @@ -12003,14 +11720,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ - dir = 2; - lighting = 3; - name = "Chapel Office APC"; areastring = "/area/chapel/office"; + name = "Chapel Office APC"; pixel_y = -25 }, /obj/structure/cable, @@ -12027,7 +11741,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -12081,7 +11794,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12095,7 +11807,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12104,7 +11815,6 @@ /area/maintenance/fore) "asN" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 4 }, /obj/machinery/light{ @@ -12118,7 +11828,6 @@ /area/security/prison) "asP" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -12132,7 +11841,6 @@ /area/security/courtroom) "asQ" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -12157,16 +11865,15 @@ /area/maintenance/fore) "asS" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/fore"; dir = 1; name = "Fore Maintenance APC"; - areastring = "/area/maintenance/fore"; pixel_y = 23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12187,9 +11894,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -12199,7 +11904,6 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -12255,7 +11959,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12296,8 +11999,7 @@ /obj/machinery/flasher{ id = "hopflash"; name = "Crowd Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) @@ -12306,7 +12008,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/grille/broken, @@ -12376,8 +12077,7 @@ /area/bridge) "atk" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/port/aft) @@ -12392,8 +12092,7 @@ /area/maintenance/starboard/fore) "atm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -12412,17 +12111,18 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar/atrium) "atp" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "atq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -12474,15 +12174,13 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "att" = ( -/obj/machinery/computer/rdservercontrol{ - dir = 2 - }, +/obj/machinery/computer/rdservercontrol, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ + areastring = "/area/science/server"; dir = 1; name = "Research Division Server Room APC"; - areastring = "/area/science/server"; pixel_y = 25 }, /obj/effect/turf_decal/stripes/corner, @@ -12505,7 +12203,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/cobweb, @@ -12516,7 +12213,6 @@ /area/maintenance/starboard) "atw" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 1 }, /obj/structure/extinguisher_cabinet{ @@ -12537,12 +12233,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/maintenance/starboard"; - dir = 2; name = "Starboard Maintenance APC"; pixel_y = -23 }, @@ -12558,7 +12252,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -12600,7 +12293,6 @@ "atD" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12754,7 +12446,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "atN" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/disposalpipe/segment{ @@ -12762,7 +12454,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "atO" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -12791,7 +12483,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "atR" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/fernybush, @@ -12800,25 +12492,12 @@ dir = 10 }, /obj/structure/cable, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "atS" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "atT" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -12834,11 +12513,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/landmark/blobstart, @@ -12847,21 +12524,27 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "atV" = ( -/obj/machinery/atmospherics/components/binary/pump{ - desc = "A pump that moves gas by pressure. Shower not included."; - dir = 8; - name = "Gas to Chamber" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "atW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -12874,11 +12557,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/structure/cable, @@ -12895,7 +12576,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/engine, @@ -12946,14 +12626,17 @@ }, /area/tcommsat/server) "aub" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /obj/effect/turf_decal/tile/purple{ - dir = 8 + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "auc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -12961,7 +12644,6 @@ "aud" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/poster/contraband/random{ @@ -12981,7 +12663,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -12993,7 +12674,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/engine, @@ -13004,7 +12684,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -13024,9 +12703,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, @@ -13040,7 +12717,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -13066,7 +12742,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -13083,7 +12758,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -13108,9 +12782,9 @@ "auo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/power/apc{ + areastring = "/area/maintenance/central"; dir = 4; name = "Central Maintenance APC"; - areastring = "/area/maintenance/central"; pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, @@ -13151,7 +12825,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/light/small{ @@ -13171,7 +12844,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -13244,19 +12916,14 @@ /turf/closed/wall/rust, /area/maintenance/starboard) "auA" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "auB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -13294,16 +12961,10 @@ /turf/closed/wall/rust, /area/crew_quarters/heads/cmo) "auG" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -13312,8 +12973,10 @@ sortType = 13 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "auH" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -13336,12 +12999,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "auK" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -13352,7 +13022,6 @@ "auL" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -13374,7 +13043,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -13387,7 +13055,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light_switch{ @@ -13458,7 +13125,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/item/twohanded/required/kirbyplants, @@ -13513,7 +13179,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -13571,7 +13236,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -13586,7 +13250,6 @@ /area/security/courtroom) "avd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/effect/decal/cleanable/blood/old, @@ -13635,7 +13298,6 @@ /area/crew_quarters/heads/captain) "avh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -13647,7 +13309,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -13660,7 +13321,6 @@ /area/maintenance/port/fore) "avj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/item/tank/internals/oxygen/empty, @@ -13722,7 +13382,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -13816,7 +13475,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/light/small{ @@ -13831,12 +13489,10 @@ }, /area/maintenance/port/fore) "avx" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -13844,7 +13500,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "avy" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -13866,13 +13522,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/window/westleft{ - dir = 8; name = "Monkey Pen"; - pixel_y = 0; req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ @@ -13881,38 +13534,33 @@ /obj/effect/turf_decal/delivery, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "avC" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, -/obj/effect/landmark/start/geneticist, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "avD" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -13965,18 +13613,8 @@ /turf/open/floor/plasteel/dark, /area/teleporter) "avG" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -13984,7 +13622,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "avH" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -14005,22 +13643,19 @@ /turf/open/floor/plating, /area/medical/medbay/central) "avI" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /obj/effect/landmark/event_spawn, -/obj/effect/landmark/start/geneticist, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "avJ" = ( /obj/machinery/door/firedoor, /obj/machinery/light/small{ @@ -14046,22 +13681,18 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "avL" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "avM" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -14069,7 +13700,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/computer/secure_data{ - icon_state = "computer"; dir = 4 }, /obj/machinery/newscaster/security_unit{ @@ -14084,7 +13714,6 @@ "avN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/structure/sign/warning/xeno_mining{ @@ -14159,7 +13788,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -14175,14 +13803,12 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, /area/bridge) "avS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -14203,11 +13829,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14244,7 +13868,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14269,7 +13892,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14292,7 +13914,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -14312,11 +13933,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14346,7 +13965,6 @@ "awb" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -14360,7 +13978,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -14405,14 +14022,12 @@ /area/maintenance/starboard/fore) "awg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -14436,7 +14051,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -14466,7 +14080,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14484,7 +14097,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14516,7 +14128,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14553,7 +14164,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -14565,14 +14175,16 @@ /area/maintenance/starboard/fore) "aws" = ( /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "awt" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall/r_wall, @@ -14634,7 +14246,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/sign/departments/security{ @@ -14665,8 +14276,7 @@ pixel_y = 6 }, /obj/item/cartridge/engineering{ - pixel_x = 8; - pixel_y = 0 + pixel_x = 8 }, /obj/item/cartridge/atmos{ pixel_x = -6; @@ -14706,7 +14316,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -14748,7 +14357,6 @@ /area/crew_quarters/fitness/recreation) "awE" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -14773,7 +14381,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/table, @@ -14797,7 +14404,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -14819,8 +14425,7 @@ id = "bankshutter"; name = "Bank Shutter Toggle"; pixel_x = 24; - pixel_y = -8; - req_access_txt = "0" + pixel_y = -8 }, /obj/item/paper_bin{ pixel_x = -4; @@ -14854,7 +14459,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -14914,7 +14518,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -14968,7 +14571,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "awZ" = ( /turf/closed/wall/rust, /area/security/checkpoint/engineering) @@ -14998,7 +14601,6 @@ dir = 1 }, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 4 }, /obj/structure/cable, @@ -15082,7 +14684,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/holopad, @@ -15093,9 +14694,9 @@ "axj" = ( /obj/structure/table, /obj/machinery/power/apc{ + areastring = "/area/security/nuke_storage"; dir = 1; name = "Vault APC"; - areastring = "/area/security/nuke_storage"; pixel_y = 25 }, /obj/item/folder/blue{ @@ -15206,7 +14807,6 @@ /area/maintenance/starboard/fore) "axs" = ( /obj/machinery/computer/rdconsole/production{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -15266,7 +14866,6 @@ dir = 1 }, /obj/machinery/computer/prisoner/management{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -15318,9 +14917,9 @@ dir = 1 }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/tcommsat/server"; dir = 4; name = "Telecomms Server Room APC"; - areastring = "/area/tcommsat/server"; pixel_x = 25 }, /obj/structure/cable, @@ -15429,16 +15028,15 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/science/robotics/lab"; dir = 1; name = "Robotics Lab APC"; - areastring = "/area/science/robotics/lab"; pixel_y = 25 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "axL" = ( -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -15448,8 +15046,11 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "axM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -15600,7 +15201,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -15614,7 +15214,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sink/kitchen{ @@ -15753,7 +15352,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -15768,7 +15366,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -15807,7 +15404,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -15829,8 +15425,13 @@ pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "ayv" = ( /obj/effect/turf_decal/box, /turf/open/floor/engine, @@ -15840,7 +15441,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "ayx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -15895,7 +15496,6 @@ id = "medbay_front_door"; name = "Medbay Doors Toggle"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; req_access_txt = "5" }, @@ -16002,7 +15602,6 @@ /obj/machinery/button/door{ id = "engsm"; name = "Radiation Shutters Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "10" }, @@ -16036,7 +15635,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -16060,17 +15658,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 4; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 40 }, /obj/structure/sign/directions/supply{ @@ -16104,8 +15699,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -16134,30 +15728,28 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "ayT" = ( -/obj/machinery/computer/rdconsole/experiment{ - icon_state = "computer"; +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "ayU" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -16177,7 +15769,6 @@ }, /obj/machinery/camera{ c_tag = "Starboard Hallway Research Desk"; - dir = 2; name = "starboard camera" }, /turf/open/floor/plasteel/dark, @@ -16240,7 +15831,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -16267,7 +15857,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/departments/evac{ @@ -16314,12 +15903,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/medical/glass{ - name = "Genetics"; + name = "Cloning Storage"; req_access_txt = "5; 9; 68" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "azg" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -16366,9 +15955,9 @@ dir = 1 }, /obj/machinery/power/apc{ + areastring = "/area/chapel/main"; dir = 8; name = "Chapel APC"; - areastring = "/area/chapel/main"; pixel_x = -25 }, /obj/structure/cable, @@ -16462,7 +16051,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/assistant, @@ -16472,25 +16060,18 @@ }, /area/chapel/main) "azt" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, -/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "azu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -16499,7 +16080,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -16597,7 +16177,6 @@ "azG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -16668,20 +16247,20 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "azL" = ( -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "azM" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -16695,12 +16274,10 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/box, @@ -16818,7 +16395,6 @@ areastring = "/area/crew_quarters/heads/cmo"; dir = 1; name = "CMO's Office APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -16898,7 +16474,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "5" }, /obj/structure/disposalpipe/segment, @@ -16916,8 +16491,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -16968,7 +16542,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ @@ -17048,7 +16621,6 @@ areastring = "/area/science/robotics/mechbay"; dir = 1; name = "Mech Bay APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -17095,13 +16667,13 @@ "aAp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aAq" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -17183,7 +16755,6 @@ /area/engine/atmos) "aAu" = ( /obj/machinery/modular_computer/console/preset/engineering{ - icon_state = "console"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -17371,7 +16942,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -17385,7 +16955,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -17460,14 +17029,13 @@ }, /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/power/apc/unlocked{ + areastring = "/area/medical/genetics/cloning"; dir = 4; name = "Cloning Lab APC"; - areastring = "/area/medical/genetics/cloning"; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Cloning Lab"; - dir = 2; name = "medical camera"; network = list("ss13","medical") }, @@ -17490,7 +17058,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/closed/wall/r_wall, @@ -17501,25 +17068,21 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, /area/engine/engineering) "aAS" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aAT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -17558,7 +17121,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Apiary"; - req_access_txt = "0"; req_one_access_txt = "22;35" }, /turf/open/floor/plasteel/dark, @@ -17628,19 +17190,15 @@ /area/science/robotics/lab) "aBf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/reflector/box/anchored{ - icon_state = "reflector_map"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -17665,27 +17223,9 @@ /turf/open/floor/plasteel, /area/gateway) "aBi" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aBj" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -17703,7 +17243,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -17733,7 +17272,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/start/station_engineer, @@ -17797,7 +17335,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -17807,7 +17344,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/tile/red, @@ -17901,7 +17437,6 @@ /area/science/robotics/mechbay) "aBx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17918,11 +17453,9 @@ dir = 4 }, /obj/structure/reflector/double/anchored{ - icon_state = "reflector_map"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17955,7 +17488,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17975,7 +17507,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -17997,7 +17528,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/extinguisher_cabinet{ @@ -18016,7 +17546,6 @@ "aBH" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -18038,7 +17567,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18096,7 +17624,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research/glass{ @@ -18122,7 +17649,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18218,7 +17744,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18260,7 +17785,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18305,7 +17829,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -18355,7 +17878,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -18365,11 +17887,9 @@ /area/maintenance/starboard) "aCj" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /turf/closed/wall/r_wall, @@ -18405,8 +17925,7 @@ /area/engine/engineering) "aCn" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -18496,7 +18015,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/landmark/event_spawn, @@ -18621,7 +18139,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -18675,7 +18192,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -18690,7 +18206,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -18710,7 +18225,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -18726,7 +18240,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18788,7 +18301,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -18825,7 +18337,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/cable, @@ -18833,8 +18344,7 @@ /area/gateway) "aCS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -18858,7 +18368,6 @@ /area/engine/atmos) "aCU" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -18889,7 +18398,6 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics Scrubbers"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -19011,7 +18519,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/button/door{ - dir = 2; id = "justiceblast"; layer = 4; name = "Justice Vent Toggle"; @@ -19044,7 +18551,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/cook, @@ -19129,7 +18635,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -19176,8 +18681,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -19248,7 +18752,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - icon_state = "pipe11-2"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -19270,9 +18773,6 @@ initial_gas_mix = "n2=1000;TEMP=293.15" }, /area/engine/atmos) -"aDB" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics) "aDC" = ( /turf/open/floor/engine/o2{ initial_gas_mix = "o2=1000;TEMP=293.15" @@ -19289,7 +18789,6 @@ "aDE" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Air"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -19323,7 +18822,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -19340,7 +18838,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment, @@ -19487,15 +18984,13 @@ /obj/item/clothing/neck/stethoscope, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/power/apc{ areastring = "/area/medical/cryo"; dir = 4; name = "Cryogenics APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -19727,8 +19222,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -19765,7 +19259,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19836,9 +19329,9 @@ dir = 1 }, /obj/machinery/power/apc{ + areastring = "/area/science/mixing"; dir = 4; name = "Toxins Lab APC"; - areastring = "/area/science/mixing"; pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19889,8 +19382,7 @@ /area/maintenance/starboard/aft) "aEL" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -19942,8 +19434,7 @@ /area/science/robotics/lab) "aEQ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19996,7 +19487,6 @@ /area/maintenance/port/fore) "aEU" = ( /obj/machinery/atmospherics/components/trinary/filter{ - icon_state = "filter_off"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -20111,7 +19601,7 @@ pixel_x = -23 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aFc" = ( /turf/open/floor/engine/co2{ initial_gas_mix = "co2=1000;TEMP=293.15" @@ -20313,12 +19803,19 @@ /area/medical/cryo) "aFs" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/science/genetics) "aFt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20386,7 +19883,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -20545,9 +20041,8 @@ /obj/machinery/recharge_station, /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ - dir = 2; - name = "MiniSat Maint APC"; areastring = "/area/ai_monitored/storage/satellite"; + name = "MiniSat Maint APC"; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral{ @@ -20571,7 +20066,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -20609,7 +20103,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -20631,7 +20124,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/incinerator{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -20646,7 +20138,6 @@ /area/maintenance/disposal/incinerator) "aFV" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37" }, /obj/structure/disposalpipe/segment, @@ -20676,7 +20167,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -20716,7 +20206,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -20744,8 +20233,7 @@ /area/maintenance/disposal/incinerator) "aGd" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -20755,8 +20243,7 @@ /area/maintenance/port) "aGe" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -20773,7 +20260,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/camera{ c_tag = "Atmospherics Lockers"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -20834,7 +20320,6 @@ "aGk" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -20872,7 +20357,6 @@ dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -20979,7 +20463,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ - icon_state = "connector_map-1"; dir = 1 }, /obj/machinery/light, @@ -21027,8 +20510,6 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -21108,7 +20589,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/trinary/filter/atmos{ - icon_state = "filter_on"; dir = 8 }, /turf/open/floor/plasteel, @@ -21146,7 +20626,6 @@ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21156,7 +20635,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -21199,7 +20677,6 @@ }, /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/cook, @@ -21214,7 +20691,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -21282,7 +20758,6 @@ dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21293,7 +20768,6 @@ }, /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -21321,7 +20795,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -21491,7 +20964,6 @@ pixel_y = 22 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21530,7 +21002,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/carbon_tank{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -21538,7 +21009,6 @@ "aHt" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -21589,9 +21059,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aHw" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -21610,7 +21078,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall, @@ -21682,7 +21149,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -21793,7 +21259,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/closed/wall/rust, @@ -21826,7 +21291,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -21870,7 +21334,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -21881,7 +21344,6 @@ dir = 5 }, /obj/structure/transit_tube/station/reverse/flipped{ - icon_state = "closed_terminus1"; dir = 4 }, /obj/structure/window/reinforced{ @@ -21944,7 +21406,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -22005,7 +21466,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -22049,14 +21509,12 @@ /area/hallway/primary/fore) "aId" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -22064,7 +21522,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /obj/structure/cable, @@ -22100,7 +21557,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -22110,7 +21566,6 @@ /area/medical/medbay/central) "aIg" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -22129,7 +21584,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -22144,7 +21598,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -22152,11 +21605,9 @@ /area/engine/break_room) "aIj" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /turf/closed/wall/r_wall, @@ -22252,7 +21703,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/landmark/start/station_engineer, @@ -22268,7 +21718,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -22292,7 +21741,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/item/beacon, @@ -22362,9 +21810,8 @@ pixel_x = -24 }, /obj/machinery/power/apc{ - dir = 2; - name = "Telecomms Monitoring APC"; areastring = "/area/tcommsat/computer"; + name = "Telecomms Monitoring APC"; pixel_y = -24 }, /obj/effect/turf_decal/tile/neutral, @@ -22396,14 +21843,12 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -22517,7 +21962,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall, @@ -22608,9 +22052,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light{ dir = 8 @@ -22686,7 +22128,6 @@ dir = 4 }, /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; @@ -22772,7 +22213,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/space_heater, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "External Waste Ports to Filter" }, /turf/open/floor/plasteel/dark, @@ -22792,7 +22232,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -22802,7 +22241,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/closed/wall/r_wall, @@ -22855,7 +22293,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall/rust, @@ -22921,7 +22358,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Unfiltered & Air to Mix" }, /turf/open/floor/plasteel, @@ -22976,7 +22412,6 @@ /area/engine/atmos) "aJz" = ( /obj/machinery/computer/atmos_control/tank/mix_tank{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -23020,7 +22455,6 @@ }, /obj/structure/sign/departments/science{ name = "ROBOTICS"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel, @@ -23089,7 +22523,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/closed/wall, @@ -23154,7 +22587,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -23493,7 +22925,6 @@ /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -23527,8 +22958,7 @@ /area/engine/atmos) "aKn" = ( /obj/machinery/door/airlock/external{ - name = "Cargo Escape Pod"; - req_access_txt = "0" + name = "Cargo Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -23592,7 +23022,6 @@ icon_state = "plant-03" }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ @@ -23622,8 +23051,7 @@ /area/maintenance/starboard) "aKs" = ( /obj/machinery/computer/security/telescreen/turbine{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -23715,7 +23143,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -23736,7 +23163,6 @@ /area/quartermaster/office) "aKB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/closed/wall, @@ -23944,7 +23370,6 @@ /area/hallway/primary/fore) "aKS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -23984,11 +23409,8 @@ /area/hallway/primary/fore) "aKV" = ( /obj/structure/flora/junglebush/c, -/mob/living/carbon/monkey{ - name = "curious george" - }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aKW" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -24028,7 +23450,6 @@ "aKZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -24127,7 +23548,6 @@ broadcasting = 1; frequency = 1447; name = "Private AI Channel"; - pixel_x = 0; pixel_y = -28 }, /obj/machinery/light, @@ -24208,7 +23628,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/button/door{ @@ -24428,9 +23847,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/airalarm{ dir = 8; @@ -24496,17 +23913,22 @@ /turf/closed/wall/r_wall/rust, /area/engine/engineering) "aLO" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" - }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "aLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -24589,7 +24011,6 @@ dir = 6 }, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/window/reinforced{ @@ -24687,13 +24108,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aMd" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aMe" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -24704,7 +24123,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -24816,11 +24234,9 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -24894,7 +24310,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -24915,7 +24330,6 @@ }, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -24935,7 +24349,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -24955,7 +24368,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -25007,7 +24419,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/holopad, @@ -25074,7 +24485,6 @@ "aME" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 1 }, /obj/machinery/door/airlock/medical{ @@ -25294,7 +24704,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - icon_state = "manifold-2"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -25354,7 +24763,6 @@ dir = 10 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -25439,11 +24847,9 @@ /area/maintenance/disposal/incinerator) "aNf" = ( /obj/structure/reflector/single/anchored{ - icon_state = "reflector_map"; dir = 5 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -25453,7 +24859,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/closed/wall/r_wall, @@ -25531,11 +24936,6 @@ }, /area/maintenance/port/fore) "aNl" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/stack/packageWrap, -/obj/item/stack/sheet/glass/fifty, -/obj/item/hand_labeler, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -25545,11 +24945,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aNm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -25619,7 +25018,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/navbeacon{ @@ -25645,7 +25043,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -25664,7 +25061,7 @@ /area/hallway/primary/fore) "aNt" = ( /turf/closed/wall/r_wall/rust, -/area/medical/genetics) +/area/medical/genetics/cloning) "aNu" = ( /turf/closed/wall, /area/medical/morgue) @@ -25694,10 +25091,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/genetics) "aNy" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -25730,22 +25123,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/rack, /obj/effect/turf_decal/bot, -/obj/item/taperecorder{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/aicard, -/obj/item/paicard{ - pixel_x = 6 - }, -/obj/item/radio/intercom{ - pixel_y = 22 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "aNB" = ( @@ -25772,7 +25154,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/sorting/mail{ @@ -25801,9 +25182,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNG" = ( -/turf/closed/wall, -/area/medical/genetics) "aNH" = ( /turf/closed/wall/r_wall, /area/medical/genetics/cloning) @@ -25831,27 +25209,13 @@ /turf/open/floor/plasteel/dark, /area/medical/genetics/cloning) "aNJ" = ( -/obj/structure/table, -/obj/item/storage/box/monkeycubes{ - pixel_y = 3 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = 5 - }, -/obj/item/reagent_containers/syringe, -/obj/item/flashlight/pen, -/obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 0; - name = "Genetics Requests Console"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/genetics/cloning) "aNK" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -25867,7 +25231,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -25877,24 +25240,22 @@ /turf/closed/wall, /area/medical/genetics/cloning) "aNM" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aNN" = ( /turf/closed/wall/r_wall/rust, /area/medical/morgue) @@ -25915,22 +25276,13 @@ /turf/open/floor/plasteel/dark, /area/medical/cryo) "aNS" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 4 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -3 - }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aNT" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -25970,7 +25322,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aNV" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -25979,27 +25330,16 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/toy/figure/geneticist{ - pixel_x = 8; - pixel_y = 6 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aNW" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -26012,7 +25352,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment, @@ -26032,7 +25371,6 @@ icon_state = "plant-10" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -26043,7 +25381,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor/heavy, @@ -26060,11 +25397,11 @@ "aOa" = ( /obj/structure/flora/junglebush/b, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOb" = ( /obj/structure/flora/junglebush/large, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOc" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, @@ -26073,7 +25410,7 @@ dir = 9 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -26112,7 +25449,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -26157,7 +25493,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26187,21 +25522,22 @@ /turf/open/space/basic, /area/hallway/secondary/command) "aOl" = ( -/obj/machinery/computer/scan_consolenew{ +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera{ - c_tag = "Genetics"; - name = "medical camera"; - network = list("ss13","medical") +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/genetics/cloning) "aOm" = ( /obj/item/toy/beach_ball{ pixel_y = 6 @@ -26210,7 +25546,7 @@ dir = 4 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOn" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -26219,7 +25555,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -26242,7 +25577,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26269,9 +25603,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOr" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -26286,7 +25619,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -26306,7 +25638,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -26345,7 +25676,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26356,7 +25686,6 @@ "aOw" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/purple, @@ -26371,10 +25700,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing) "aOx" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/bot, /obj/machinery/light{ dir = 4 }, @@ -26385,14 +25710,21 @@ /obj/structure/mirror{ pixel_x = 26 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/genetics/cloning) "aOy" = ( /obj/machinery/door/airlock/maintenance{ name = "bar maintenance"; @@ -26455,7 +25787,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -26474,13 +25805,11 @@ "aOC" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/lavendergrass, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOD" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -26498,7 +25827,7 @@ pixel_y = 5 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/genetics/cloning) "aOF" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/caution/stand_clear, @@ -26510,7 +25839,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -26588,9 +25916,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/medical/genetics/cloning) -"aOL" = ( -/turf/closed/wall/rust, -/area/medical/genetics) "aOM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -26741,7 +26066,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable, @@ -26753,7 +26077,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -26801,7 +26124,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -26812,7 +26134,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -26879,17 +26200,22 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/genetics/cloning) "aPe" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/genetics/cloning) "aPf" = ( /turf/closed/wall/rust, /area/medical/virology) @@ -26957,7 +26283,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -26981,7 +26306,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -26990,7 +26314,6 @@ "aPm" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/caution/stand_clear, @@ -27052,7 +26375,6 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral, @@ -27091,21 +26413,19 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/cryo) "aPu" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/delivery, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/genetics/cloning) "aPv" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -27137,7 +26457,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27168,7 +26487,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27212,7 +26530,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27294,7 +26611,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/plaque{ @@ -27328,7 +26644,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/public/glass{ @@ -27437,7 +26752,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -27489,7 +26803,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27550,7 +26863,6 @@ /area/crew_quarters/heads/cmo) "aPW" = ( /obj/machinery/microwave{ - pixel_x = 0; pixel_y = 5 }, /obj/structure/table/glass, @@ -27569,7 +26881,6 @@ /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ - dir = 1; name = "Cloning Delivery Access"; req_access_txt = "50" }, @@ -27604,7 +26915,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27627,9 +26937,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) @@ -27665,7 +26973,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -27692,7 +26999,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27713,7 +27019,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -27740,7 +27045,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner, @@ -27761,7 +27065,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -27771,7 +27074,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -27919,7 +27221,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -28024,7 +27325,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/showroomfloor, @@ -28108,7 +27408,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -28139,7 +27438,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -28163,7 +27461,6 @@ /area/security/checkpoint/medical) "aQR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/tile/blue{ @@ -28287,7 +27584,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/reagent_dispensers/peppertank{ @@ -28304,7 +27600,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -28365,7 +27660,6 @@ /area/crew_quarters/bar/atrium) "aRi" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 5 }, /obj/structure/cable, @@ -28416,7 +27710,6 @@ }, /obj/structure/sign/directions/security{ dir = 8; - icon_state = "direction_sec"; pixel_y = 32 }, /obj/structure/sign/directions/medical{ @@ -28486,7 +27779,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/power/apc{ areastring = "/area/science/research"; - dir = 2; name = "Research Division APC"; pixel_y = -26 }, @@ -28504,7 +27796,6 @@ /area/science/research) "aRq" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -28541,7 +27832,6 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Centre"; - dir = 2; name = "fore camera" }, /obj/structure/disposalpipe/segment{ @@ -28619,7 +27909,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -28639,12 +27928,10 @@ }, /obj/structure/sign/directions/science{ dir = 4; - pixel_x = 0; pixel_y = 40 }, /obj/structure/sign/directions/supply{ dir = 4; - icon_state = "direction_supply"; pixel_y = 32 }, /obj/structure/sign/directions/engineering{ @@ -28919,8 +28206,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/camera{ c_tag = "Medbay Lobby"; @@ -28990,7 +28276,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -29035,7 +28320,6 @@ /area/hallway/primary/port) "aSc" = ( /obj/machinery/computer/crew{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -29052,7 +28336,6 @@ /area/medical/medbay/central) "aSd" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -29161,7 +28444,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -29336,8 +28618,7 @@ /area/medical/medbay/central) "aSv" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -29429,9 +28710,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/vending/autodrobe, /obj/machinery/power/apc{ + areastring = "/area/crew_quarters/theatre"; dir = 1; name = "Theatre APC"; - areastring = "/area/crew_quarters/theatre"; pixel_y = 25 }, /obj/effect/turf_decal/tile/neutral, @@ -29450,7 +28731,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -29495,7 +28775,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -29514,7 +28793,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/security_officer, @@ -29656,8 +28934,7 @@ /area/medical/medbay/central) "aSS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -29688,7 +28965,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -29702,7 +28978,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -29785,7 +29060,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -29827,7 +29101,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -29858,9 +29131,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /obj/machinery/power/apc{ - dir = 2; - name = "Medbay Storage APC"; areastring = "/area/medical/storage"; + name = "Medbay Storage APC"; pixel_y = -24 }, /obj/machinery/light, @@ -29925,9 +29197,6 @@ /turf/open/floor/plasteel, /area/bridge) "aTn" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -29939,8 +29208,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aTo" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -29954,7 +29226,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -29974,7 +29245,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -29985,20 +29255,13 @@ /turf/open/floor/plasteel/dark, /area/medical/storage) "aTr" = ( -/obj/structure/table, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stock_parts/cell/high, -/obj/effect/turf_decal/stripes/corner, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aTs" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -30009,7 +29272,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -30028,7 +29290,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -30109,7 +29370,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/power/apc{ areastring = "/area/medical/medbay/central"; - dir = 2; name = "Medbay Central APC"; pixel_y = -24 }, @@ -30127,7 +29387,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -30169,7 +29428,6 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -30183,21 +29441,16 @@ }, /obj/machinery/camera{ c_tag = "Virology Airlock"; - dir = 2; name = "medical camera"; network = list("ss13","medical") }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/medical/virology) "aTE" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -30206,12 +29459,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aTF" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -30239,7 +29493,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30297,9 +29550,7 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/southleft{ - base_state = "left"; dir = 8; - icon_state = "left"; name = "Bar Delivery Access"; req_access_txt = "25" }, @@ -30474,7 +29725,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -30551,7 +29801,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -30599,7 +29848,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -30683,8 +29931,7 @@ pixel_x = 24 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/lab) @@ -30720,7 +29967,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30745,7 +29991,6 @@ pixel_y = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/mime, @@ -30774,7 +30019,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -30818,7 +30062,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical{ @@ -30984,7 +30227,6 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -31085,7 +30327,6 @@ /obj/machinery/gibber, /obj/machinery/camera{ c_tag = "Kitchen Cold Room"; - dir = 2; name = "diner camera" }, /obj/machinery/airalarm{ @@ -31115,7 +30356,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -31324,7 +30564,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/blood/old, @@ -31344,7 +30583,6 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -31378,14 +30616,12 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "9" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -31418,7 +30654,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/landmark/start/virologist, @@ -31443,8 +30678,6 @@ "aVn" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; - req_access_txt = "0"; req_one_access_txt = "5;6;22" }, /obj/structure/disposalpipe/segment{ @@ -31515,8 +30748,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/chapel/main) @@ -31529,8 +30761,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plasteel/dark, /area/medical/surgery) @@ -31539,7 +30770,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -31554,7 +30784,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -31596,7 +30825,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/showroomfloor, @@ -31677,10 +30905,8 @@ }, /obj/machinery/computer/security/telescreen{ desc = "Used for monitoring medbay to ensure patient safety."; - dir = 2; name = "Medbay Monitor"; - network = list("medical"); - pixel_y = 0 + network = list("medical") }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/medical) @@ -31844,7 +31070,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/window/eastleft{ @@ -31992,14 +31217,12 @@ /area/medical/morgue) "aWa" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -32068,29 +31291,24 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "aWf" = ( -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/genetics/cloning) "aWg" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -32182,7 +31400,7 @@ pixel_y = 32 }, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/genetics/cloning) "aWn" = ( /obj/structure/chair/sofa/right{ color = "#c45c57"; @@ -32268,8 +31486,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -32286,7 +31503,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32309,7 +31525,6 @@ pixel_y = -27 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -32347,7 +31562,6 @@ "aWy" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -32380,7 +31594,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -32540,7 +31753,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -32604,34 +31816,26 @@ /turf/open/floor/plating, /area/science/server) "aWV" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/fernybush, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/grass, +/area/science/genetics) "aWW" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aWX" = ( /obj/machinery/computer/mecha{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -32645,7 +31849,7 @@ /area/crew_quarters/heads/hor) "aWY" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "aWZ" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -32679,19 +31883,26 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "aXb" = ( -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/turf/open/floor/engine, -/area/science/explab) +/mob/living/carbon/monkey, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/grass, +/area/science/genetics) "aXc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/storage/box/disks{ + pixel_y = 5 }, -/turf/open/floor/plating, -/area/science/explab) +/obj/structure/noticeboard{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "aXd" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -32699,7 +31910,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -32725,7 +31935,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -32802,7 +32011,7 @@ /area/science/robotics/lab) "aXk" = ( /turf/closed/wall/r_wall/rust, -/area/science/explab) +/area/science/genetics) "aXl" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) @@ -32840,10 +32049,9 @@ /turf/open/floor/plasteel/dark, /area/science/lab) "aXo" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/science/genetics) "aXp" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral, @@ -32918,7 +32126,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/newscaster{ @@ -32937,7 +32144,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32976,7 +32182,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -33046,7 +32251,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33067,7 +32271,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33087,9 +32290,7 @@ /area/science/research) "aXF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/computer/nanite_chamber_control{ - dir = 2 - }, +/obj/machinery/computer/nanite_chamber_control, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -33166,7 +32367,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -33177,7 +32377,6 @@ "aXK" = ( /obj/effect/decal/remains/human, /obj/machinery/sparker/toxmix{ - dir = 2; name = "chamber igniter"; pixel_x = -16 }, @@ -33219,18 +32418,18 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "aXO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 4 }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "aXP" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research/glass{ @@ -33271,15 +32470,16 @@ /turf/open/floor/plating, /area/science/server) "aXS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/structure/window/reinforced, +/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "aXT" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ @@ -33303,17 +32503,18 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing/chamber) "aXU" = ( -/obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Toggle"; - pixel_y = 25 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "aXV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -33415,9 +32616,9 @@ name = "scrubber ducky" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/science/storage"; dir = 1; name = "Toxins Storage APC"; - areastring = "/area/science/storage"; pixel_y = 25 }, /obj/structure/cable, @@ -33471,20 +32672,32 @@ }, /area/maintenance/starboard) "aYj" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 4 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/toy/figure/geneticist{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "aYk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -33492,7 +32705,6 @@ req_one_access_txt = "32;19" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -33733,7 +32945,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -33932,7 +33143,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -34226,7 +33436,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -34242,9 +33451,9 @@ dir = 4 }, /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/medical"; dir = 8; name = "Medical Security Checkpoint APC"; - areastring = "/area/security/checkpoint/medical"; pixel_x = -24 }, /obj/structure/cable, @@ -34357,7 +33566,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -34365,7 +33573,7 @@ /area/security/checkpoint/medical) "aZv" = ( /turf/closed/wall, -/area/science/explab) +/area/science/genetics) "aZw" = ( /turf/closed/wall/r_wall/rust, /area/crew_quarters/heads/cmo) @@ -34387,7 +33595,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/depsec/medical, @@ -34435,7 +33642,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -34553,7 +33759,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/door/window/westleft{ @@ -34570,8 +33775,7 @@ /obj/structure/closet/crate/goldcrate, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/crowbar/power, /obj/effect/turf_decal/tile/neutral, @@ -34590,7 +33794,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/security/glass{ @@ -34650,7 +33853,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor, @@ -34710,7 +33912,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -34779,7 +33980,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -34793,7 +33993,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -34821,7 +34020,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -34840,7 +34038,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -34953,7 +34150,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -34978,7 +34174,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -35051,7 +34246,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/chemist, @@ -35082,7 +34276,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/chair/wood{ @@ -35140,8 +34333,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bat" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -35172,7 +34364,6 @@ /area/tcommsat/computer) "baw" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/window/reinforced{ @@ -35198,7 +34389,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -35358,7 +34548,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/start/shaft_miner, @@ -35388,7 +34577,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/public/glass{ @@ -35502,7 +34690,6 @@ "baX" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, /obj/machinery/sparker/toxmix{ - dir = 2; name = "chamber igniter"; pixel_x = -16 }, @@ -35534,8 +34721,7 @@ /obj/machinery/camera{ c_tag = "Engineering Security Post"; dir = 1; - name = "engineering camera"; - network = list("ss13") + name = "engineering camera" }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/engineering) @@ -35633,7 +34819,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 2; external_pressure_bound = 120; name = "server vent" }, @@ -35752,7 +34937,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light_switch{ @@ -35777,7 +34961,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -35799,7 +34982,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -35818,7 +35000,6 @@ /area/science/mixing/chamber) "bbx" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/engine, @@ -35843,7 +35024,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -35924,7 +35104,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -35946,8 +35125,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral{ @@ -36051,7 +35229,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/start/medical_doctor, @@ -36060,7 +35237,6 @@ /area/medical/storage) "bbS" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped{ - icon_state = "mixer_off_f"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -36229,7 +35405,6 @@ /area/science/mixing) "bce" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -36257,7 +35432,7 @@ }, /obj/machinery/door/airlock/research/glass{ name = "Research Lab"; - req_one_access_txt = "7;29" + req_one_access_txt = "7;29;9" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36285,7 +35460,6 @@ }, /obj/machinery/camera{ c_tag = "Toxins Launch Site"; - dir = 2; name = "science camera"; network = list("ss13","rd") }, @@ -36339,8 +35513,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light{ dir = 8 @@ -36451,7 +35624,6 @@ }, /obj/structure/transit_tube/station/reverse, /obj/structure/transit_tube_pod{ - icon_state = "pod"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -36461,7 +35633,6 @@ /area/bridge) "bcw" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/lattice/catwalk, @@ -36531,8 +35702,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light{ dir = 8 @@ -36630,7 +35800,6 @@ /area/science/server) "bcI" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -36701,7 +35870,6 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/event_spawn, @@ -36731,7 +35899,6 @@ dir = 4 }, /obj/machinery/button/massdriver{ - dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = -24 @@ -36834,8 +36001,8 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - pixel_y = 30 +/obj/item/radio/intercom{ + pixel_y = 22 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) @@ -36847,7 +36014,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -36887,7 +36053,6 @@ }, /obj/machinery/camera{ c_tag = "Hydroponics"; - dir = 2; name = "hydroponics camera" }, /obj/machinery/light{ @@ -36900,7 +36065,6 @@ dir = 1 }, /obj/effect/spawner/structure/window/hollow/reinforced/middle{ - icon_state = "hrwindow_spawner_middle"; dir = 4 }, /obj/structure/cable, @@ -36945,28 +36109,28 @@ /turf/open/floor/plating/airless, /area/hallway/secondary/command) "bdb" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Monkey Pen"; + req_access_txt = "9, 7" }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "bdc" = ( -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_y = 5 - }, -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Toggle"; - pixel_x = -24; - pixel_y = 0 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/chair/office/light, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bdd" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/table/optable{ @@ -36984,8 +36148,11 @@ name = "science camera"; network = list("ss13","rd") }, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/grass, +/area/science/genetics) "bdf" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -37076,6 +36243,14 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/paicard{ + pixel_x = 6 + }, +/obj/item/aicard, +/obj/item/taperecorder{ + pixel_x = -6; + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "bdn" = ( @@ -37101,7 +36276,6 @@ }, /obj/machinery/camera{ c_tag = "Backstage"; - dir = 2; name = "diner camera" }, /obj/effect/turf_decal/tile/neutral{ @@ -37193,7 +36367,6 @@ }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/crew_quarters/bar"; - dir = 2; name = "Bar APC"; pixel_y = -26 }, @@ -37223,7 +36396,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -37264,14 +36436,12 @@ departmentType = 5; name = "Research Director RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "bdx" = ( /obj/machinery/computer/robotics{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -37313,14 +36483,19 @@ /area/maintenance/starboard) "bdA" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/item/radio/intercom{ pixel_x = -28 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/ausbushes/grassybush, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "bdB" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -37335,7 +36510,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -37369,7 +36543,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -37408,9 +36581,7 @@ desc = "Used for watching the RD's goons from the safety of his office."; dir = 1; name = "Research Monitor"; - network = list("rd"); - pixel_x = 0; - pixel_y = 0 + network = list("rd") }, /obj/machinery/newscaster/security_unit{ pixel_y = -30 @@ -37439,8 +36610,7 @@ req_access_txt = "55" }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -37449,7 +36619,7 @@ /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; name = "Research Division"; - req_one_access_txt = "47" + req_one_access_txt = "47, 9" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 @@ -37491,7 +36661,6 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/showroomfloor, @@ -37507,7 +36676,6 @@ departmentType = 2; name = "Science RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /obj/structure/window/reinforced, @@ -37545,34 +36713,35 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "bdR" = ( -/obj/structure/table, -/obj/item/folder{ - pixel_x = -6 - }, -/obj/item/book/manual/wiki/experimentor, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bdS" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, /obj/effect/turf_decal/box/corners, +/mob/living/carbon/monkey, +/obj/structure/sink/puddle, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -26 - }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "bdT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -37621,7 +36790,6 @@ /area/science/mixing) "bdW" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/lattice/catwalk, @@ -37635,7 +36803,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37650,7 +36817,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37683,7 +36849,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/depsec/science, @@ -37702,7 +36867,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37721,7 +36885,6 @@ department = "Science"; departmentType = 2; name = "Science RC"; - pixel_x = 0; pixel_y = -30; receive_ore_updates = 1 }, @@ -37768,7 +36931,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -37790,7 +36952,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -37829,7 +36990,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -37845,7 +37005,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37863,7 +37022,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37897,7 +37055,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -37936,7 +37093,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line, @@ -37968,7 +37124,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -38003,7 +37158,6 @@ /obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; @@ -38026,7 +37180,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -38074,7 +37227,6 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/eastright{ - dir = 4; name = "Hydroponics Delivery Access"; req_access_txt = "35" }, @@ -38087,7 +37239,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -38111,7 +37262,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/event_spawn, @@ -38146,7 +37296,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/chemist, @@ -38193,7 +37342,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light{ @@ -38230,7 +37378,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -38256,9 +37403,8 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/power/apc{ - dir = 2; - name = "Research Lab APC"; areastring = "/area/science/lab"; + name = "Research Lab APC"; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -38332,9 +37478,9 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/medical/chemistry"; dir = 8; name = "Chemistry APC"; - areastring = "/area/medical/chemistry"; pixel_x = -24 }, /obj/effect/turf_decal/bot, @@ -38555,8 +37701,7 @@ req_access_txt = "55" }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/processor/slime, /turf/open/floor/plasteel/dark, @@ -38662,7 +37807,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -38692,7 +37836,6 @@ /area/teleporter) "bfq" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/engine, @@ -38703,7 +37846,6 @@ /area/science/mixing) "bfs" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/engine, @@ -38718,7 +37860,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -38753,7 +37894,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -38779,7 +37919,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -38815,7 +37954,6 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -38836,7 +37974,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -38928,7 +38065,6 @@ "bfK" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen{ - dir = 2; name = "Test Chamber Monitor"; network = list("xeno"); pixel_y = 2 @@ -38955,7 +38091,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -38972,7 +38107,6 @@ /obj/machinery/button/door{ id = "Xenolab"; name = "Containment Chamber Toggle"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -38988,7 +38122,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research/glass{ name = "Research Lab"; - req_one_access_txt = "7;29" + req_one_access_txt = "7;29;9" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, @@ -39005,7 +38139,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -39030,8 +38163,7 @@ /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/plasteel/dark, @@ -39046,7 +38178,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -39086,7 +38217,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39098,7 +38228,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -39110,7 +38239,6 @@ "bfY" = ( /obj/machinery/camera{ c_tag = "Xenobiology Test Chamber"; - dir = 2; name = "xenobiology camera"; network = list("ss13","rd","xeno") }, @@ -39126,7 +38254,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 2; name = "euthanization chamber freezer" }, /turf/open/floor/plasteel/dark, @@ -39145,8 +38272,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Toxins Storage"; @@ -39183,7 +38309,6 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/computer/prisoner/gulag_teleporter_computer{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -39230,7 +38355,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -39272,13 +38396,10 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/research) "bgk" = ( -/obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, -/obj/machinery/vending/wardrobe/science_wardrobe, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -39291,8 +38412,11 @@ name = "science camera"; network = list("ss13","rd") }, +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bgl" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -39302,7 +38426,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -39316,7 +38439,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39330,7 +38452,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -39359,8 +38480,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; external_pressure_bound = 140; - pressure_checks = 0; - name = "server vent" + name = "server vent"; + pressure_checks = 0 }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) @@ -39458,7 +38579,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -39499,7 +38619,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -39551,7 +38670,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39593,7 +38711,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -39642,7 +38759,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39759,7 +38875,6 @@ /area/hallway/secondary/command) "bgR" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/structure/sign/warning/electricshock{ @@ -39848,7 +38963,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -39886,7 +39000,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/poster/official/cleanliness{ @@ -39901,7 +39014,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical{ @@ -39924,7 +39036,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ @@ -39954,7 +39065,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -39974,7 +39084,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40015,7 +39124,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40026,14 +39134,12 @@ /area/hallway/primary/starboard) "bhi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40061,7 +39167,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40069,7 +39174,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable, @@ -40109,7 +39213,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -40130,7 +39233,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40166,7 +39268,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small{ @@ -40188,7 +39289,6 @@ }, /obj/machinery/camera{ c_tag = "Xenobiology Euthanization Chamber"; - dir = 2; name = "xenobiology camera"; network = list("ss13","rd","xeno") }, @@ -40196,14 +39296,12 @@ /area/science/xenobiology) "bhw" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40235,7 +39333,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40249,7 +39346,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/storage/box/lights/mixed, @@ -40295,9 +39391,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/structure/bodycontainer/morgue{ - dir = 4 - }, +/obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "bhD" = ( @@ -40312,7 +39406,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -40326,7 +39419,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -40374,7 +39466,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -40448,7 +39539,6 @@ department = "Cargo Bay"; departmentType = 2; name = "Quartermaster RC"; - pixel_x = 0; pixel_y = 30 }, /obj/structure/extinguisher_cabinet{ @@ -40498,7 +39588,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -40541,7 +39630,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40592,7 +39680,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40609,7 +39696,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -40626,7 +39712,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -40651,7 +39736,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -40671,7 +39755,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -40718,8 +39801,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -40841,10 +39923,8 @@ /area/medical/surgery) "bis" = ( /obj/machinery/computer/shuttle/mining{ - icon_state = "computer"; dir = 8; - req_access = null; - req_one_access = null + req_access = null }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, @@ -40897,7 +39977,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -40916,7 +39995,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/medical_doctor, @@ -40961,7 +40039,6 @@ /area/hallway/primary/starboard) "biA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -40982,7 +40059,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41011,7 +40087,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41165,7 +40240,6 @@ "biO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology{ @@ -41192,7 +40266,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sink{ @@ -41265,7 +40338,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -41285,7 +40357,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -41296,11 +40367,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "biV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -41314,7 +40385,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line, @@ -41352,7 +40422,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41364,7 +40433,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -41388,7 +40456,6 @@ dir = 4 }, /obj/machinery/computer/bounty{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -41405,7 +40472,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41420,7 +40486,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41435,7 +40500,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41464,7 +40528,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -41487,7 +40550,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -41559,7 +40621,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -41744,7 +40805,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41777,7 +40837,6 @@ }, /obj/item/toy/figure/clown, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/tile/neutral, @@ -41807,7 +40866,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41829,7 +40887,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -41888,7 +40945,6 @@ "bjJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41941,9 +40997,9 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/freezer/blood, /obj/machinery/power/apc{ + areastring = "/area/medical/surgery"; dir = 4; name = "Surgery APC"; - areastring = "/area/medical/surgery"; pixel_x = 26 }, /obj/machinery/light/small{ @@ -41993,7 +41049,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/box, @@ -42038,7 +41093,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -42049,7 +41103,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -42113,7 +41166,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -42223,10 +41275,7 @@ /area/quartermaster/storage) "bkm" = ( /obj/effect/turf_decal/bot, -/obj/machinery/computer/security/labor{ - dir = 2; - icon_state = "computer" - }, +/obj/machinery/computer/security/labor, /obj/effect/turf_decal/tile/neutral, /obj/machinery/requests_console{ department = "Security"; @@ -42371,7 +41420,6 @@ id = "Cabin_3"; name = "Cabin 3 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -42504,15 +41552,12 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageSort2"; name = "mail belt"; - pixel_x = 0; pixel_y = 6 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -42557,7 +41602,6 @@ /obj/machinery/light, /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; name = "Mining RC"; pixel_y = -30 }, @@ -42604,7 +41648,6 @@ /area/quartermaster/storage) "bkN" = ( /obj/machinery/door/poddoor{ - density = 1; id = "QMLoaddoor"; name = "Supply Dock Loading Door" }, @@ -42685,7 +41728,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -42770,7 +41812,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -42840,7 +41881,6 @@ id = "Cabin_2"; name = "Cabin 2 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -42923,7 +41963,6 @@ req_access_txt = "31" }, /obj/machinery/button/door{ - dir = 2; id = "QMLoaddoor2"; layer = 4; name = "On Ramp Toggle"; @@ -42952,7 +41991,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -42990,8 +42028,7 @@ /area/quartermaster/storage) "blq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -43011,7 +42048,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -43130,7 +42166,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -43148,15 +42183,12 @@ dir = 8; id = "QMLoad"; name = "off ramp"; - pixel_x = 0; pixel_y = 5 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel, @@ -43176,7 +42208,6 @@ /area/medical/virology) "blC" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -43247,7 +42278,6 @@ /area/security/checkpoint/supply) "blH" = ( /obj/machinery/door/poddoor{ - density = 1; id = "QMLoaddoor2"; name = "Supply Dock Loading Door" }, @@ -43290,7 +42320,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -43312,9 +42341,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "blM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -43336,15 +42363,12 @@ /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2"; name = "on ramp"; - pixel_x = 0; pixel_y = 6 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -43502,7 +42526,6 @@ }, /obj/machinery/camera{ c_tag = "Quartermaster's Office"; - dir = 2; name = "cargo camera"; network = list("ss13","qm") }, @@ -43697,7 +42720,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/status_display/supply{ @@ -43911,9 +42933,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/hallway/primary/aft) @@ -43990,8 +43010,7 @@ /area/crew_quarters/kitchen) "bmI" = ( /obj/machinery/door/airlock/external{ - name = "Medical Escape Pod"; - req_access_txt = "0" + name = "Medical Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -44319,7 +43338,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -44351,8 +43369,7 @@ areastring = "/area/maintenance/port"; dir = 4; name = "Port Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, @@ -44426,8 +43443,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/hydroponics) @@ -44608,7 +43624,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -44766,11 +43781,9 @@ /area/hydroponics) "bnP" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -44779,8 +43792,7 @@ /area/bridge) "bnQ" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, @@ -44845,7 +43857,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -44878,7 +43889,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -44924,8 +43934,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/hydroponics) @@ -45135,8 +44144,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -45383,7 +44391,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining/glass{ @@ -45465,7 +44472,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/quartermaster, @@ -45536,7 +44542,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -45657,7 +44662,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -45813,7 +44817,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -45832,7 +44835,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -45898,7 +44900,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -45978,7 +44979,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -46029,8 +45029,7 @@ }, /obj/structure/chair/comfy/brown{ buildstackamount = 0; - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -46128,7 +45127,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -46326,8 +45324,7 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo"; - pixel_x = 0 + name = "CondiMaster Neo" }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) @@ -46429,7 +45426,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -46444,7 +45440,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/light_switch{ @@ -46503,14 +45498,12 @@ /area/crew_quarters/kitchen) "bqp" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -46529,7 +45522,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -46564,7 +45556,6 @@ /area/crew_quarters/kitchen) "bqt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -46619,7 +45610,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -46636,7 +45626,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -46646,9 +45635,9 @@ dir = 8 }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/medical/virology"; dir = 1; name = "Virology APC"; - areastring = "/area/medical/virology"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -46666,7 +45655,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/item/surgical_drapes, @@ -46695,7 +45683,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining{ @@ -46716,7 +45703,6 @@ /obj/machinery/door/window/southleft{ dir = 8; name = "Atmospherics Delivery Access"; - req_access_txt = "0"; req_one_access_txt = "24;10" }, /obj/machinery/door/poddoor/preopen{ @@ -46807,7 +45793,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -46822,8 +45807,7 @@ "bqK" = ( /obj/structure/chair/sofa/corner{ color = "#c45c57"; - dir = 1; - icon_state = "sofacorner" + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -46853,7 +45837,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -46881,7 +45864,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -46925,7 +45907,6 @@ /area/maintenance/central) "bqR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/effect/decal/cleanable/blood/gibs/old, @@ -46946,7 +45927,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47101,8 +46081,7 @@ /area/crew_quarters/theatre) "bre" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -47147,8 +46126,7 @@ /area/bridge) "brg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -47161,12 +46139,10 @@ req_access_txt = "55" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/dark, @@ -47248,8 +46224,7 @@ /area/chapel/office) "brq" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -47389,8 +46364,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/plasteel/dark, @@ -47511,7 +46485,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -47589,7 +46562,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -47645,7 +46617,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -47744,7 +46715,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -47778,7 +46748,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/showroomfloor, @@ -47880,7 +46849,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -47899,7 +46867,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -47929,7 +46896,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -47939,8 +46905,7 @@ /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/airalarm{ dir = 4; @@ -48057,7 +47022,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining/glass{ @@ -48094,11 +47058,9 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Chapel"; - dir = 2; name = "fore camera" }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -48149,7 +47111,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -48183,7 +47144,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -48213,7 +47173,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -48312,7 +47271,6 @@ /area/hydroponics) "bsM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /obj/effect/decal/cleanable/blood/old, @@ -48332,8 +47290,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/grass, @@ -48345,8 +47302,7 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/crew_quarters/heads/hop) @@ -48361,8 +47317,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/crew_quarters/heads/hop) @@ -48381,7 +47336,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -48605,7 +47559,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -48630,9 +47583,7 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; - pixel_x = 0; pixel_y = 22; prison_radio = 1 }, @@ -48645,8 +47596,7 @@ /area/security/prison) "bti" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -48744,7 +47694,6 @@ "bto" = ( /obj/effect/turf_decal/delivery, /obj/structure/bodycontainer/crematorium{ - icon_state = "crema1"; dir = 8; id = "crematoriumChapel" }, @@ -48896,7 +47845,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -48917,7 +47865,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -48954,7 +47901,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -48975,7 +47921,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, /obj/machinery/requests_console{ - announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; @@ -48996,8 +47941,7 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_1"; @@ -49016,8 +47960,7 @@ /obj/structure/flora/ausbushes/sunnybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_1"; @@ -49082,8 +48025,7 @@ /area/maintenance/port) "btP" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -49129,9 +48071,7 @@ /area/crew_quarters/bar) "btU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -49146,8 +48086,7 @@ areastring = "/area/hallway/primary/port"; dir = 8; name = "Port Hallway APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable, /turf/open/floor/plasteel/dark/corner{ @@ -49169,7 +48108,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -49247,7 +48185,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/dark, @@ -49305,7 +48242,6 @@ departmentType = 2; name = "Bar RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /turf/open/floor/plasteel/dark, @@ -49399,7 +48335,6 @@ /area/crew_quarters/bar) "buo" = ( /obj/machinery/chem_dispenser/drinks{ - icon_state = "soda_dispenser"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -49485,9 +48420,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/dark, @@ -49523,7 +48456,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -49545,7 +48477,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/wood{ @@ -49618,7 +48549,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -49753,7 +48683,6 @@ /obj/machinery/door/window/northright{ dir = 4; name = "Engineering Delivery Access"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/machinery/door/poddoor/preopen{ @@ -49849,7 +48778,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -49911,7 +48839,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -49960,7 +48887,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -49977,7 +48903,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/landmark/start/bartender, @@ -50011,7 +48936,6 @@ /area/hallway/secondary/exit/departure_lounge) "bvp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -50025,14 +48949,12 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bvr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/chair/office, @@ -50100,7 +49022,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/sign/warning/nosmoking{ @@ -50185,7 +49106,6 @@ /area/hallway/primary/starboard) "bvC" = ( /obj/machinery/chem_dispenser/drinks/beer{ - icon_state = "booze_dispenser"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -50256,7 +49176,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/bartender, @@ -50271,7 +49190,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -50283,7 +49201,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -50317,7 +49234,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -50378,14 +49294,12 @@ "bvR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/wood, /area/crew_quarters/bar) "bvS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/wood{ @@ -50401,7 +49315,6 @@ }, /obj/machinery/button/crematorium{ id = "crematoriumChapel"; - pixel_x = 0; pixel_y = 24; req_access_txt = "27" }, @@ -50464,7 +49377,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/box, @@ -50555,7 +49467,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -50578,14 +49489,12 @@ /area/maintenance/central) "bwl" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50710,7 +49619,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50751,7 +49659,6 @@ }, /obj/effect/turf_decal/tile/green, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -50780,7 +49687,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -50800,7 +49706,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -50826,7 +49731,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50865,7 +49769,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50906,7 +49809,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -50920,7 +49822,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50975,7 +49876,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -50996,7 +49896,6 @@ /area/chapel/main) "bwY" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 1 }, /turf/open/floor/plasteel/chapel{ @@ -51005,7 +49904,6 @@ /area/chapel/main) "bwZ" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 1 }, /turf/open/floor/plasteel/chapel, @@ -51022,14 +49920,12 @@ /area/chapel/main) "bxb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -51055,7 +49951,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -51069,7 +49964,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/chapel{ @@ -51088,8 +49982,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/chapel/main) @@ -51138,7 +50031,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/radio/intercom{ @@ -51206,7 +50098,6 @@ /area/maintenance/port) "bxr" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -51266,7 +50157,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -51304,7 +50194,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -51333,12 +50222,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 1; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/cable, @@ -51367,7 +50254,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/firealarm{ @@ -51378,7 +50264,6 @@ /area/chapel/main) "bxD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/grass, @@ -51397,9 +50282,7 @@ /area/chapel/main) "bxF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51476,7 +50359,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -51496,7 +50378,6 @@ /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/grass, @@ -51608,7 +50489,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/landmark/start/assistant, @@ -51620,7 +50500,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology/glass{ @@ -51640,8 +50519,7 @@ }, /obj/machinery/chem_master/condimaster{ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199"; - pixel_x = 0 + name = "BrewMaster 2199" }, /obj/machinery/light_switch{ pixel_y = 24 @@ -51668,7 +50546,6 @@ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Secure Storage Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "11" }, @@ -51771,7 +50648,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -51801,7 +50677,6 @@ }, /obj/machinery/camera{ c_tag = "Supermatter Cooler"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -51828,7 +50703,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -51850,7 +50724,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -51916,12 +50789,10 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/camera/motion{ c_tag = "AI Upload Turrets"; - dir = 2; name = "upload camera"; network = list("aiupload") }, @@ -51974,7 +50845,6 @@ "byu" = ( /obj/machinery/door/airlock/maintenance{ name = "command maintenance"; - req_access_txt = "0"; req_one_access_txt = "19;63" }, /obj/structure/disposalpipe/segment, @@ -52082,7 +50952,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/camera{ c_tag = "Engineering Lockers"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -52113,7 +50982,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/ai_slipper{ @@ -52126,7 +50994,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -52196,8 +51063,8 @@ }, /obj/effect/spawner/lootdrop/aimodule_harmful{ fan_out_items = 1; - lootdoubles = 0; - lootcount = 2 + lootcount = 2; + lootdoubles = 0 }, /obj/item/aiModule/supplied/oxygen{ pixel_x = -3; @@ -52233,7 +51100,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/status_display/ai{ @@ -52251,9 +51117,7 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 1; - icon_state = "left"; layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" @@ -52324,7 +51188,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -52373,7 +51236,6 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/engine, @@ -52449,9 +51311,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai_upload) "bzh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -52468,7 +51328,6 @@ /area/quartermaster/storage) "bzi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -52502,8 +51361,8 @@ }, /obj/effect/spawner/lootdrop/aimodule_harmless{ fan_out_items = 1; - lootdoubles = 0; - lootcount = 3 + lootcount = 3; + lootdoubles = 0 }, /obj/structure/table, /obj/structure/window/reinforced, @@ -52538,8 +51397,7 @@ /area/hallway/secondary/exit/departure_lounge) "bzm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -52616,8 +51474,7 @@ broadcasting = 1; frequency = 1447; name = "Private AI Channel"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/circuit/green{ luminosity = 2 @@ -52636,8 +51493,7 @@ "bzt" = ( /obj/machinery/chem_master/condimaster{ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199"; - pixel_x = 0 + name = "BrewMaster 2199" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, @@ -52677,7 +51533,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -52687,7 +51542,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -52700,7 +51554,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/showroomfloor, @@ -52722,7 +51575,6 @@ id = "transittube"; name = "Transit Tube Lockdown Toggle"; pixel_x = 24; - pixel_y = 0; req_access_txt = "19" }, /obj/machinery/camera{ @@ -52768,11 +51620,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/junction/flip{ - icon_state = "pipe-j2"; dir = 4 }, /turf/open/floor/wood, @@ -52791,7 +51641,6 @@ pixel_x = -28 }, /obj/machinery/computer/prisoner/management{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/wood, @@ -52799,8 +51648,7 @@ "bzE" = ( /obj/machinery/door/airlock/vault{ id_tag = "bank"; - name = "Bank Vault"; - req_access_txt = "0" + name = "Bank Vault" }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plasteel/dark, @@ -52888,10 +51736,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "bzM" = ( -/obj/machinery/modular_computer/console/preset/command{ - dir = 2; - icon_state = "console" - }, +/obj/machinery/modular_computer/console/preset/command, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -52932,7 +51777,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -53047,7 +51891,6 @@ /area/crew_quarters/locker) "bAa" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 9 }, /obj/structure/cable, @@ -53094,9 +51937,7 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) @@ -53143,7 +51984,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -53200,8 +52040,7 @@ /obj/machinery/flasher{ id = "PCell 2"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -53286,12 +52125,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red, @@ -53343,9 +52180,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -53483,8 +52318,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/chair/office{ dir = 8 @@ -53497,7 +52331,6 @@ /obj/machinery/requests_console{ department = "Detective's office"; name = "Detective RC"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/light_switch{ @@ -53696,7 +52529,6 @@ /obj/item/camera, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -53749,7 +52581,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -53789,7 +52620,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -53803,7 +52633,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -53842,7 +52671,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -53900,14 +52728,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/quartermaster/storage"; dir = 1; name = "Cargo Bay APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -54034,13 +52860,12 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/power/apc{ + areastring = "/area/crew_quarters/fitness/recreation"; dir = 1; name = "Recreation Area APC"; - areastring = "/area/crew_quarters/fitness/recreation"; pixel_y = 24 }, /obj/structure/cable, @@ -54103,7 +52928,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -54164,7 +52988,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -54202,7 +53025,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -54214,7 +53036,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -54232,7 +53053,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/item/radio/intercom{ @@ -54350,7 +53170,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/analyzer{ - pixel_x = 0; pixel_y = 4 }, /obj/item/analyzer{ @@ -54358,7 +53177,6 @@ }, /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; name = "Tool Storage RC"; pixel_x = -30 }, @@ -54370,7 +53188,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_x = 32; pixel_y = 8 }, @@ -54416,7 +53233,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/twohanded/required/kirbyplants{ @@ -54474,7 +53290,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -54491,9 +53306,9 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/bridge"; dir = 8; name = "Bridge APC"; - areastring = "/area/bridge"; pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ @@ -54560,7 +53375,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner{ @@ -54605,7 +53419,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line, @@ -54730,7 +53543,6 @@ pixel_y = 6 }, /obj/item/radio{ - pixel_x = 0; pixel_y = 4 }, /turf/open/floor/plasteel/dark, @@ -54751,7 +53563,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -54805,7 +53616,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -54852,7 +53662,6 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/light_switch{ @@ -54875,7 +53684,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -54966,7 +53774,6 @@ /area/hallway/primary/port) "bCI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -55197,7 +54004,6 @@ /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -55244,7 +54050,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/spawner/structure/window/reinforced, @@ -55288,7 +54093,6 @@ "bDe" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -55351,7 +54155,6 @@ "bDl" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -55470,8 +54273,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, /obj/structure/sign/warning/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/dark, /area/storage/tech) @@ -55480,7 +54282,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/engine, @@ -55533,7 +54334,6 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "RCD Storage"; - pixel_x = 0; req_access_txt = "19" }, /turf/open/floor/plasteel/dark, @@ -55591,8 +54391,7 @@ /area/storage/tech) "bDH" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -55662,8 +54461,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/storage/tech) @@ -55790,7 +54588,6 @@ }, /obj/machinery/camera{ c_tag = "Secure Tech Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -55819,7 +54616,6 @@ /obj/effect/spawner/lootdrop/techstorage/AI, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/circuit/green{ @@ -55922,8 +54718,7 @@ /area/hallway/primary/port) "bEi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -56022,7 +54817,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -56040,7 +54834,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56213,7 +55006,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -56231,7 +55023,6 @@ }, /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -56306,7 +55097,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56364,7 +55154,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -56425,7 +55214,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -56451,7 +55239,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -56500,7 +55287,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/grunge{ @@ -56533,7 +55319,6 @@ areastring = "/area/security/checkpoint/supply"; dir = 1; name = "Cargo Security APC"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/firealarm{ @@ -56689,7 +55474,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -56700,7 +55484,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security{ name = "Council Chamber"; - req_access_txt = "0"; req_one_access_txt = "38;63" }, /obj/structure/cable, @@ -56746,7 +55529,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -56777,7 +55559,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56797,7 +55578,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -56811,7 +55591,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -56822,8 +55601,7 @@ /obj/machinery/portable_atmospherics/scrubber/huge, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -56859,7 +55637,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -56895,7 +55672,6 @@ "bFE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56931,7 +55707,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -57152,8 +55927,7 @@ "bGa" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "bankvault"; - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -57192,7 +55966,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -57216,9 +55989,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark/corner{ dir = 8 @@ -57255,9 +56026,9 @@ /obj/structure/table, /obj/item/cartridge/lawyer, /obj/machinery/power/apc{ + areastring = "/area/lawoffice"; dir = 1; name = "Law Office APC"; - areastring = "/area/lawoffice"; pixel_y = 24 }, /obj/structure/cable, @@ -57267,8 +56038,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/hydroponics, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -57313,9 +56083,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/blood/old, @@ -57329,7 +56097,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -57354,7 +56121,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -57408,8 +56174,7 @@ areastring = "/area/crew_quarters/heads/captain"; dir = 4; name = "Captain's Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -57417,7 +56182,6 @@ "bGv" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red{ @@ -57511,7 +56275,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -57543,10 +56306,7 @@ /turf/open/floor/plating, /area/engine/atmos) "bGD" = ( -/obj/machinery/computer/security/labor{ - dir = 2; - icon_state = "computer" - }, +/obj/machinery/computer/security/labor, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -57574,7 +56334,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/assistant, @@ -57586,7 +56345,6 @@ "bGF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -57740,7 +56498,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -57762,7 +56519,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -57798,7 +56554,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -57834,7 +56589,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57845,7 +56599,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -57867,7 +56620,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57887,7 +56639,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner, @@ -57963,7 +56714,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -58011,7 +56761,6 @@ /area/hallway/primary/aft) "bHp" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -58107,9 +56856,8 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 2; - name = "Locker Room APC"; areastring = "/area/crew_quarters/locker"; + name = "Locker Room APC"; pixel_x = -1; pixel_y = -26 }, @@ -58252,7 +57000,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/dark/corner{ @@ -58275,7 +57022,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -58296,11 +57042,9 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/port) @@ -58314,7 +57058,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner{ @@ -58326,7 +57069,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -58353,7 +57095,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58367,7 +57108,6 @@ "bHO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -58445,7 +57185,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -58538,7 +57277,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -58557,7 +57295,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/airalarm{ @@ -58629,7 +57366,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/security{ @@ -58732,9 +57468,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/hallway/primary/aft) @@ -58790,7 +57524,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58864,7 +57597,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58899,7 +57631,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/grunge{ @@ -58928,7 +57659,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -58949,7 +57679,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -59007,7 +57736,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -59087,7 +57815,6 @@ "bIU" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - O2"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -59110,8 +57837,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) @@ -59158,7 +57884,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -59227,7 +57952,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -59260,7 +57984,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -59285,7 +58008,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -59304,7 +58026,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -59445,7 +58166,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -59553,7 +58273,6 @@ }, /obj/machinery/camera{ c_tag = "Prison Yard Machines"; - dir = 2; name = "prison camera"; network = list("ss13","prison") }, @@ -59576,7 +58295,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -59611,9 +58329,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -59622,7 +58338,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/showroomfloor, @@ -59764,7 +58479,6 @@ id = "Cabin_4"; name = "Cabin 4 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -59819,7 +58533,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment, @@ -59838,7 +58551,6 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -59872,7 +58584,6 @@ id = "Cabin_1"; name = "Cabin 1 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -59899,7 +58610,6 @@ /area/crew_quarters/locker) "bKi" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -60016,7 +58726,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -60059,7 +58768,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -60125,9 +58833,8 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/power/apc{ - dir = 2; - name = "Restrooms APC"; areastring = "/area/crew_quarters/toilet/restrooms"; + name = "Restrooms APC"; pixel_y = -26 }, /obj/machinery/camera{ @@ -60221,7 +58928,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -60252,8 +58958,7 @@ /area/bridge) "bKJ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, @@ -60371,7 +59076,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -60379,7 +59083,6 @@ "bKT" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60413,7 +59116,6 @@ "bKU" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60446,7 +59148,6 @@ "bKV" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60481,7 +59182,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -60492,7 +59192,6 @@ /area/security/courtroom) "bKX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -60585,7 +59284,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -60596,7 +59294,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -60748,7 +59445,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -60814,7 +59510,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -60845,7 +59540,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/structure/window/reinforced{ @@ -60872,7 +59566,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -60901,7 +59594,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -60929,7 +59621,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/structure/window/reinforced, @@ -60949,7 +59640,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -60988,8 +59678,7 @@ output_dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plating, /area/quartermaster/office) @@ -61018,12 +59707,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ c_tag = "Central Hallway Courtroom"; - dir = 2; name = "central camera" }, /turf/open/floor/plasteel, @@ -61069,18 +59756,15 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 4; icon_state = "left"; name = "Fitness Ring" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -61124,7 +59808,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -61181,7 +59864,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -61244,8 +59926,7 @@ /obj/item/storage/backpack, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) @@ -61266,7 +59947,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -61299,7 +59979,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -61339,7 +60018,6 @@ "bMe" = ( /obj/machinery/hydroponics/soil, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/seeds/ambrosia, @@ -61358,7 +60036,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/status_display/evac{ @@ -61392,7 +60069,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -61408,7 +60084,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -61457,7 +60132,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -61468,7 +60142,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -61563,7 +60236,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/dark/corner{ @@ -61584,8 +60256,7 @@ /area/crew_quarters/fitness/recreation) "bMu" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -61597,13 +60268,11 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/security/warden) @@ -61652,7 +60321,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -61720,7 +60388,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -61741,7 +60408,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -61807,7 +60473,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -61836,7 +60501,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -61871,7 +60535,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -61899,7 +60562,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/nanotrasen{ @@ -61979,7 +60641,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -62054,9 +60715,9 @@ /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ + areastring = "/area/quartermaster/sorting"; dir = 4; name = "Delivery Office APC"; - areastring = "/area/quartermaster/sorting"; pixel_x = 26 }, /obj/machinery/disposal/deliveryChute{ @@ -62169,15 +60830,13 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, /area/security/processing) "bNo" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -62195,14 +60854,12 @@ }, /obj/machinery/camera{ c_tag = "Starboad Hallway Custodial Bay"; - dir = 2; name = "starboard camera" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -62215,7 +60872,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -62306,12 +60962,10 @@ }, /obj/structure/sign/directions/engineering{ dir = 8; - icon_state = "direction_eng"; pixel_y = -40 }, /obj/structure/sign/directions/security{ dir = 8; - icon_state = "direction_sec"; pixel_y = -32 }, /obj/structure/sign/directions/medical{ @@ -62348,7 +61002,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/air_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -62358,7 +61011,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -62379,7 +61031,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -62403,7 +61054,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/grass, @@ -62414,7 +61064,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -62454,7 +61103,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -62495,7 +61143,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -62608,8 +61255,7 @@ id = "commissaryshutter"; name = "Commissary Shutter Toggle"; pixel_x = 24; - pixel_y = 8; - req_access_txt = "0" + pixel_y = 8 }, /obj/machinery/button/door{ id = "commissarydoor"; @@ -62702,7 +61348,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -62764,7 +61409,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -62815,7 +61459,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/hydroponics"; - dir = 2; name = "Hydroponics APC"; pixel_y = -26 }, @@ -62883,7 +61526,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -62896,7 +61538,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/janitor, @@ -62910,7 +61551,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62950,7 +61590,6 @@ /area/security/courtroom) "bOx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -63022,7 +61661,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63054,7 +61692,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/navbeacon{ @@ -63066,7 +61703,6 @@ /area/hallway/primary/starboard) "bOF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -63075,7 +61711,6 @@ /area/crew_quarters/heads/hop) "bOG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -63113,7 +61748,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -63145,7 +61779,6 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Diner"; - dir = 2; name = "fore camera" }, /turf/open/floor/plasteel, @@ -63197,7 +61830,6 @@ "bOP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -63361,7 +61993,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -63469,7 +62100,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63488,9 +62118,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -63499,7 +62127,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -63519,7 +62146,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -63541,7 +62167,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63557,14 +62182,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bPp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 8 }, /mob/living/simple_animal/hostile/asteroid/hivelord, @@ -63607,7 +62230,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/item/twohanded/required/kirbyplants{ @@ -63743,7 +62365,6 @@ "bPC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -63777,7 +62398,6 @@ "bPE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -63792,7 +62412,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -63872,7 +62491,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/twohanded/required/kirbyplants{ @@ -63895,9 +62513,7 @@ pixel_x = 32 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/security/processing) @@ -63910,7 +62526,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63958,7 +62573,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63992,7 +62606,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -64089,7 +62702,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -64107,7 +62719,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light{ @@ -64130,7 +62741,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -64145,14 +62755,12 @@ /area/space/nearstation) "bQh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64170,7 +62778,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64226,8 +62833,7 @@ /obj/item/clothing/head/welding, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -64245,13 +62851,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/hallway/primary/central"; dir = 1; name = "Central Primary Hallway APC"; - areastring = "/area/hallway/primary/central"; pixel_y = 24 }, /obj/structure/cable, @@ -64273,7 +62878,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -64297,14 +62901,12 @@ department = "Security"; departmentType = 5; name = "Security RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -64324,7 +62926,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/dark/corner{ @@ -64381,7 +62982,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -64402,7 +63002,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -64420,7 +63019,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/cable, @@ -64448,8 +63046,7 @@ }, /obj/machinery/camera{ c_tag = "Brig Prison Access"; - dir = 4; - name = "security camera" + dir = 4 }, /turf/open/floor/plasteel/dark, /area/security/warden) @@ -64473,7 +63070,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -64525,7 +63121,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -64636,7 +63231,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/chair/office{ @@ -64654,14 +63248,12 @@ /area/hallway/secondary/exit/departure_lounge) "bQM" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -64687,9 +63279,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -64711,7 +63301,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64746,7 +63335,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64761,7 +63349,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64889,7 +63476,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64929,7 +63515,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -64946,14 +63531,12 @@ /area/hallway/primary/central) "bRe" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -64972,7 +63555,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -65004,9 +63586,9 @@ /area/hallway/primary/central) "bRi" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; - areastring = "/area/maintenance/port/aft"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -65014,7 +63596,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -65031,7 +63612,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -65073,7 +63653,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65113,7 +63692,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65147,7 +63725,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/ticket_machine{ @@ -65320,7 +63897,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65349,7 +63925,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65400,7 +63975,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65454,7 +64028,6 @@ /area/hallway/primary/starboard) "bRQ" = ( /obj/docking_port/stationary{ - dheight = 0; dir = 4; dwidth = 11; height = 18; @@ -65465,9 +64038,7 @@ /turf/open/space/basic, /area/space/nearstation) "bRR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -65517,7 +64088,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -65591,7 +64161,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -65599,7 +64168,6 @@ /area/hallway/secondary/exit/departure_lounge) "bSc" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -65616,7 +64184,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -65677,7 +64244,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -65724,8 +64290,7 @@ areastring = "/area/hallway/primary/starboard"; dir = 4; name = "Starboard Hallway APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -65738,7 +64303,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -65870,7 +64434,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -65958,7 +64521,6 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -65994,8 +64556,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) @@ -66059,9 +64620,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/dark, @@ -66088,8 +64647,7 @@ /area/maintenance/starboard/aft) "bSL" = ( /obj/structure/sign/warning/securearea{ - name = "EMERGENCY STORAGE"; - pixel_y = 0 + name = "EMERGENCY STORAGE" }, /turf/closed/wall, /area/hallway/secondary/entry) @@ -66184,8 +64742,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/item/radio/intercom{ pixel_y = -28 @@ -66371,7 +64928,6 @@ "bTj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -66547,9 +65103,7 @@ pixel_x = -22 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -66604,7 +65158,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -66638,7 +65191,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -66659,8 +65211,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/clothing/mask/russian_balaclava, /obj/effect/turf_decal/stripes/corner{ @@ -66674,7 +65225,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -66754,7 +65304,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66959,7 +65508,6 @@ dir = 4 }, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /turf/open/floor/plasteel, @@ -67000,7 +65548,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -67262,9 +65809,7 @@ /turf/open/space/basic, /area/space/nearstation) "bUH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -67340,7 +65885,6 @@ /area/hallway/secondary/entry) "bUO" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/plating/airless{ @@ -67361,9 +65905,7 @@ /turf/open/floor/engine/air, /area/engine/atmos) "bUR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -67485,7 +66027,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67544,7 +66085,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -67558,7 +66098,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67614,7 +66153,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -67704,7 +66242,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -67794,8 +66331,7 @@ pixel_y = -24 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67829,7 +66365,6 @@ "bVD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/twohanded/required/kirbyplants, @@ -67922,12 +66457,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/camera{ c_tag = "Central Hallway Teleporter Access"; - dir = 2; name = "central camera" }, /turf/open/floor/plasteel, @@ -67949,7 +66482,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67967,7 +66499,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -68103,7 +66634,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -68121,7 +66651,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -68179,7 +66708,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -68235,7 +66763,6 @@ /area/hallway/secondary/exit/departure_lounge) "bWg" = ( /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Distro to Connector" }, /obj/effect/decal/cleanable/dirt, @@ -68252,8 +66779,7 @@ /area/maintenance/port) "bWh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -68276,7 +66802,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -68293,7 +66818,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -68325,7 +66849,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -68349,7 +66872,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -68403,8 +66925,7 @@ /obj/machinery/door_timer{ id = "Cell 6"; name = "Cell 6"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 6"; @@ -68420,7 +66941,6 @@ /area/hallway/secondary/entry) "bWr" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /turf/closed/wall/r_wall/rust, @@ -68450,8 +66970,7 @@ /obj/machinery/door_timer{ id = "Cell 5"; name = "Cell 5"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 5"; @@ -68470,8 +66989,7 @@ /obj/machinery/door_timer{ id = "Cell 4"; name = "Cell 4"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 4"; @@ -68505,8 +67023,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment{ @@ -68519,8 +67036,7 @@ /area/hallway/secondary/exit/departure_lounge) "bWy" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -68556,8 +67072,7 @@ /obj/machinery/door_timer{ id = "Cell 3"; name = "Cell 3"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -68613,7 +67128,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -68644,8 +67158,7 @@ /obj/machinery/door_timer{ id = "Cell 2"; name = "Cell 2"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; @@ -68676,8 +67189,7 @@ /obj/machinery/door_timer{ id = "Cell 1"; name = "Cell 1"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; @@ -68807,7 +67319,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -68860,7 +67371,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -68887,8 +67397,7 @@ /area/hallway/secondary/entry) "bXa" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -68919,7 +67428,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -69128,7 +67636,6 @@ /area/bridge) "bXu" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -69157,7 +67664,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -69347,7 +67853,6 @@ /obj/item/crowbar, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/corner{ @@ -69372,8 +67877,7 @@ /area/hallway/primary/aft) "bXK" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -69388,7 +67892,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -69446,7 +67949,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -69626,7 +68128,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -69686,9 +68187,7 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "bYj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -69833,8 +68332,7 @@ /area/maintenance/port/aft) "bYt" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69944,9 +68442,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "bYB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -69974,7 +68470,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -70188,7 +68683,6 @@ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner, @@ -70357,7 +68851,6 @@ /mob/living/simple_animal/bot/cleanbot{ auto_patrol = 1; icon_state = "cleanbot1"; - mode = 0; name = "Mopficcer Sweepsky" }, /turf/open/floor/plasteel, @@ -70406,7 +68899,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -70461,7 +68953,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -70509,7 +69000,6 @@ /obj/effect/turf_decal/tile/red, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/neutral{ @@ -70571,9 +69061,7 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -70771,7 +69259,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -70790,7 +69277,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -70837,7 +69323,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -70871,7 +69356,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -70886,8 +69370,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/grenade/clusterbuster/cleaner, /turf/open/floor/plasteel/dark, @@ -71033,7 +69516,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -71072,7 +69554,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/box, @@ -71094,7 +69575,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -71160,14 +69640,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cak" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -71184,7 +69662,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -71204,7 +69681,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -71225,8 +69701,7 @@ }, /obj/structure/sink{ dir = 4; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -71338,7 +69813,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -71358,7 +69832,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -71397,7 +69870,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -71499,7 +69971,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/janitor, @@ -71668,7 +70139,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -71687,16 +70157,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "caV" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -71764,8 +70231,7 @@ /area/engine/break_room) "caZ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -71776,7 +70242,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -71790,7 +70255,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment, @@ -71996,9 +70460,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cbu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -72060,7 +70522,6 @@ }, /obj/structure/sign/directions/supply{ dir = 4; - icon_state = "direction_supply"; pixel_y = -32 }, /obj/structure/sign/directions/science{ @@ -72195,7 +70656,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/machinery/light{ @@ -72211,7 +70671,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -72228,7 +70687,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -72304,8 +70762,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Aft Hallway Engineering Venders"; @@ -72337,7 +70794,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -72529,7 +70985,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/shower{ @@ -72792,8 +71247,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plasteel/dark, @@ -72903,7 +71357,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/delivery, @@ -73020,8 +71473,7 @@ /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, /obj/machinery/status_display/ai{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -73070,7 +71522,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -73107,7 +71558,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -73133,7 +71583,6 @@ pixel_y = -32 }, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -73204,7 +71653,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/firealarm{ @@ -73414,7 +71862,6 @@ }, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -73451,8 +71898,7 @@ /area/security/prison) "cdU" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -73476,9 +71922,9 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -73535,14 +71981,12 @@ pixel_y = 6 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = 22 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73587,7 +72031,6 @@ "cef" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -73600,7 +72043,6 @@ pixel_x = -27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73610,10 +72052,10 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; layer = 4.1; name = "Secondary AI Core Access"; + obj_integrity = 300; pixel_x = 4; req_access_txt = "16" }, @@ -73719,7 +72161,6 @@ }, /obj/machinery/camera{ c_tag = "Tool Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -73740,7 +72181,6 @@ "ceo" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -73753,7 +72193,6 @@ pixel_x = 27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73763,10 +72202,10 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; layer = 4.1; name = "Tertiary AI Core Access"; + obj_integrity = 300; pixel_x = -3; req_access_txt = "16" }, @@ -73827,9 +72266,9 @@ /area/security/prison) "cet" = ( /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/security/prison"; dir = 1; name = "Prison Wing APC"; - areastring = "/area/security/prison"; pixel_x = 1; pixel_y = 24 }, @@ -73886,7 +72325,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -73945,7 +72383,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -74012,7 +72449,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -74121,9 +72557,7 @@ }, /area/maintenance/starboard) "ceU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -74142,7 +72576,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -74185,7 +72618,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74200,7 +72632,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74285,7 +72716,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - icon_state = "pipe11-2"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -74295,7 +72725,6 @@ /area/engine/atmos) "cfm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -74379,7 +72808,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -74452,7 +72880,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74507,7 +72934,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74534,7 +72960,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -74578,7 +73003,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74590,7 +73014,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -74600,9 +73023,9 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -74638,7 +73061,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74657,7 +73079,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -74680,7 +73101,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -74719,7 +73139,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -74734,7 +73153,6 @@ /area/security/prison) "cfS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -74774,7 +73192,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -74788,7 +73205,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /obj/structure/cable, @@ -74827,7 +73243,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74844,7 +73259,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74883,7 +73297,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Gas to Chamber" }, /turf/open/floor/circuit/green{ @@ -74892,8 +73305,7 @@ /area/engine/supermatter) "cgi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -74941,13 +73353,12 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/storage/tech"; dir = 8; name = "Tech Storage APC"; - areastring = "/area/storage/tech"; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -75001,7 +73412,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -75012,7 +73422,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/door/airlock/engineering/glass{ @@ -75043,7 +73452,6 @@ pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/engine, @@ -75060,7 +73468,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -75088,7 +73495,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -75127,7 +73533,6 @@ name = "Justice Door Lock"; normaldoorcontrol = 1; pixel_x = -24; - pixel_y = 0; req_access_txt = "3"; specialfunctions = 4 }, @@ -75139,9 +73544,9 @@ /obj/structure/closet/secure_closet/warden, /obj/effect/turf_decal/delivery, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/security/warden"; dir = 8; name = "Brig Control APC"; - areastring = "/area/security/warden"; pixel_x = -26 }, /obj/machinery/firealarm{ @@ -75184,7 +73589,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -75201,7 +73605,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -75231,7 +73634,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - icon_state = "heater_1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -75245,7 +73647,6 @@ "cgH" = ( /obj/machinery/door/airlock/external{ name = "Engineering External Airlock"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /turf/open/floor/plasteel/dark, @@ -75277,7 +73678,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -75293,7 +73693,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light, @@ -75365,7 +73764,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75380,7 +73778,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75397,7 +73794,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75410,7 +73806,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75429,7 +73824,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -75448,7 +73842,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -75502,7 +73895,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75515,7 +73907,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -75528,7 +73919,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark/corner, @@ -75600,8 +73990,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, @@ -75715,7 +74104,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -75813,7 +74201,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -75830,7 +74217,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/engine, @@ -75864,11 +74250,9 @@ /area/ai_monitored/storage/satellite) "chH" = ( /obj/structure/reflector/box/anchored{ - icon_state = "reflector_map"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/box/corners, @@ -75880,7 +74264,6 @@ "chJ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76034,7 +74417,6 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -76086,7 +74468,6 @@ "cie" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -76110,9 +74491,9 @@ }, /obj/item/wrench, /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/storage/eva"; dir = 8; name = "E.V.A. Storage APC"; - areastring = "/area/ai_monitored/storage/eva"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -76142,7 +74523,6 @@ /obj/machinery/button/door{ id = "sidearmory"; name = "Armoury Shutter Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "3" }, @@ -76150,7 +74530,6 @@ /area/ai_monitored/security/armory) "cii" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -76203,7 +74582,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/decal/cleanable/dirt, @@ -76300,7 +74678,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/camera{ @@ -76341,7 +74718,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -76383,7 +74759,6 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -76433,7 +74808,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -76463,8 +74837,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/table, /obj/machinery/computer/security/telescreen/minisat{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -76615,7 +74988,6 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -76625,7 +74997,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -76642,7 +75013,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -76666,7 +75036,6 @@ /area/engine/gravity_generator) "ciX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -76715,7 +75084,6 @@ "cja" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -76736,8 +75104,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/clipboard{ pixel_x = 4 @@ -76782,7 +75149,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -76899,7 +75265,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -77073,7 +75438,6 @@ /area/engine/gravity_generator) "cjC" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -77122,9 +75486,7 @@ }, /obj/machinery/light, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -77147,7 +75509,6 @@ /area/engine/gravity_generator) "cjG" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -77170,7 +75531,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -77199,9 +75559,7 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; - pixel_x = 0; pixel_y = -28; prison_radio = 1 }, @@ -77210,8 +75568,7 @@ /area/security/prison) "cjK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -77270,7 +75627,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/camera{ @@ -77295,7 +75651,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -77321,7 +75676,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -77344,7 +75698,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -77361,7 +75714,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -77383,7 +75735,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -77425,7 +75776,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ areastring = "/area/security/execution/education"; - dir = 2; name = "Prisoner Education Chamber APC"; pixel_y = -26 }, @@ -77464,7 +75814,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -77478,7 +75827,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -77496,7 +75844,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/grille/broken, @@ -77539,7 +75886,6 @@ id = "gravity"; name = "Gravity Generator Lockdown"; pixel_x = -24; - pixel_y = 0; req_one_access_txt = "19;23" }, /turf/open/floor/engine, @@ -77631,7 +75977,6 @@ /obj/machinery/button/door{ id = "frontarmory"; name = "Armoury Shutter Toggle"; - pixel_x = 0; pixel_y = 24; req_access_txt = "58" }, @@ -77726,7 +76071,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -77734,14 +76078,12 @@ /area/hallway/primary/aft) "cky" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -77760,7 +76102,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -77792,9 +76133,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "ckE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -77812,7 +76151,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -77917,8 +76255,7 @@ /area/maintenance/aft) "ckP" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -77943,7 +76280,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -77989,7 +76325,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78040,7 +76375,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78062,7 +76396,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78218,7 +76551,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red{ @@ -78306,9 +76638,7 @@ }, /area/maintenance/port/aft) "clu" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -78332,7 +76662,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -78359,7 +76688,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -78383,7 +76711,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -78407,7 +76734,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/warning/securearea{ @@ -78528,7 +76854,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78572,7 +76897,6 @@ /area/maintenance/port/aft) "clP" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -78618,7 +76942,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/engine, @@ -78629,7 +76952,6 @@ /area/engine/gravity_generator) "clU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -78658,9 +76980,7 @@ /obj/item/clothing/glasses/meson, /obj/machinery/power/apc{ areastring = "/area/engine/gravity_generator"; - dir = 2; name = "Gravity Generator APC"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable, @@ -78750,7 +77070,6 @@ /area/engine/gravity_generator) "cme" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 4 }, /obj/structure/cable, @@ -78802,7 +77121,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78816,7 +77134,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -78843,7 +77160,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78932,7 +77248,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -78944,7 +77259,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -78954,7 +77268,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78982,7 +77295,6 @@ "cmy" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -79019,7 +77331,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -79080,7 +77391,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -79133,7 +77443,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -79174,7 +77483,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -79258,7 +77566,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -79617,7 +77924,6 @@ /area/hallway/primary/aft) "cnE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -79652,7 +77958,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -79673,8 +77978,7 @@ /area/maintenance/aft) "cnJ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -79806,7 +78110,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -79826,7 +78129,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -79847,7 +78149,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -79870,7 +78171,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -79890,7 +78190,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -79906,7 +78205,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -79929,7 +78227,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/chief_engineer, @@ -79989,7 +78286,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -80019,8 +78315,7 @@ /area/maintenance/port/fore) "coq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -80106,11 +78401,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -80160,7 +78453,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -80234,7 +78526,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/nitrous_tank{ - icon_state = "computer"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -80243,7 +78534,6 @@ "coN" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -80334,7 +78624,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/warden, @@ -80362,7 +78651,6 @@ "coW" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/mech_bay_recharge_port{ - icon_state = "recharge_port"; dir = 2 }, /obj/structure/cable, @@ -80520,7 +78808,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -80547,8 +78834,6 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -80620,7 +78905,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -80766,8 +79050,6 @@ }, /obj/machinery/airalarm/engine{ dir = 1; - icon_state = "alarm0"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/engine, @@ -80784,7 +79066,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -80998,7 +79279,6 @@ "cpR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -81032,7 +79312,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -81120,7 +79399,6 @@ }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/effect/turf_decal/delivery, @@ -81157,8 +79435,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -81185,7 +79462,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81307,7 +79583,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/effect/turf_decal/delivery, @@ -81415,7 +79690,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81571,7 +79845,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -81586,7 +79859,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81616,7 +79888,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/atmos{ @@ -81643,7 +79914,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -81690,7 +79960,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81792,7 +80061,6 @@ "cre" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -81807,7 +80075,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/structure/extinguisher_cabinet{ @@ -81863,9 +80130,7 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/security/main"; - dir = 2; name = "Security Office APC"; - pixel_x = 0; pixel_y = -24 }, /obj/effect/turf_decal/tile/neutral, @@ -81907,7 +80172,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/airalarm{ @@ -82002,7 +80266,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/departments/security{ @@ -82051,7 +80314,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -82098,8 +80360,7 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light{ dir = 4 @@ -82122,8 +80383,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -82134,7 +80394,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -82144,9 +80403,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/stripes/corner, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) @@ -82190,7 +80447,6 @@ /area/hallway/secondary/entry) "crK" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plating/airless{ @@ -82235,7 +80491,6 @@ "crO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -82264,7 +80519,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -82312,7 +80566,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -82353,7 +80606,6 @@ }, /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -82510,9 +80762,8 @@ "csk" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 1; - anchored = 1 + anchored = 1; + dir = 1 }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -82622,14 +80873,12 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -82661,12 +80910,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/engineering{ name = "Engineering Desk"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/structure/disposalpipe/segment{ @@ -82697,7 +80944,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -82756,7 +81002,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -82786,7 +81031,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -82810,7 +81054,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -82829,8 +81072,7 @@ dir = 1 }, /obj/structure/sign/warning/fire{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -82862,7 +81104,6 @@ "csI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Air to Room" }, /obj/effect/turf_decal/stripes/line{ @@ -82875,7 +81116,6 @@ "csJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Connector to Room" }, /obj/effect/turf_decal/stripes/line{ @@ -82896,7 +81136,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/landmark/start/station_engineer, @@ -82939,7 +81178,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology{ @@ -82995,7 +81233,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line, @@ -83106,7 +81343,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /obj/effect/turf_decal/box, @@ -83155,7 +81391,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ - icon_state = "connector_map-1"; dir = 1 }, /obj/machinery/power/apc{ @@ -83169,8 +81404,7 @@ /area/engine/break_room) "cti" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -83372,7 +81606,6 @@ /area/maintenance/disposal) "ctz" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -83444,7 +81677,6 @@ /area/maintenance/starboard/fore) "ctK" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -83467,7 +81699,6 @@ "ctL" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -83484,7 +81715,6 @@ /area/engine/break_room) "ctM" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - icon_state = "inje_map-2"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -83547,7 +81777,6 @@ pixel_y = 22 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -83660,7 +81889,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -83675,14 +81903,12 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/crew_quarters/heads/hos"; dir = 1; name = "Head of Security's Office APC"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/camera{ @@ -83700,7 +81926,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -83726,7 +81951,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -83765,7 +81989,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83815,8 +82038,7 @@ /area/maintenance/port/aft) "cum" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83903,7 +82125,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83938,7 +82159,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -83951,7 +82171,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -83964,7 +82183,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -83977,7 +82195,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -83996,7 +82213,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light{ @@ -84030,7 +82246,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -84063,9 +82278,9 @@ dir = 4 }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/engine/atmos"; dir = 1; name = "Atmospherics APC"; - areastring = "/area/engine/atmos"; pixel_y = 28 }, /obj/structure/cable, @@ -84227,7 +82442,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/table, @@ -84490,8 +82704,7 @@ }, /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot_white, /obj/machinery/newscaster{ @@ -84502,7 +82715,6 @@ /area/maintenance/port) "cvk" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 6 }, /obj/structure/cable, @@ -84510,8 +82722,7 @@ /area/maintenance/port/fore) "cvl" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -84587,7 +82798,6 @@ /area/maintenance/solars/port/aft) "cvs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /obj/effect/turf_decal/stripes/corner, @@ -84626,7 +82836,6 @@ /area/maintenance/port) "cvv" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 10 }, /obj/structure/cable, @@ -84810,7 +83019,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -84968,7 +83176,6 @@ pixel_y = 6 }, /obj/item/radio{ - pixel_x = 0; pixel_y = 4 }, /obj/effect/decal/cleanable/dirt, @@ -85058,7 +83265,6 @@ icon_state = "secbot1"; idcheck = 1; name = "Warden Armsky"; - on = 1; weaponscheck = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -85087,8 +83293,7 @@ /area/maintenance/port/fore) "cwg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -85258,7 +83463,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -85419,7 +83623,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -85438,7 +83641,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -85451,7 +83653,6 @@ /area/security/main) "cwM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/depsec/engineering, @@ -85502,8 +83703,7 @@ /area/maintenance/port) "cwQ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -85552,7 +83752,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -85576,8 +83775,7 @@ }, /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot_white, /obj/structure/noticeboard{ @@ -85627,7 +83825,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85741,8 +83938,7 @@ /obj/machinery/power/solar_control{ dir = 4; id = "aftport"; - name = "Port Quarter Solar Control"; - track = 0 + name = "Port Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -85772,8 +83968,7 @@ areastring = "/area/maintenance/solars/port/aft"; dir = 4; name = "Port Quarter Solar APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -85939,7 +84134,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -85991,8 +84185,7 @@ /area/maintenance/port/fore) "cxE" = ( /obj/machinery/camera/motion{ - c_tag = "Armoury External"; - dir = 2 + c_tag = "Armoury External" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -86034,7 +84227,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /obj/structure/cable, @@ -86050,9 +84242,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light_switch{ pixel_x = 24; @@ -86067,9 +84257,8 @@ "cxK" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 1; - anchored = 1 + anchored = 1; + dir = 1 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -86130,7 +84319,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/tile/red, @@ -86185,7 +84373,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -86201,7 +84388,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -86235,7 +84421,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -86272,7 +84457,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -86301,7 +84485,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -86482,7 +84665,6 @@ }, /obj/machinery/camera{ c_tag = "Engineering Desk"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -86803,7 +84985,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -86993,7 +85174,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -87035,7 +85215,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -87249,7 +85428,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/bot, @@ -87352,7 +85530,6 @@ "czK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/filingcabinet, @@ -87375,9 +85552,9 @@ pixel_y = -26 }, /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/engineering"; dir = 8; name = "Engineering Security APC"; - areastring = "/area/security/checkpoint/engineering"; pixel_x = -24 }, /obj/structure/cable, @@ -87385,8 +85562,7 @@ /area/security/checkpoint/engineering) "czL" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -87406,7 +85582,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -87436,9 +85611,7 @@ /obj/item/clothing/glasses/meson, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/engine/engineering"; - dir = 2; name = "Engine Room APC"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral{ @@ -87460,8 +85633,7 @@ /area/maintenance/port/aft) "czQ" = ( /obj/machinery/computer/card/minor/hos{ - dir = 1; - icon_state = "computer" + dir = 1 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) @@ -87559,7 +85731,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/ai_monitored/security/armory"; - dir = 2; name = "Armoury APC"; pixel_y = -24 }, @@ -87712,9 +85883,7 @@ "cAo" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - anchored = 1; - dir = 2; - icon_state = "0" + anchored = 1 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display/evac{ @@ -87729,9 +85898,7 @@ "cAq" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - anchored = 1; - dir = 2; - icon_state = "0" + anchored = 1 }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ @@ -87797,9 +85964,7 @@ /obj/machinery/button/door{ id = "greylair"; name = "Lair Privacy Toggle"; - pixel_x = 0; - pixel_y = 24; - req_access_txt = "0" + pixel_y = 24 }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -87915,7 +86080,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -87950,7 +86114,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -87985,18 +86148,15 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/structure/cable, @@ -88007,7 +86167,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 10 }, /obj/machinery/power/smes/engineering, @@ -88045,7 +86204,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/structure/cable, @@ -88206,7 +86364,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -88599,7 +86756,6 @@ "cBV" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -88649,7 +86805,6 @@ "cCb" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -88688,8 +86843,7 @@ /area/engine/engineering) "cCf" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -88710,7 +86864,6 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -88730,7 +86883,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "N2 to Pure" }, /obj/effect/turf_decal/stripes/corner{ @@ -88797,7 +86949,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -88880,8 +87031,7 @@ /obj/machinery/flasher{ id = "PCell 3"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -88918,7 +87068,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/camera{ @@ -88999,7 +87148,6 @@ /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -89106,7 +87254,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -89148,7 +87295,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "N2 to Airmix" }, /obj/effect/decal/cleanable/dirt, @@ -89279,7 +87425,6 @@ "cDc" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -89293,7 +87438,6 @@ "cDd" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -89310,7 +87454,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/engine, @@ -89328,7 +87471,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -89357,7 +87499,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor, @@ -89375,7 +87516,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -89415,7 +87555,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -89439,8 +87578,7 @@ /area/maintenance/starboard/aft) "cDq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/fore) @@ -89454,7 +87592,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Cooling Loop Bypass" }, /obj/machinery/light{ @@ -89481,7 +87618,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/engine, @@ -89583,7 +87719,6 @@ }, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -89725,8 +87860,7 @@ /area/engine/engineering) "cDT" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - pixel_y = 0 + icon_state = "plant-05" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -89754,14 +87888,12 @@ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) "cDW" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /turf/open/floor/wood{ icon_state = "wood-broken" @@ -89781,9 +87913,7 @@ /area/maintenance/starboard/fore) "cDY" = ( /obj/structure/chair/sofa/corner{ - color = "#c45c57"; - dir = 2; - icon_state = "sofacorner" + color = "#c45c57" }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood{ @@ -89792,8 +87922,7 @@ /area/maintenance/starboard/fore) "cDZ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -89862,9 +87991,8 @@ /area/maintenance/starboard/fore) "cEf" = ( /obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; - dir = 8; - color = "#c45c57" + color = "#c45c57"; + dir = 8 }, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/blood/old, @@ -89924,7 +88052,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -89950,8 +88077,7 @@ /area/maintenance/starboard/fore) "cEp" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -90013,7 +88139,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/light/small{ @@ -90279,8 +88404,7 @@ "cEO" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, @@ -90480,7 +88604,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/engine, @@ -90521,8 +88644,7 @@ /area/maintenance/starboard/fore) "cFl" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - pixel_y = 0 + icon_state = "plant-05" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -90544,7 +88666,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -90657,7 +88778,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -90711,7 +88831,6 @@ /area/maintenance/disposal/incinerator) "cFB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -90765,7 +88884,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -90779,7 +88897,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -90793,7 +88910,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -90813,7 +88929,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -90875,7 +88990,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/machinery/airalarm{ @@ -90962,7 +89076,6 @@ dir = 1 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/item/radio/intercom{ @@ -90971,7 +89084,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Starboard Quarter Solar"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -91321,7 +89433,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/blood/gibs/up, @@ -91418,8 +89529,7 @@ "cGM" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -91449,7 +89559,6 @@ /area/engine/engineering) "cGO" = ( /obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; dir = 4; state = 2 }, @@ -91461,7 +89570,6 @@ /area/engine/engineering) "cGP" = ( /obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; dir = 8; state = 2 }, @@ -91471,7 +89579,6 @@ /area/engine/engineering) "cGQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/airalarm{ @@ -91532,7 +89639,6 @@ "cGU" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/aft"; - dir = 2; name = "Starboard Quarter Solar APC"; pixel_y = -26 }, @@ -91552,8 +89658,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "aftstarboard"; - name = "Starboard Quarter Solar Control"; - track = 0 + name = "Starboard Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -91579,7 +89684,6 @@ dir = 8 }, /obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; dir = 4; state = 2 }, @@ -91653,7 +89757,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -91725,8 +89828,7 @@ /area/quartermaster/warehouse) "cHm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -91744,7 +89846,6 @@ areastring = "/area/maintenance/disposal"; dir = 1; name = "Disposals APC"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, @@ -92029,7 +90130,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/newscaster{ @@ -92109,8 +90209,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, @@ -92337,7 +90436,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/holopad, @@ -92389,7 +90487,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -92405,7 +90502,6 @@ /obj/item/stock_parts/subspace/treatment, /obj/machinery/camera{ c_tag = "Telecomms Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -92432,7 +90528,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -92465,7 +90560,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/light/small{ @@ -92666,7 +90760,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -92689,11 +90782,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Fuel Pipe to Incinerator" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -92875,7 +90966,6 @@ /area/quartermaster/warehouse) "cIO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/warning/securearea, @@ -92910,7 +91000,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 4 }, /turf/open/floor/plating, @@ -92921,7 +91010,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /turf/open/floor/plating, @@ -93115,7 +91203,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -93153,7 +91240,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -93162,8 +91248,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/computer/shuttle/mining{ dir = 4; - req_access = null; - req_one_access = null + req_access = null }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -93232,8 +91317,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -93285,7 +91369,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -93331,7 +91414,6 @@ /area/maintenance/starboard/fore) "cJJ" = ( /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -93363,7 +91445,6 @@ }, /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 8 }, /turf/open/floor/plating, @@ -93376,7 +91457,6 @@ "cJP" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/machinery/door/airlock/mining/glass{ @@ -93400,7 +91480,6 @@ /area/construction/mining/aux_base) "cJS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -93410,7 +91489,6 @@ /area/quartermaster/warehouse) "cJT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -93426,7 +91504,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -93516,7 +91593,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -93536,7 +91612,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -93546,8 +91621,7 @@ /area/hallway/primary/fore) "cKi" = ( /obj/machinery/computer/shuttle/labor{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 @@ -93576,7 +91650,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -93652,7 +91725,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/structure/sign/warning/vacuum/external{ @@ -93666,7 +91738,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/machinery/conveyor_switch/oneway{ @@ -93681,7 +91752,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 1 }, /turf/open/floor/plating, @@ -93702,7 +91772,6 @@ "cKv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plating, @@ -93711,7 +91780,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plating, @@ -93720,7 +91788,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /turf/open/floor/plating, @@ -93793,7 +91860,6 @@ /area/quartermaster/warehouse) "cKC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -93809,7 +91875,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -93824,7 +91889,6 @@ /area/hallway/primary/fore) "cKE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -93868,9 +91932,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "cKI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -93878,7 +91940,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 4 }, /turf/open/floor/plasteel, @@ -93895,7 +91956,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -93912,7 +91972,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /obj/machinery/button/door{ @@ -93925,7 +91984,6 @@ /area/quartermaster/warehouse) "cKL" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -93965,7 +92023,6 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -94162,7 +92219,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -94174,7 +92230,6 @@ /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -94198,7 +92253,6 @@ /area/maintenance/starboard/aft) "cLd" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; roundstart_template = /datum/map_template/shuttle/escape_pod/default; @@ -94302,8 +92356,7 @@ "cLo" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/item/stack/cable_coil/cut, /turf/open/floor/wood, @@ -94326,7 +92379,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -94344,7 +92396,6 @@ /area/maintenance/starboard) "cLu" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -94402,8 +92453,7 @@ "cLB" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -94415,7 +92465,6 @@ "cLC" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -94429,7 +92478,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -94537,7 +92585,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -94664,7 +92711,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/spider/stickyweb, @@ -94697,7 +92743,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/blood/old, @@ -94782,7 +92827,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -94793,7 +92837,6 @@ dir = 8; icon_state = "left"; name = "Library Desk Door"; - pixel_x = 0; req_access_txt = "37" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -94856,8 +92899,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/sign/poster/official/pda_ad{ pixel_y = -32 @@ -94866,9 +92908,7 @@ /area/library) "cMJ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light_switch{ pixel_y = -24 @@ -95117,8 +93157,7 @@ department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/machinery/light{ dir = 8 @@ -95161,7 +93200,6 @@ "cNs" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -95210,7 +93248,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/carpet/green, @@ -95358,7 +93395,6 @@ "cNO" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -95506,7 +93542,6 @@ }, /obj/machinery/airalarm/mixingchamber{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -95543,8 +93578,7 @@ /area/bridge) "cPa" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95555,7 +93589,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -95579,7 +93612,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -95626,7 +93658,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -95648,7 +93679,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -95793,7 +93823,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/showroomfloor, @@ -95811,7 +93840,6 @@ "cTD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -113681,11 +111709,11 @@ cxf cxw aar apY -aNG -aNG +aNL +aNL atL -aOL -aNG +aNP +aNL aPA azU aAE @@ -113938,7 +111966,7 @@ cxf cxw cxN apZ -aNG +aNL ajY atM aFb @@ -114195,7 +112223,7 @@ cwp cxx cxG aqa -aOL +aNP aOa atN aOC @@ -114452,7 +112480,7 @@ cwp cwq cwy aqb -aNG +aNL aOb atQ aOE @@ -114709,7 +112737,7 @@ cwq cwp anP aqe -aNG +aNL akq atR avx @@ -114968,9 +112996,9 @@ anQ ail aNt aWm -aNx +aNO avB -aNx +aNO aPA abl agH @@ -115222,13 +113250,13 @@ ajI alb cwq anR -aDB -aDB +aNH +aNH aOl aPe avC aNM -aNx +aNO aNR aOj aOp @@ -115479,13 +113507,13 @@ cvv cvJ amh anV -aDB -and +aNH +aNJ apW aBi avG aNS -aNG +aNL aOe aJW aOh @@ -115742,7 +113770,7 @@ aqo aMd avI auA -aOL +aNP aOd aNT aPh @@ -116250,13 +114278,13 @@ cvI cxB cwp ajv -aDB -aDB +aNH +aNH aOx aPu aWf aNV -aNx +aNO aFr aNY aOv diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index da38af9bdac..a780e5401c9 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -796,12 +796,17 @@ }, /area/crew_quarters/kitchen) "abU" = ( -/obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "abV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light/small{ @@ -925,14 +930,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"acl" = ( -/mob/living/simple_animal/pet/dog/pug{ - desc = "It's Pugley IV, the research department's lovable pug clone. Hopefully nothing happens to this one - fourth time lucky!"; - name = "Pugley IV"; - real_name = "Pugley IV" - }, -/turf/open/floor/engine, -/area/science/explab) "acm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -983,13 +980,22 @@ }, /area/security/prison) "acr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/xeno_spawn, -/obj/effect/landmark/blobstart, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "acs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -3786,8 +3792,7 @@ "ahU" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, -/obj/item/stock_parts/manipulator, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/fore) "ahV" = ( @@ -7482,17 +7487,13 @@ /area/maintenance/starboard/fore) "ape" = ( /obj/structure/rack, -/obj/item/storage/belt{ - desc = "Can hold quite a lot of stuff."; - name = "multi-belt" - }, /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/lootdrop/maintenance, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) "apf" = ( @@ -7669,13 +7670,10 @@ /area/maintenance/port/fore) "apD" = ( /obj/item/storage/box/lights/mixed, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "apE" = ( @@ -8584,8 +8582,7 @@ /area/maintenance/starboard/fore) "arH" = ( /obj/structure/rack, -/obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arI" = ( @@ -8596,9 +8593,8 @@ /area/maintenance/starboard/fore) "arJ" = ( /obj/structure/rack, -/obj/item/clothing/suit/poncho, -/obj/item/clothing/head/sombrero, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arK" = ( @@ -10611,7 +10607,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/storage/box/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/fore) "awB" = ( @@ -10746,7 +10742,7 @@ /area/maintenance/port/fore) "awS" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/fore) "awT" = ( @@ -13291,12 +13287,6 @@ "aDb" = ( /turf/closed/wall, /area/construction/mining/aux_base) -"aDc" = ( -/obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/fore) "aDh" = ( /obj/machinery/firealarm{ dir = 4; @@ -15319,8 +15309,8 @@ /area/crew_quarters/dorms) "aHV" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aHX" = ( @@ -16391,9 +16381,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/wirecutters, -/obj/item/weldingtool, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aKx" = ( @@ -16888,7 +16876,7 @@ /area/crew_quarters/locker) "aLJ" = ( /obj/structure/rack, -/obj/item/stock_parts/matter_bin, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -18819,6 +18807,7 @@ }, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/engineering) "aQd" = ( @@ -19840,6 +19829,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/engineering) +"aSy" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "aSA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -32453,9 +32450,8 @@ }, /area/maintenance/starboard) "btu" = ( -/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard) "btv" = ( @@ -35567,8 +35563,7 @@ /area/crew_quarters/toilet/auxiliary) "bBq" = ( /obj/structure/rack, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port) "bBr" = ( @@ -35975,6 +35970,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -39637,8 +39633,7 @@ /area/maintenance/port) "bLd" = ( /obj/structure/closet, -/obj/item/clothing/shoes/jackboots, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port) "bLe" = ( @@ -40059,6 +40054,7 @@ /area/storage/tcom) "bLX" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -41683,6 +41679,7 @@ "bPJ" = ( /obj/structure/rack, /obj/item/clothing/mask/horsehead, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/port) "bPK" = ( @@ -43160,8 +43157,8 @@ /area/maintenance/port) "bTv" = ( /obj/structure/rack, -/obj/item/paper, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/paper, /turf/open/floor/plating, /area/maintenance/port) "bTw" = ( @@ -43824,9 +43821,9 @@ /area/maintenance/port) "bUR" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port) "bUS" = ( @@ -44129,8 +44126,7 @@ /area/maintenance/starboard) "bVE" = ( /obj/structure/closet/crate, -/obj/item/storage/belt/utility, -/obj/item/stack/cable_coil, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard) "bVF" = ( @@ -44991,7 +44987,6 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /turf/open/floor/plating, @@ -45015,7 +45010,7 @@ /area/maintenance/port) "bXy" = ( /obj/structure/closet, -/obj/item/flashlight, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "bXz" = ( @@ -45065,16 +45060,7 @@ /area/maintenance/port) "bXH" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port) -"bXI" = ( -/obj/structure/closet, -/obj/item/clothing/neck/stethoscope, -/obj/item/hemostat, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port) "bXJ" = ( @@ -45536,8 +45522,8 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port/aft) "bYQ" = ( @@ -47679,7 +47665,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cdk" = ( -/obj/item/trash/semki, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/port/aft) "cdl" = ( @@ -48676,11 +48662,9 @@ /turf/open/space, /area/space/nearstation) "cfC" = ( -/obj/item/trash/pistachios, /obj/structure/closet, -/obj/item/stack/sheet/glass, /obj/item/extinguisher, -/obj/item/storage/belt/utility, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port/aft) "cfD" = ( @@ -48690,6 +48674,7 @@ "cfE" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/dropper, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "cfF" = ( @@ -49131,7 +49116,7 @@ /area/maintenance/starboard/secondary) "cgq" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "cgs" = ( /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -49701,21 +49686,50 @@ /turf/closed/wall/r_wall, /area/bridge/showroom/corporate) "chx" = ( -/turf/open/floor/engine, -/area/science/explab) -"chy" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 +/obj/structure/table/glass, +/obj/item/storage/box/bodybags, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Experimentation Lab - Test Chamber"; - network = list("ss13","rd") +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"chy" = ( +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30; + receive_ore_updates = 1 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/flashlight/pen{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/flashlight/pen{ + pixel_x = 4; + pixel_y = 3 }, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "chz" = ( /obj/structure/window/reinforced{ dir = 1; @@ -49724,11 +49738,35 @@ /turf/open/floor/plasteel/dark, /area/aisat) "chA" = ( +/obj/structure/table/glass, /obj/item/radio/intercom{ - pixel_y = 25 + pixel_y = 26 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/item/storage/box/disks{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/storage/box/syringes, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "chB" = ( /obj/machinery/space_heater, /obj/effect/landmark/blobstart, @@ -49739,23 +49777,20 @@ /area/maintenance/starboard) "chC" = ( /obj/structure/closet/crate, -/obj/item/storage/belt/utility, -/obj/item/stack/cable_coil, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard) "chD" = ( /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/cane, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard) "chE" = ( @@ -50316,11 +50351,18 @@ }, /area/science/research) "ciW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/computer/scan_consolenew{ + dir = 8 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "ciX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -50937,34 +50979,40 @@ }, /area/science/research) "ckr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "cks" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_y = -25 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ckt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "cku" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/three, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckv" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/assembly/infra, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckw" = ( @@ -51649,34 +51697,33 @@ }, /area/science/research) "clS" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/r_wall, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "clT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/science/explab) +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/white, +/area/science/genetics) "clU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" - }, -/turf/open/floor/plating, -/area/science/explab) +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/white, +/area/science/genetics) "clV" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "clW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -51994,94 +52041,30 @@ /area/science/research) "cmP" = ( /turf/closed/wall, -/area/science/explab) +/area/science/genetics) "cmQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_y = 30; - receive_ore_updates = 1 +/obj/structure/disposalpipe/segment, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmR" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/item/pen, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "cmS" = ( -/obj/structure/table/reinforced, -/obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/taperecorder, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cmT" = ( -/obj/machinery/computer/rdconsole/experiment, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmU" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/book/manual/wiki/experimentor, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmV" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_y = 25 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/bottle/multiver{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/reagent_containers/dropper, -/obj/item/stack/medical/suture{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/stack/medical/mesh, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/effect/landmark/start/geneticist, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cmX" = ( /obj/structure/window/reinforced, /obj/machinery/holopad, @@ -52746,86 +52729,43 @@ /turf/open/floor/plasteel/white, /area/science/research) "cok" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"col" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plasteel/white, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "com" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "con" = ( -/obj/effect/landmark/start/scientist, -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"coo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/wrench, -/obj/item/crowbar, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/science, -/obj/item/multitool{ - pixel_x = 3 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cop" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/white, -/area/science/explab) -"coq" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cop" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cor" = ( /obj/structure/girder, /obj/structure/grille, @@ -53358,10 +53298,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "8" - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -53373,8 +53309,12 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab"; + req_access_txt = "9, 30" + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -53389,54 +53329,81 @@ dir = 8 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cpz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/science/explab) -"cpA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/area/science/genetics) +"cpz" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) +"cpA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cpB" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpD" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpE" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "cpF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "8" + name = "Genetics Lab Maintenance"; + req_access_txt = "9, 30" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -54087,78 +54054,87 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/closed/wall, -/area/science/explab) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/genetics) "cqQ" = ( /obj/machinery/light_switch{ - pixel_x = -23 + pixel_y = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cqR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/power/apc{ - areastring = "/area/science/explab"; - name = "Experimentation Lab APC"; + areastring = "/area/science/genetics"; + name = "Genetics Lab APC"; pixel_y = -23 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cqS" = ( /obj/item/radio/intercom{ pixel_y = -29 }, /obj/machinery/camera{ - c_tag = "Experimentation Lab"; + c_tag = "Genetics Lab"; dir = 1; network = list("ss13","rd") }, /obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white, -/area/science/explab) -"cqV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqW" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/stripes/line{ +/area/science/genetics) +"cqU" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cqW" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cqX" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/old, @@ -54587,35 +54563,37 @@ /turf/open/floor/plasteel, /area/science/storage) "crU" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/structure/bed/roller, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "crV" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/bed/roller, +/obj/machinery/door/window/westleft{ + dir = 1; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" }, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "crW" = ( -/obj/structure/closet/l3closet/scientist{ - pixel_x = -2 +/obj/structure/bed/roller, +/mob/living/carbon/monkey, +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/explab) -"crX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/science_wardrobe, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "crZ" = ( /obj/structure/table, /obj/structure/bedsheetbin{ @@ -55389,23 +55367,29 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "ctA" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics) +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "ctB" = ( -/turf/closed/wall, -/area/medical/genetics) +/obj/structure/bodycontainer/morgue, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "ctC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "9" + name = "Morgue Maintenance"; + req_access_txt = "6" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ctD" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, -/area/medical/genetics) +/area/medical/morgue) "ctE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -55643,18 +55627,14 @@ /area/maintenance/port/aft) "cuh" = ( /obj/structure/closet/crate, -/obj/item/stack/cable_coil, -/obj/item/grenade/chem_grenade, -/obj/item/flashlight, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/five, /turf/open/floor/plating, /area/maintenance/port/aft) "cui" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/reagent_containers/spray/weedspray, /obj/item/paper, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/port/aft) "cuj" = ( @@ -55745,121 +55725,80 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cur" = ( +/obj/structure/table/glass, /obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/box/bodybags, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/obj/structure/table/glass, -/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/medical/genetics) -"cus" = ( -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, /obj/item/storage/box/disks{ pixel_x = 2; pixel_y = 2 }, -/obj/structure/table/glass, -/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 + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/science/genetics) +"cus" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cut" = ( -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, /obj/item/storage/box/monkeycubes, +/obj/machinery/airalarm{ + pixel_y = 25 + }, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"cuu" = ( +/obj/machinery/camera{ + c_tag = "Morgue"; + network = list("ss13","medbay") + }, +/obj/structure/bodycontainer/morgue, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) +"cuv" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /obj/item/radio/headset/headset_medsci, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/structure/noticeboard{ - pixel_x = -32; +/obj/item/radio/headset/headset_medsci, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"cuw" = ( +/obj/machinery/airalarm{ pixel_y = 32 }, -/obj/structure/table/glass, -/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/medical/genetics) -"cuu" = ( -/obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; - dir = 1; - name = "Genetics Lab APC"; - pixel_y = 23 - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) -"cuv" = ( +/area/medical/morgue) +"cux" = ( /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/structure/sign/warning/nosmoking{ pixel_y = 32 }, @@ -55871,67 +55810,23 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"cuz" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) -"cuw" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cux" = ( -/obj/structure/noticeboard{ - desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; - name = "requests board"; - pixel_x = -32; - pixel_y = 32 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cuy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "genetics_shutters"; - name = "genetics shutters" - }, -/turf/open/floor/plating, -/area/medical/genetics) -"cuz" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/science/genetics) "cuA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -56104,10 +55999,8 @@ "cuY" = ( /obj/structure/rack, /obj/item/extinguisher, -/obj/item/storage/belt/utility, -/obj/item/clothing/mask/gas, /obj/item/storage/box/lights/mixed, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cuZ" = ( @@ -56247,142 +56140,52 @@ /turf/open/floor/plasteel/dark, /area/medical/genetics/cloning) "cvx" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Genetics Lab"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/light{ +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "cvy" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "cvz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvA" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvB" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvC" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = -24 + pixel_x = -26 }, -/obj/item/storage/box/syringes, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cvD" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cvE" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/pen, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/eastright{ - dir = 8; - name = "Genetics Desk"; - req_access_txt = "5;9" - }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Outer Window" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "genetics_shutters"; - name = "genetics shutters" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"cvA" = ( +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics) +/area/science/genetics) +"cvB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) +"cvE" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cvF" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -56394,8 +56197,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/closed/wall, +/area/medical/morgue) "cvG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ @@ -56621,7 +56424,7 @@ "cwn" = ( /obj/structure/rack, /obj/item/flashlight/pen, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port/aft) "cwo" = ( @@ -56754,97 +56557,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) -"cwy" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/light_switch{ - pixel_x = -23 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwB" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwC" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwD" = ( -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/obj/machinery/camera{ - c_tag = "Genetics Desk"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cwE" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/button/door{ - id = "genetics_shutters"; - name = "genetics shutters control"; - pixel_x = 28; - req_access_txt = "9" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) "cwF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ @@ -57051,10 +56763,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) -"cxc" = ( -/obj/item/trash/chips, -/turf/open/floor/plating, -/area/maintenance/port/aft) "cxd" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/landmark/blobstart, @@ -57165,114 +56873,51 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "cxp" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/medical/genetics) +/turf/closed/wall, +/area/medical/morgue) "cxq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/structure/bodycontainer/morgue, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxr" = ( +/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cxu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/structure/bodycontainer/morgue, +/obj/structure/bodycontainer/morgue{ dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxv" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxw" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/stack/packageWrap, -/obj/item/pen, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cxx" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cxy" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_x = 28 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -57495,13 +57140,6 @@ /area/medical/genetics/cloning) "cyc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Lab"; - req_access_txt = "5; 9; 68" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -57516,99 +57154,35 @@ dir = 8 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_access_txt = "5" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cye" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/effect/landmark/start/geneticist, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyg" = ( -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cyh" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cyi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - id_tag = "AuxGenetics"; - name = "Genetics Lab"; - req_access_txt = "9" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyj" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cym" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - id_tag = "AuxGenetics"; - name = "Genetics Access"; - req_access_txt = "9" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_access_txt = "6" + }, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/morgue) "cyn" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -57924,84 +57498,12 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "cyY" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/bodycontainer/morgue, +/obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyZ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cza" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"czb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"czc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"czd" = ( -/obj/machinery/light_switch{ - pixel_x = 23 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cze" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "czf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/radio/intercom{ @@ -58391,106 +57893,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/genetics/cloning) -"cAa" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/vending/wardrobe/gene_wardrobe, -/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/medical/genetics) -"cAb" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAc" = ( -/obj/structure/bed/roller, -/obj/machinery/door/window/westleft{ - dir = 1; - name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "9" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAd" = ( -/obj/machinery/light, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "9" - }, -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAe" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/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/medical/genetics) -"cAg" = ( -/obj/structure/closet/secure_closet/personal/patient, -/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/medical/genetics) "cAh" = ( /obj/machinery/airalarm{ dir = 4; @@ -58853,14 +58255,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/medical/genetics/cloning) -"cBc" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Genetics"; - req_access_txt = "9" - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) "cBd" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, @@ -59267,22 +58661,10 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cCi" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "cCj" = ( /turf/open/floor/plasteel/dark, /area/medical/morgue) "cCk" = ( -/obj/machinery/airalarm{ - pixel_y = 32 - }, /obj/structure/table, /obj/item/paper_bin{ pixel_x = 6; @@ -59639,17 +59021,8 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cCW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "cCX" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "cCY" = ( @@ -60135,9 +59508,6 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "cEc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) @@ -60154,22 +59524,10 @@ pixel_y = -3 }, /obj/item/clothing/gloves/color/latex, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cEe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/medical/morgue) "cEf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/closed/wall, /area/hallway/primary/aft) "cEg" = ( @@ -61243,7 +60601,7 @@ /area/science/mixing) "cGo" = ( /obj/structure/closet/crate, -/obj/item/clothing/mask/gas, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cGp" = ( @@ -62359,11 +61717,11 @@ "cIh" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, -/obj/item/flashlight, /obj/effect/decal/cleanable/cobweb, /obj/structure/sign/warning/biohazard{ pixel_y = 32 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cIi" = ( @@ -62926,9 +62284,8 @@ }, /obj/structure/closet/crate, /obj/item/clothing/gloves/color/fyellow, -/obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/cable, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/aft) "cJs" = ( @@ -62941,11 +62298,8 @@ /area/maintenance/aft) "cJt" = ( /obj/structure/rack, -/obj/item/screwdriver{ - pixel_y = 6 - }, -/obj/item/crowbar, /obj/item/storage/pill_bottle, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/aft) "cJu" = ( @@ -63285,9 +62639,8 @@ /area/maintenance/starboard/aft) "cKa" = ( /obj/structure/closet, -/obj/item/clothing/glasses/science, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cKb" = ( @@ -64154,10 +63507,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) -"cLU" = ( -/obj/machinery/rnd/bepis, -/turf/open/floor/engine, -/area/science/explab) "cLV" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -64289,6 +63638,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft/secondary) "cMl" = ( @@ -64856,9 +64206,8 @@ /area/maintenance/port/aft) "cNg" = ( /obj/structure/rack, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "cNh" = ( @@ -65499,11 +64848,10 @@ /area/hallway/secondary/exit/departure_lounge) "cOA" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOB" = ( @@ -65844,8 +65192,7 @@ /area/maintenance/starboard/aft) "cPz" = ( /obj/structure/closet, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cPA" = ( @@ -67549,6 +66896,7 @@ /area/chapel/main) "cTp" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "cTq" = ( @@ -69176,6 +68524,7 @@ /area/maintenance/department/science/xenobiology) "ddi" = ( /obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "ddj" = ( @@ -70172,15 +69521,13 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/grenade/chem_grenade, /obj/item/storage/box/lights/mixed, /obj/item/watertank, -/obj/item/storage/box/donkpockets, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port/fore) "dhp" = ( @@ -70329,10 +69676,9 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/dorms) "dhB" = ( -/obj/item/clothing/glasses/meson, /obj/structure/closet/crate, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dhC" = ( @@ -71718,7 +71064,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAh" = ( -/obj/item/storage/box, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAn" = ( @@ -73359,8 +72705,7 @@ /area/crew_quarters/kitchen) "hEP" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -73819,10 +73164,10 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/storage/belt/utility, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/break_room) "jYJ" = ( @@ -74018,10 +73363,10 @@ /area/science/misc_lab/range) "kPN" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port) "kRO" = ( @@ -74280,6 +73625,10 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/dark, /area/medical/chemistry) +"lVD" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard) "lWY" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -75093,13 +74442,11 @@ /area/security/warden) "oXP" = ( /obj/structure/closet/crate, -/obj/item/crowbar/red, -/obj/item/pen, /obj/item/flashlight/pen{ pixel_x = 4; pixel_y = 3 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -75935,9 +75282,8 @@ "sfQ" = ( /obj/structure/closet, /obj/item/extinguisher, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "sfR" = ( @@ -76098,12 +75444,24 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "sRB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "sUG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -76257,10 +75615,6 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"tEg" = ( -/obj/item/relic, -/turf/open/floor/engine, -/area/science/explab) "tFJ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -76488,6 +75842,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) +"uPK" = ( +/obj/machinery/rnd/bepis, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "uRM" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -76498,6 +75856,11 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"uYd" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/maintenance/port/aft) "uYk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -76608,9 +75971,7 @@ /turf/open/floor/plasteel, /area/engine/break_room) "vAs" = ( -/obj/structure/rack, /obj/machinery/portable_atmospherics/canister/air, -/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -76815,11 +76176,10 @@ /area/security/prison) "wkM" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "wmt" = ( @@ -77265,6 +76625,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/warden) +"yeM" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard) "yfM" = ( /obj/machinery/vending/engivend, /obj/effect/turf_decal/delivery, @@ -91012,7 +90379,7 @@ dne aip dne dst -aDc +awS dhE aRG aRG @@ -95961,8 +95328,8 @@ cia cuh cvm cvl -cxc -cxR +cdk +uYd dux aaa aaa @@ -96974,7 +96341,7 @@ dux dux dux dux -cfD +dyw dwb cic cia @@ -97739,7 +97106,7 @@ bSB bPR bue div -bXI +bLd dux dux cbD @@ -101611,15 +100978,15 @@ coR cqo crB csA -ctA -ctA -ctA -ctA +cCe +cCe +cCe +cCe cxp cyc -ctA -ctA -ctA +cCe +cCe +cCe cCe cCe cDX @@ -101868,15 +101235,15 @@ coS cqn crC csB -ctA -cur -cvx -cwy +cCe +cCf +cCj +cCf cxq -cyd +cCj cyY -cAa -ctA +cCf +cCj cCf cCU cDY @@ -102125,15 +101492,15 @@ cmu cqp cmu cmu -ctA +cCe cus -cvy -cwz +cCj +cCj cxr -cye -cyZ -cAb -ctA +cCj +cCj +cCj +cCj cCg cCV cDZ @@ -102382,15 +101749,15 @@ cbu cqq crD csC -ctA -cut -cvz -cwA +cCe +cCj +cCj +cCj cxs -cyf -cyZ -cAc -ctA +cCj +cCj +cCj +cCj cCj cCj cDY @@ -102639,15 +102006,15 @@ uGS uGS uGS csD -ctA +cCe cuu -cvA -cwB +cCj +ctB cxt -cyg -cyZ -cAd -ctA +cCj +ctB +ctB +cCj dbr tFJ dDC @@ -102896,15 +102263,15 @@ coT cqr uGS csE -ctA -cuv -cvB -cwC -cxu +cCe +cCf +cCj +cCf +cxq cyh -cza -cAe -ctA +cCf +cCf +cCj cCf cCf cDY @@ -103153,17 +102520,17 @@ coU cqs crE csF +cCe ctA -ctA -ctA -ctA +cCj +cCj cxv cyi -ctA -ctA -ctA -cCi -cCW +cvB +cCj +cCj +cCj +cCj cEb cEV cFV @@ -103410,15 +102777,15 @@ coV xgQ uGS cKJ -ctB +cCe cuw -cvC -cwD +cCj +cCj cxw -cyj -czb -cAf -cBc +cCg +cxs +cCj +cCj cCj cCX cEc @@ -103668,14 +103035,14 @@ cqu uGS csH ctC -cux -cvD -cwE -cxx -cyk -czc -cAg -ctB +cCj +cCj +cCj +cCj +cCj +cxs +cCj +cvE cCk cCY cEd @@ -103924,18 +103291,18 @@ coX cnL uGS cbC +cCe ctB -cuy cvE ctB -cxy -cyl -czd -cAg +ctB +cCj +cxt ctB cCe cCe -cEe +cCe +cCe cEY cCe cCe @@ -104182,13 +103549,13 @@ coY uGS csI ctD -cuz +cCe cvF -ctB -ctB +cCe +cCe cym -cze -ctB +cxp +cCe cBd cCl cCZ @@ -111115,7 +110482,7 @@ cgq cgq cgq cmP -cmP +cvA cpx cqP crR @@ -111368,9 +110735,9 @@ bST dDr cgq chx -chx -chx -cgq +cuz +ckt +cvz cmQ cok cpy @@ -111624,12 +110991,12 @@ ccw bST ceZ cgq -chx +cur sRB -chx +cvx +clS +clS clS -cmR -col cpz cqR cgq @@ -111881,7 +111248,7 @@ ccv bST csg cgq -chx +cut abU ckr clT @@ -112139,13 +111506,13 @@ bST ceZ cgq chy -acl -tEg +abU +ckr clU cmT con cpB -cqT +cqU crU dwL ftu @@ -112395,12 +111762,12 @@ tYS bST ceZ cgq -chx -cLU -chx -clU -cmU -coo +cuv +abU +cvy +ckr +ckr +ckr cpC cqU crV @@ -112655,11 +112022,11 @@ cgq chA acr cks -cgq -cmV +cks +cks cop cpD -cqV +cqU crW dwL mHF @@ -112909,15 +112276,15 @@ dbE bST diB cgq -chx +cux ciW -ckt +aSy clV -cmW -coq +aSy +ciW cpE cqW -crX +crU dwL mHF cuZ @@ -114724,7 +114091,7 @@ krD krD krD krD -krD +uPK ocT aaf aaa @@ -116239,7 +115606,7 @@ bNL bPh bKr bSd -bPm +yeM alq bVC bWY @@ -117009,7 +116376,7 @@ bKr bKr bKr bKr -apc +lVD apc alq alq @@ -117779,7 +117146,7 @@ bBt atm bLZ bPm -apc +lVD bSf apc bxc diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 9ed78033d07..c62a3523482 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -225,6 +225,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "aaE" = ( @@ -272,8 +273,8 @@ /turf/open/floor/plasteel/white, /area/science/explab) "aaJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/explab) "aaK" = ( @@ -24356,13 +24357,13 @@ /turf/open/floor/engine, /area/science/explab) "bkA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/light{ dir = 1; light_color = "#d1dfff" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, /turf/open/floor/engine, /area/science/explab) "bkB" = ( @@ -24885,9 +24886,9 @@ /turf/open/floor/engine, /area/science/explab) "blR" = ( +/obj/item/beacon, /obj/effect/landmark/blobstart, /obj/effect/landmark/xeno_spawn, -/obj/item/beacon, /turf/open/floor/engine, /area/science/explab) "blS" = ( @@ -25570,30 +25571,30 @@ /turf/open/floor/plasteel/dark, /area/science/server) "bnV" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "testlab"; name = "test chamber blast door" }, /obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/explab) "bnW" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/poddoor/preopen{ id = "testlab"; name = "test chamber blast door" }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/explab) "bnX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor/preopen{ id = "telelab"; name = "test chamber blast door" }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/explab) "bnY" = ( @@ -26121,7 +26122,6 @@ /area/medical/genetics) "bpw" = ( /obj/structure/flora/grass/jungle, -/obj/item/reagent_containers/food/snacks/grown/banana, /turf/open/floor/grass, /area/medical/genetics) "bpx" = ( @@ -26544,9 +26544,6 @@ /turf/open/floor/plasteel/dark, /area/science/server) "bqo" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, @@ -26559,26 +26556,25 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/explab) "bqp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/structure/chair/stool, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/chair/stool, /turf/open/floor/plasteel/white, /area/science/explab) "bqq" = ( -/obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -26586,18 +26582,22 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/landmark/start/scientist, /turf/open/floor/plasteel/white, /area/science/explab) "bqr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/explab) "bqs" = ( @@ -26796,7 +26796,6 @@ "bqT" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/camera{ c_tag = "Genetics Monkey Pen Fore"; dir = 4; @@ -26819,7 +26818,6 @@ /obj/machinery/light/small{ dir = 4 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) "bqW" = ( @@ -27233,10 +27231,6 @@ /turf/open/floor/plasteel/dark, /area/science/server) "brG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -27246,6 +27240,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1; + name = "Connector Port (Air Supply)" + }, /turf/open/floor/plasteel/white, /area/science/explab) "brH" = ( @@ -27253,11 +27251,20 @@ /turf/open/floor/plasteel/white, /area/science/explab) "brJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -27289,7 +27296,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/sign/departments/xenobio{ pixel_x = 32 }, @@ -27300,6 +27306,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, /area/science/xenobiology) "brV" = ( @@ -27449,12 +27456,22 @@ /turf/open/floor/grass, /area/medical/genetics) "bsp" = ( -/obj/item/toy/beach_ball, -/turf/open/floor/grass, -/area/medical/genetics) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bsq" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, +/mob/living/simple_animal/pet/dog/corgi/puppy, /turf/open/floor/grass, /area/medical/genetics) "bsr" = ( @@ -27877,30 +27894,38 @@ /turf/open/floor/plasteel/dark, /area/science/server) "btg" = ( -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wrench, /obj/machinery/firealarm{ dir = 4; pixel_x = -28 }, -/obj/item/multitool, -/obj/item/multitool, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/book/manual/wiki/experimentor, +/obj/item/multitool, +/obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/explab) "bti" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "btl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27908,6 +27933,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "btp" = ( @@ -27915,6 +27941,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/explab) "bts" = ( @@ -27925,6 +27952,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/explab) "btt" = ( @@ -27939,6 +27967,7 @@ name = "Xenobiology Lab"; req_access_txt = "55" }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "btu" = ( @@ -28082,7 +28111,6 @@ /area/maintenance/department/engine) "btR" = ( /obj/structure/flora/ausbushes/brflowers, -/mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) "btS" = ( @@ -28091,8 +28119,6 @@ "btT" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/sunnybush, -/obj/item/reagent_containers/food/snacks/grown/banana, -/mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) "btU" = ( @@ -28465,6 +28491,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/xenobiology) "buL" = ( @@ -28534,10 +28561,6 @@ /turf/closed/wall/r_wall, /area/medical/genetics) "bvd" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics"; - req_access_txt = "9" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -28550,6 +28573,11 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "GeneticsDoor"; + name = "Cloning"; + req_one_access_txt = "5;9" + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bve" = ( @@ -29095,59 +29123,47 @@ }, /area/maintenance/department/engine) "bwu" = ( -/mob/living/carbon/monkey, +/mob/living/simple_animal/pet/dog/corgi, /turf/open/floor/grass, /area/medical/genetics) "bwv" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/pen, /obj/machinery/airalarm{ pixel_y = 22 }, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bww" = ( -/obj/machinery/computer/scan_consolenew, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwx" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/bed, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwz" = ( @@ -29156,28 +29172,24 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwA" = ( /obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 4; - pixel_y = 4 - }, /obj/item/storage/box/bodybags, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwB" = ( @@ -29653,6 +29665,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bxG" = ( @@ -29734,9 +29747,22 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bxP" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bxQ" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -29834,7 +29860,6 @@ /area/maintenance/department/engine) "byd" = ( /obj/structure/flora/junglebush/c, -/mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) "bye" = ( @@ -29848,29 +29873,20 @@ /turf/open/floor/grass, /area/medical/genetics) "byf" = ( -/obj/structure/table, -/obj/item/storage/box/disks, -/obj/item/flashlight/pen, -/obj/item/flashlight/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "byg" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/closed/wall/r_wall, +/area/science/genetics) "byh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -29891,8 +29907,6 @@ "byk" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/monkeycubes, /obj/machinery/light{ dir = 4 }, @@ -29900,10 +29914,10 @@ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "byl" = ( @@ -30555,25 +30569,29 @@ name = "Monkey Pen"; req_one_access_txt = "9" }, -/obj/item/reagent_containers/food/snacks/grown/banana, +/mob/living/simple_animal/pet/dog/corgi/puppy, /turf/open/floor/grass, /area/medical/genetics) "bzG" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bzH" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/genetics) "bzI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/genetics) "bzJ" = ( @@ -30597,10 +30615,10 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "bzM" = ( @@ -31074,29 +31092,31 @@ /turf/open/floor/grass, /area/medical/genetics) "bAQ" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/item/storage/pill_bottle/mutadone, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bAR" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bAS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -31125,10 +31145,10 @@ name = "Genetics Requests Console"; pixel_x = 32 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "bAW" = ( @@ -31624,51 +31644,46 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bBZ" = ( -/obj/structure/table, -/obj/item/pen, /obj/item/radio/intercom{ pixel_x = -27 }, -/obj/item/paper_bin{ - layer = 2.9 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bCa" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/bed, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/genetics) "bCb" = ( -/obj/machinery/dna_scannernew, /obj/machinery/camera{ c_tag = "Genetics"; dir = 1; network = list("ss13","medbay") }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/bed, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/genetics) "bCc" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/genetics) "bCd" = ( @@ -31681,11 +31696,11 @@ name = "Genetics APC"; pixel_x = 24 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "bCf" = ( @@ -32252,14 +32267,14 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bDl" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bDm" = ( @@ -32269,21 +32284,21 @@ dir = 1; pixel_y = -22 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/genetics) "bDn" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bDo" = ( @@ -33403,35 +33418,29 @@ id = "toxinsdriver"; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "bFx" = ( -/obj/structure/chair{ - dir = 1 +/obj/structure/flora/junglebush/large, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "bFy" = ( -/obj/structure/chair{ - dir = 1 +/mob/living/carbon/monkey, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/department/science) -"bFz" = ( -/obj/item/cigbutt/cigarbutt, -/turf/open/floor/plating, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "bFB" = ( /obj/item/newspaper, /turf/open/floor/plating, @@ -33980,19 +33989,14 @@ /turf/open/floor/plasteel, /area/science/mixing) "bGA" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Toxins Launch Maintenance"; - req_access_txt = "8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/closed/wall, /area/science/mixing) "bGB" = ( -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/light, +/turf/open/floor/grass, +/area/science/genetics) "bGD" = ( /obj/structure/window/reinforced{ dir = 4 @@ -49180,6 +49184,10 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"dfm" = ( +/obj/structure/sink/puddle, +/turf/open/floor/grass, +/area/science/genetics) "dfr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49282,15 +49290,17 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "dqw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12; 55" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics"; + req_access_txt = "9" + }, +/obj/structure/cable, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/genetics) "dqG" = ( /obj/machinery/light/small{ dir = 1 @@ -49628,6 +49638,13 @@ icon_state = "wood-broken" }, /area/maintenance/department/crew_quarters/dorms) +"eqX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/science/mixing) "eta" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Supplies"; @@ -49794,7 +49811,6 @@ /area/maintenance/department/security/brig) "eSL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/beacon, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -49805,6 +49821,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/beacon, /turf/open/floor/plasteel/dark, /area/science/explab) "eVy" = ( @@ -50759,6 +50776,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) +"gOV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/grass, +/area/science/genetics) "gPV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -50785,12 +50808,17 @@ }, /area/maintenance/department/engine) "gXg" = ( -/obj/item/extinguisher, -/obj/structure/closet/crate{ - icon_state = "crateopen" +/obj/machinery/computer/scan_consolenew{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "gXQ" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/cable, @@ -50834,7 +50862,7 @@ "hgD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/maintenance/department/science) +/area/science/genetics) "hiw" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -50953,10 +50981,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hxn" = ( -/obj/structure/chair, -/obj/item/clothing/glasses/regular, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/science/genetics) "hzc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51665,6 +51695,9 @@ icon_state = "platingdmg3" }, /area/maintenance/department/crew_quarters/dorms) +"jiD" = ( +/turf/closed/wall, +/area/science/genetics) "jjC" = ( /obj/structure/rack, /obj/item/storage/briefcase{ @@ -52108,11 +52141,16 @@ }, /area/maintenance/department/crew_quarters/dorms) "kkQ" = ( -/obj/machinery/vending/cola/pwr_game, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "klo" = ( /obj/structure/dresser, /obj/structure/mirror{ @@ -52437,18 +52475,21 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "kPi" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/noticeboard{ - pixel_y = 32 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 27 }, -/area/maintenance/department/science) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "kQy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52554,9 +52595,13 @@ /turf/open/floor/plating, /area/gateway) "ldQ" = ( -/obj/structure/floodlight_frame, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lem" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52570,6 +52615,12 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) +"lfI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/grass, +/area/science/genetics) "lhu" = ( /obj/machinery/shieldgen, /obj/machinery/light{ @@ -52702,6 +52753,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"lDw" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/science/genetics) "lEn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -52782,9 +52837,15 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "lNW" = ( -/obj/structure/grille, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lQn" = ( /obj/machinery/light/small{ dir = 1; @@ -53229,9 +53290,15 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "mSc" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/storage/box/rxglasses, +/obj/item/reagent_containers/dropper, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "mTS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53295,8 +53362,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/disks, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "new" = ( /obj/structure/chair/wood{ dir = 4 @@ -53789,13 +53867,9 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "obP" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plating{ - luminosity = 2 - }, -/area/maintenance/department/science) +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/science/genetics) "oep" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -54146,6 +54220,14 @@ icon_state = "platingdmg3" }, /area/maintenance/department/science) +"oKI" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/grassybush, +/mob/living/simple_animal/butterfly, +/turf/open/floor/grass, +/area/science/genetics) "oLR" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -54328,15 +54410,19 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "pdW" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/science/explab) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "pfP" = ( /obj/structure/table, /obj/item/storage/box/syringes, @@ -54885,6 +54971,10 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"qHc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/science/genetics) "qHu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55020,6 +55110,31 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"qXV" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Genetics Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "qYq" = ( /obj/item/wrench, /obj/effect/turf_decal/tile/green{ @@ -55112,6 +55227,13 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"rlj" = ( +/mob/living/carbon/monkey, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/grass, +/area/science/genetics) "rlV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/directions/evac{ @@ -55133,12 +55255,13 @@ /turf/open/space/basic, /area/space/nearstation) "roa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "ros" = ( @@ -55283,12 +55406,13 @@ /turf/open/floor/plating, /area/maintenance/department/science) "rFq" = ( -/obj/structure/chair, -/obj/item/reagent_containers/food/snacks/donkpocket, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/door/window/eastleft{ + dir = 1; + name = "Monkey Pen"; + req_one_access_txt = "9" }, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "rHA" = ( /turf/open/floor/plasteel, /area/construction/mining/aux_base) @@ -55333,11 +55457,19 @@ /turf/open/floor/plasteel, /area/security/main) "rKL" = ( -/obj/item/trash/cheesie, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "rLi" = ( /obj/machinery/button/door{ id = "shootshut"; @@ -55439,9 +55571,14 @@ /turf/open/floor/wood, /area/lawoffice) "sci" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "scp" = ( /obj/machinery/door/airlock/maintenance{ name = "Auxillary Base Maintenance"; @@ -55487,6 +55624,10 @@ /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /turf/open/floor/plating, /area/maintenance/department/engine) +"skj" = ( +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "skw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/closed/wall, @@ -55515,8 +55656,24 @@ /area/engine/supermatter) "spz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "sqh" = ( /obj/structure/chair{ dir = 8 @@ -55605,14 +55762,15 @@ }, /area/maintenance/department/security/brig) "syQ" = ( -/obj/machinery/vending/games, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/area/maintenance/department/science) +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "szG" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -56412,6 +56570,24 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/execution/transfer) +"urk" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "urG" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer3{ dir = 4 @@ -56466,10 +56642,8 @@ /turf/open/floor/plating, /area/science/xenobiology) "uvq" = ( -/obj/structure/table, -/obj/item/dice/d20, -/turf/open/floor/plating, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "uwb" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -56496,6 +56670,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/tcommsat/computer) +"uzx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Genetics maintenance"; + req_one_access_txt = "9" + }, +/turf/open/floor/plating, +/area/science/genetics) "uAU" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -57314,8 +57495,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "wGm" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden{ dir = 8 @@ -57493,6 +57682,13 @@ icon_state = "panelscorched" }, /area/maintenance/department/cargo) +"xan" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "xau" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -57540,6 +57736,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/lawoffice) +"xgt" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xgG" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -57547,6 +57751,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "xhj" = ( @@ -57595,10 +57800,19 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "xlA" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "xlB" = ( /obj/structure/cable, /turf/open/floor/plasteel/dark/telecomms, @@ -57779,6 +57993,19 @@ }, /turf/closed/wall/r_wall, /area/science/mixing/chamber) +"xIU" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xJy" = ( /obj/structure/chair/comfy/black, /obj/structure/sign/plaques/kiddie{ @@ -81241,12 +81468,12 @@ bnv bos bpw bqU -bsp -btS btS bwu -btS bwu +btS +btS +btS bAO bnv bDk @@ -82015,10 +82242,10 @@ bqW bsr btU bou -bww -byg +bwx +bpB bzH -bAR +bAS bCa bvc bEr @@ -98709,8 +98936,8 @@ bgL bht bbI biC -pdW -bjw +biz +aaj aak aam aaq @@ -100002,7 +100229,7 @@ aap aap bqv bqs -brJ +aaM buD bvZ bxJ @@ -100516,7 +100743,7 @@ bky bpo lAR bqs -bti +aaL buF bwb bxK @@ -100773,7 +101000,7 @@ boh boh bqx bqs -brJ +aaM buG bwc bxL @@ -101294,7 +101521,7 @@ ldQ lNW mSc sci -bwm +jiD glf bFr qtA @@ -101547,11 +101774,11 @@ brT bxF wkZ bnj -bwm -bwm -lWy +brJ +bsp +bAR gXg -bwm +jiD pNy bFs bGx @@ -101805,10 +102032,10 @@ roa buK dqw spz -spz -spz +bti +pdW wFT -bwm +jiD veM bFt bGy @@ -102062,7 +102289,7 @@ ume bkF bkF bkF -bkF +byg bxP nev hgD @@ -102319,12 +102546,12 @@ vMx xzp gdL iLl -bkF -bwm +byg +urk xlA -bwm -bAF -bAF +qHc +bAG +eqX bGA bAG fwr @@ -102576,14 +102803,14 @@ csu ofN ugC gdJ -bkF -lWy -cDB -lWy -tSL -lWy -cDB -bwm +byg +qXV +xIU +oKI +skj +lfI +rlj +jiD rBh bwm aht @@ -102833,14 +103060,14 @@ btu xpr uLi pXg -bkF +byg kPi -cDB +xgt hxn uvq bFx -tSL -bwm +gOV +jiD bIP bwm aht @@ -103090,14 +103317,14 @@ btv nuv ihk cPT -bkF +byg syQ -cDB +xgt rFq obP bFy bGB -bwm +jiD bIQ bwm aht @@ -103347,14 +103574,14 @@ dgz jxl tXn hfZ -bkF +byg kkQ rKL -lWy -lWy -bFz -lWy -xlA +xan +dfm +uvq +lDw +uzx bIR bwm aht diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 1a2ed41c69e..61198aa0ae8 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -131,14 +131,12 @@ #define BODYTEMP_COOLING_MAX -100 /// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. #define BODYTEMP_HEATING_MAX 30 -/// The body temperature limit the human body can take before it starts taking damage from heat. -/// This also affects how fast the body normalises it's temperature when hot. -/// 340k is about 66c, and rather high for a human. -#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) -/// The body temperature limit the human body can take before it starts taking damage from cold. -/// This also affects how fast the body normalises it's temperature when cold. -/// 270k is about -3c, that is below freezing and would hurt over time. -#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) + +/// The limit the human body can take before it starts taking damage from heat. +#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 50) +/// The limit the human body can take before it starts taking damage from coldness. +#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 50) + /// what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. #define SPACE_HELM_MIN_TEMP_PROTECT 2.0 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 9701014bb44..9f4966af3fa 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -79,12 +79,12 @@ #define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22 #define JOB_DISPLAY_ORDER_PARAMEDIC 23 #define JOB_DISPLAY_ORDER_CHEMIST 24 -#define JOB_DISPLAY_ORDER_GENETICIST 25 -#define JOB_DISPLAY_ORDER_VIROLOGIST 26 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 -#define JOB_DISPLAY_ORDER_SCIENTIST 28 -#define JOB_DISPLAY_ORDER_ROBOTICIST 29 +#define JOB_DISPLAY_ORDER_VIROLOGIST 25 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 +#define JOB_DISPLAY_ORDER_SCIENTIST 27 +#define JOB_DISPLAY_ORDER_ROBOTICIST 28 +#define JOB_DISPLAY_ORDER_GENETICIST 29 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 -#define JOB_DISPLAY_ORDER_WARDEN 30 -#define JOB_DISPLAY_ORDER_DETECTIVE 31 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32 +#define JOB_DISPLAY_ORDER_WARDEN 31 +#define JOB_DISPLAY_ORDER_DETECTIVE 32 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 73b4208d252..3d235bd1770 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -50,7 +50,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/reagent_containers/food/snacks/urinalcake = 1, /obj/item/airlock_painter = 1, - /obj/item/pipe = 1, /obj/item/rack_parts = 1, /obj/item/clothing/mask/breath = 1, /obj/item/shard = 1, @@ -84,10 +83,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/toy/crayon/spraycan = 1, ) = 1, - list(//strange objects - /obj/item/relic = 5, - ) = 1, - list(//equipment /obj/item/clothing/mask/gas = 1, /obj/item/radio/headset = 1, @@ -169,7 +164,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/grenade/iedcasing = 1, /obj/item/melee/baton/cattleprod = 1, /obj/item/throwing_star = 1, - ) = 1, + ) = 8, list(//equipment /obj/item/clothing/head/welding = 1, @@ -184,14 +179,18 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/clothing/mask/muzzle = 1, /obj/item/clothing/ears/earmuffs = 1, /obj/item/clothing/gloves/color/black = 1, - ) = 1, + ) = 8, + + list(//strange objects + /obj/item/relic = 5, + ) = 8, list(//construction and crafting /obj/item/stock_parts/cell/high = 1, /obj/item/stack/sheet/mineral/wood/fifty = 1, /obj/item/beacon = 1, /obj/item/weaponcrafting/receiver = 1, - ) = 1, + ) = 8, list(//medical and chemicals list(//basic healing items @@ -212,7 +211,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/watertank = 1, /obj/item/watertank/janitor = 1, ) = 1, - ) = 1, + ) = 8, list(//food /obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1, @@ -223,15 +222,27 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/donkpockets/donkpocketpizza = 1, /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, - ) = 1, + ) = 1, /obj/item/reagent_containers/food/snacks/monkeycube = 1, + ) = 8, + + list(//fakeout items, keep this list at low relative weight + /obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities + /obj/item/clothing/shoes/jackboots = 1, ) = 1, )) GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items - //keeping commented out until there are more, otherwise the same ones may appear too often - // /obj/effect/rune/teleport = 1, - "" = 1 //nothing, so loot spawner doesn't break while nothing else is here + /obj/effect/rune/teleport = 1, + /obj/item/clothing/gloves/color/yellow = 1, + /obj/item/clothing/head/helmet/abductor = 1, + /obj/item/clothing/head/helmet/justice =1, + /obj/item/clothing/suit/space/hardsuit/carp = 1, + /obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool. + /obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1 + /obj/item/clothing/shoes/jackboots/fast = 1, + /obj/item/clothing/suit/armor/reactive/table = 1, + /obj/item/storage/box/donkpockets/donkpocketgondola = 1 )) //Maintenance loot spawner pools diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 7b0f56d512e..5092c590a6c 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -82,7 +82,7 @@ var/needed_amount = R.reqs[requirement_path] for(var/content_item_path in contents) // Right path and not blacklisted - if(!ispath(content_item_path, requirement_path) || R.blacklist.Find(requirement_path)) + if(!ispath(content_item_path, requirement_path) || R.blacklist.Find(content_item_path)) continue needed_amount -= contents[content_item_path] diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 3912197db75..3531b199da0 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -901,6 +901,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmix" valid_territory = FALSE +/area/science/genetics + name = "Genetics Lab" + icon_state = "geneticssci" + /area/science/misc_lab name = "Testing Lab" icon_state = "toxmisc" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index bc797dd5112..d21ffbcaeca 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -102,7 +102,7 @@ item_state = "banner_medical" lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi' - job_loyalties = list("Medical Doctor", "Chemist", "Geneticist", "Virologist", "Chief Medical Officer") + job_loyalties = list("Medical Doctor", "Chemist", "Virologist", "Chief Medical Officer") warcry = "No wounds cannot be healed!" /obj/item/banner/medical/mundane @@ -131,7 +131,7 @@ item_state = "banner_science" lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi' - job_loyalties = list("Scientist", "Roboticist", "Research Director") + job_loyalties = list("Scientist", "Roboticist", "Research Director", "Geneticist",) warcry = "For Cuban Pete!" /obj/item/banner/science/mundane diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 10bd88f12da..5d618a1cd92 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -243,7 +243,7 @@ /obj/structure/closet/wardrobe/genetics_white/PopulateContents() var/static/items_inside = list( - /obj/item/clothing/under/rank/medical/geneticist = 2, + /obj/item/clothing/under/rank/rnd/geneticist = 2, /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/genetics = 2, /obj/item/storage/backpack/genetics = 2, diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm index 1de2e406121..6693e01bfa0 100644 --- a/code/modules/antagonists/devil/devil_helpers.dm +++ b/code/modules/antagonists/devil/devil_helpers.dm @@ -14,7 +14,7 @@ /obj/item/clothing/under/rank/rnd/scientist = 1, /obj/item/clothing/under/rank/medical/chemist = 1, /obj/item/clothing/under/rank/medical/chief_medical_officer = 1, - /obj/item/clothing/under/rank/medical/geneticist = 1, + /obj/item/clothing/under/rank/rnd/geneticist = 1, /obj/item/clothing/under/rank/medical/virologist = 1, /obj/item/clothing/under/rank/medical/doctor/nurse = 1, /obj/item/clothing/under/rank/medical/doctor = 1, diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 9a3b832b77c..cebfc1641cd 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -171,17 +171,9 @@ var/reusable = TRUE var/used = FALSE -/obj/item/dice/d20/fate/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - /obj/item/dice/d20/fate/one_use reusable = FALSE -/obj/item/dice/d20/fate/one_use/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - /obj/item/dice/d20/fate/cursed name = "cursed Die of Fate" desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea." @@ -190,6 +182,23 @@ rigged = DICE_TOTALLY_RIGGED rigged_value = 1 +/obj/item/dice/d20/fate/cursed/one_use + reusable = FALSE + +/obj/item/dice/d20/fate/stealth + name = "d20" + desc = "A die with twenty sides. The preferred die to throw at the GM." + +/obj/item/dice/d20/fate/stealth/one_use + reusable = FALSE + +/obj/item/dice/d20/fate/stealth/cursed + rigged = DICE_TOTALLY_RIGGED + rigged_value = 1 + +/obj/item/dice/d20/fate/stealth/cursed/one_use + reusable = FALSE + /obj/item/dice/d20/fate/diceroll(mob/user) . = ..() if(!used) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 550730b001b..ecde111fb6c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2333,19 +2333,19 @@ /datum/supply_pack/costumes_toys/wardrobes/medical name = "Medical Wardrobe Supply Crate" - desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe." + desc = "This crate contains refills for the MediDrobe, ChemDrobe, and ViroDrobe." cost = 3000 contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe, /obj/item/vending_refill/wardrobe/chem_wardrobe, - /obj/item/vending_refill/wardrobe/gene_wardrobe, /obj/item/vending_refill/wardrobe/viro_wardrobe) crate_name = "medical department wardrobe supply crate" /datum/supply_pack/costumes_toys/wardrobes/science name = "Science Wardrobe Supply Crate" - desc = "This crate contains refills for the SciDrobe and RoboDrobe." + desc = "This crate contains refills for the SciDrobe, GeneDrobe, and RoboDrobe." cost = 1500 contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe, + /obj/item/vending_refill/wardrobe/gene_wardrobe, /obj/item/vending_refill/wardrobe/science_wardrobe) crate_name = "science department wardrobe supply crate" diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 94ebf7ee326..7b9f193ba9e 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -19,23 +19,6 @@ can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP -/obj/item/clothing/under/rank/medical/geneticist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." - name = "geneticist's jumpsuit" - icon_state = "genetics" - item_state = "w_suit" - permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - -/obj/item/clothing/under/rank/medical/geneticist/skirt - name = "geneticist's jumpskirt" - desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." - icon_state = "geneticswhite_skirt" - item_state = "w_suit" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - /obj/item/clothing/under/rank/medical/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." name = "virologist's jumpsuit" diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index b4205a97100..c4d04278094 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -87,3 +87,20 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/rnd/geneticist + desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." + name = "geneticist's jumpsuit" + icon_state = "genetics" + item_state = "w_suit" + permeability_coefficient = 0.5 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/under/rank/rnd/geneticist/skirt + name = "geneticist's jumpskirt" + desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." + icon_state = "geneticswhite_skirt" + item_state = "w_suit" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 481a3993236..f2af09397e4 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -170,7 +170,7 @@ if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY) + return list(ACCESS_MEDICAL, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY) if(4) //research return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(5) //engineering and maintenance diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 2a2eb08cd8a..24dcb487b58 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -1,20 +1,20 @@ /datum/job/geneticist title = "Geneticist" flag = GENETICIST - department_head = list("Chief Medical Officer", "Research Director") + department_head = list("Research Director") department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the chief medical officer and research director" + supervisors = "the research director" selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 outfit = /datum/outfit/job/geneticist - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) + minimal_access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -26,7 +26,7 @@ belt = /obj/item/pda/geneticist ears = /obj/item/radio/headset/headset_medsci - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/genetics suit_store = /obj/item/flashlight/pen diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 45903b24457..21145daa2bc 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(medical_positions, list( "Chief Medical Officer", "Medical Doctor", "Paramedic", - "Geneticist", "Virologist", "Chemist")) @@ -25,6 +24,7 @@ GLOBAL_LIST_INIT(medical_positions, list( GLOBAL_LIST_INIT(science_positions, list( "Research Director", "Scientist", + "Geneticist", "Roboticist")) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 8a21dd28e58..87501bc44f8 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -18,8 +18,7 @@ status_flags = CANUNCONSCIOUS|CANPUSH - heat_protection = 0.5 // minor heat insulation - + var/heat_protection = 0.5 var/leaping = 0 gib_type = /obj/effect/decal/cleanable/xenoblood/xgibs unique_name = 1 @@ -49,9 +48,22 @@ return -10 /mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment) - // Run base mob body temperature proc before taking damage - // this balances body temp to the enviroment and natural stabilization - . = ..() + if(!environment) + return + + var/loc_temp = get_temperature(environment) + + // Aliens are now weak to fire. + + //After then, it reacts to the surrounding atmosphere based on your thermal protection + if(!on_fire) // If you're on fire, ignore local air temperature + if(loc_temp > bodytemperature) + //Place is hotter than we are + var/thermal_protection = heat_protection //This returns a 0 - 1 value, which corresponds to the percentage of heat protection. + if(thermal_protection < 1) + adjust_bodytemperature((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)) + else + adjust_bodytemperature(1 * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)) if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) //Body temperature is too hot. diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index a343ccae1eb..6862d7ce05d 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -16,7 +16,7 @@ var/disgust = 0 - //inventory slots +//inventory slots var/obj/item/back = null var/obj/item/clothing/mask/wear_mask = null var/obj/item/clothing/neck/wear_neck = null @@ -28,7 +28,7 @@ var/obj/item/clothing/glasses/glasses = null //only used by humans. var/obj/item/clothing/ears = null //only used by humans. - var/datum/dna/dna = null // Carbon + var/datum/dna/dna = null//Carbon var/datum/mind/last_mind = null //last mind to control this mob, for blood-based cloning var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks. @@ -64,9 +64,3 @@ var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects var/stam_regen_start_time = 0 //used to halt stamina regen temporarily var/stam_paralyzed = FALSE //knocks you down - - // Protection from the elements - // This is insulation against increasing or decreasing body temperature - // 0 - 1 value which corresponds to the percentage of protection - var/heat_protection = 0 // No heat protection - var/cold_protection = 0 // No cold protection diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ec2e3ee98c5..62d3321206d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -106,14 +106,7 @@ lun.check_breath(breath,src) /mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) - // If we are in a cryo bed do not process life functions - if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) - return - - // hand off to the species handlers dna.species.handle_environment(environment, src) - dna.species.handle_environment_pressure(environment, src) - dna.species.handle_body_temperature(src) ///FIRE CODE /mob/living/carbon/human/handle_fire() @@ -181,15 +174,10 @@ return thermal_protection_flags -// Temperature is the temperature you're being exposed to. -// This returns a 0 - 1 value which corresponds to the percentage of protection -/mob/living/carbon/human/get_heat_protection(temperature) +/mob/living/carbon/human/proc/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = get_heat_protection_flags(temperature) - // Apply the mobs base protection - var/thermal_protection = heat_protection - - // Apply clothing items protection + var/thermal_protection = 0 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) thermal_protection += THERMAL_PROTECTION_HEAD @@ -214,6 +202,7 @@ if(thermal_protection_flags & HAND_RIGHT) thermal_protection += THERMAL_PROTECTION_HAND_RIGHT + return min(1,thermal_protection) //See proc/get_heat_protection_flags(temperature) for the description of this proc. @@ -242,19 +231,11 @@ return thermal_protection_flags -// Temperature is the temperature you're being exposed to. -// This returns a 0 - 1 value which corresponds to the percentage of protection -/mob/living/carbon/human/get_cold_protection(temperature) - // There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them. - // This is necessary to ensure that does not affect this calculation. - // Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K. - temperature = max(temperature, 2.7) +/mob/living/carbon/human/proc/get_cold_protection(temperature) + temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K. var/thermal_protection_flags = get_cold_protection_flags(temperature) - // Apply the mobs base protection - var/thermal_protection = cold_protection - - // Apply clothing items protection + var/thermal_protection = 0 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) thermal_protection += THERMAL_PROTECTION_HEAD diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index fa2b988d0e2..6ae31b7febd 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -54,13 +54,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/datum/action/innate/flight/fly //the actual flying ability given to flying species var/wings_icon = "Angel" //the icon used for the wings - // Body temperature defaults - // this enables different species to have different body temperature settings - var/bodytemp_normal = BODYTEMP_NORMAL - var/bodytemp_autorecovery_min = BODYTEMP_AUTORECOVERY_MINIMUM - var/bodytemp_heat_damage_limit = BODYTEMP_HEAT_DAMAGE_LIMIT - var/bodytemp_cold_damage_limit = BODYTEMP_COLD_DAMAGE_LIMIT - // species-only traits. Can be found in DNA.dm var/list/species_traits = list() // generic traits tied to having the species @@ -93,7 +86,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) //Think magic mirror and pride mirror, slime extract, ERT etc, see defines //in __DEFINES/mobs.dm, defaults to NONE, so people actually have to think about it var/changesource_flags = NONE - /////////// // PROCS // /////////// @@ -1613,91 +1605,55 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(HAS_TRAIT(H, TRAIT_NOBREATH)) return TRUE -////////////////////////// -// ENVIRONMENT HANDLERS // -////////////////////////// -/// Handle the environment for the species /datum/species/proc/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H) - // Get the temperature of the current area - var/areatemp = H.get_temperature(environment) + if(!environment) + return + if(istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) + return - // Part one of body temperature stability have the body try and normalize on it's own - var/natural = 0 - // If you are dead your body does not stabilize naturally - if(H.stat != DEAD) - // Get the amount of change in temp the body will apply on it's own - natural = natural_bodytemperature_stabilization(H) + var/loc_temp = H.get_temperature(environment) - // Get the mobs thermal protection and environmental change - var/thermal_protection = 1 // The inverse of the amount of protection - var/environment_change = 0 // The amount of change the enviroment is causing - var/natural_change = 0 // the amount of change from natural stabilization after thermal protection + //Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment + //Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places) + if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases + var/natural = 0 + if(H.stat != DEAD) + natural = H.natural_bodytemperature_stabilization() + var/thermal_protection = 1 + if(loc_temp < H.bodytemperature) //Place is colder than we are + thermal_protection -= H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(H.bodytemperature < BODYTEMP_NORMAL) //we're cold, insulation helps us retain body heat and will reduce the heat we lose to the environment + H.adjust_bodytemperature((thermal_protection+1)*natural + max(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)) + else //we're sweating, insulation hinders our ability to reduce heat - and it will reduce the amount of cooling you get from the environment + H.adjust_bodytemperature(natural*(1/(thermal_protection+1)) + max((thermal_protection * (loc_temp - H.bodytemperature) + BODYTEMP_NORMAL - H.bodytemperature) / BODYTEMP_COLD_DIVISOR , BODYTEMP_COOLING_MAX)) //Extra calculation for hardsuits to bleed off heat + if (loc_temp > H.bodytemperature) //Place is hotter than we are + var/natural = 0 + if(H.stat != DEAD) + natural = H.natural_bodytemperature_stabilization() + var/thermal_protection = 1 + thermal_protection -= H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(H.bodytemperature < BODYTEMP_NORMAL) //and we're cold, insulation enhances our ability to retain body heat but reduces the heat we get from the environment + H.adjust_bodytemperature((thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)) + else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment + H.adjust_bodytemperature(natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)) - if(areatemp > H.bodytemperature) // It is hot here - // Get the thermal protection of the mob - // This returns a 0 - 1 value which corresponds to the percentage of protection - thermal_protection -= H.get_heat_protection(areatemp) - // How much the environment heats the mob with thermal protection - environment_change = min(thermal_protection * (areatemp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, \ - BODYTEMP_HEATING_MAX) + // +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt. + if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTHEAT)) + //Body temperature is too hot. - if(H.bodytemperature < bodytemp_normal) - // Our bodytemp is below normal, insulation helps us retain body heat - // and will reduce the heat we lose to the environment - natural_change = (thermal_protection + 1) * natural - else - // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat - // but will reduce the amount of heat we get from the environment - natural_change = (1 / (thermal_protection + 1)) * natural - - else // It is cold here - // Get the thermal protection of the mob, this returns a 0 - 1 value - // which corresponds to the percentage of protection - thermal_protection -= H.get_cold_protection(areatemp) - - if(!H.on_fire) // If we are on fire ignore local temperature in cold areas - if(H.bodytemperature < bodytemp_normal) - // Our bodytemp is below normal, insulation helps us retain body heat - // and will reduce the heat we lose to the environment - natural_change = (thermal_protection + 1) * natural - // How much the environment cools the mob with thermal protection - environment_change = max(thermal_protection * (areatemp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, \ - BODYTEMP_COOLING_MAX) - else - // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat - // but will reduce the amount of heat we get from the environment - natural_change = (1 / (thermal_protection + 1)) * natural - // How much the environment cools the mob with thermal protection - // Extra calculation for hardsuits to bleed off heat - environment_change = max((thermal_protection * (areatemp - H.bodytemperature) + bodytemp_normal - \ - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX) - - // Apply the temperature changes, combining natual and enviromental changes - H.adjust_bodytemperature(natural_change + environment_change) - -/// Handle the body temperature status effects for the species -/datum/species/proc/handle_body_temperature(mob/living/carbon/human/H) - // +30, -40 degrees from 310K is the 'safe' zone for humans, where no damage is dealt. - // Traits for resitance to heat or cold are handled here. - - // Body temperature is too hot, and we do not have resist traits - if(H.bodytemperature > bodytemp_heat_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTHEAT)) - // Clear cold mood and apply hot mood SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold") SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot) - // Remove any slow down from the cold H.remove_movespeed_modifier(MOVESPEED_ID_COLD) - var/burn_damage = 0 + var/burn_damage var/firemodifier = H.fire_stacks / 50 - if (!H.on_fire) // We are not on fire, reduce the modifier + if (H.on_fire) + burn_damage = max(log(2-firemodifier,(H.bodytemperature-BODYTEMP_NORMAL))-5,0) + else firemodifier = min(firemodifier, 0) - // this can go below 5 at log 2.5 - burn_damage = max(log(2 - firemodifier, (H.bodytemperature - bodytemp_normal)) - 5,0) - - // Display alerts based on the amount of fire damage being taken + burn_damage = max(log(2-firemodifier,(H.bodytemperature-BODYTEMP_NORMAL))-5,0) // this can go below 5 at log 2.5 if (burn_damage) switch(burn_damage) if(0 to 2) @@ -1706,122 +1662,55 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.throw_alert("temp", /obj/screen/alert/hot, 2) else H.throw_alert("temp", /obj/screen/alert/hot, 3) - - // Apply species and physiology modifiers to heat damage burn_damage = burn_damage * heatmod * H.physiology.heat_mod - - // 40% for level 3 damage on humans to scream in pain - if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4) + if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4) //40% for level 3 damage on humans H.emote("scream") - - // Apply the damage to all body parts H.apply_damage(burn_damage, BURN, spread_damage = TRUE) - // Body temperature is too cold, and we do not have resist traits - else if(H.bodytemperature < bodytemp_cold_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTCOLD)) - // clear any hot moods and apply cold mood + else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD)) SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot") SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold) - - // Apply cold slow down - H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, \ - multiplicative_slowdown = ((bodytemp_cold_damage_limit - H.bodytemperature) / COLD_SLOWDOWN_FACTOR), \ - blacklisted_movetypes = FLOATING) - - // Display alerts based on the amount of cold damage being taken - // Apply more damage based on how cold you are + //Sorry for the nasty oneline but I don't want to assign a variable on something run pretty frequently + H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR), blacklisted_movetypes = FLOATING) switch(H.bodytemperature) - if(200 to bodytemp_cold_damage_limit) + if(200 to BODYTEMP_COLD_DAMAGE_LIMIT) H.throw_alert("temp", /obj/screen/alert/cold, 1) - H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN) + H.apply_damage(COLD_DAMAGE_LEVEL_1*coldmod*H.physiology.cold_mod, BURN) if(120 to 200) H.throw_alert("temp", /obj/screen/alert/cold, 2) - H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN) + H.apply_damage(COLD_DAMAGE_LEVEL_2*coldmod*H.physiology.cold_mod, BURN) else H.throw_alert("temp", /obj/screen/alert/cold, 3) - H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN) + H.apply_damage(COLD_DAMAGE_LEVEL_3*coldmod*H.physiology.cold_mod, BURN) - // We are not to hot or cold, remove status and moods else H.clear_alert("temp") H.remove_movespeed_modifier(MOVESPEED_ID_COLD) SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold") SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot") -// Handle the air pressure of the environment -// This allows for species overrides -/datum/species/proc/handle_environment_pressure(datum/gas_mixture/environment, mob/living/carbon/human/H) - // Get the current pressure for the area var/pressure = environment.return_pressure() - // Returns how much pressure actually affects the mob. - var/adjusted_pressure = H.calculate_affecting_pressure(pressure) - - // Set alerts and apply damage based on the amount of pressure + var/adjusted_pressure = H.calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob. switch(adjusted_pressure) - - // Very high pressure, show an alert and take damage if(HAZARD_HIGH_PRESSURE to INFINITY) if(!HAS_TRAIT(H, TRAIT_RESISTHIGHPRESSURE)) - H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * \ - PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod) + H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod) H.throw_alert("pressure", /obj/screen/alert/highpressure, 2) else H.clear_alert("pressure") - - // High pressure, show an alert if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE) H.throw_alert("pressure", /obj/screen/alert/highpressure, 1) - - // No pressure issues here clear pressure alerts if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE) H.clear_alert("pressure") - - // Low pressure here, show an alert if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE) - // We have low pressure resit trait, clear alerts - if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE)) - H.clear_alert("pressure") - else - H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1) - - // Very low pressure, show an alert and take damage + H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1) else - // We have low pressure resit trait, clear alerts if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE)) H.clear_alert("pressure") else H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod) H.throw_alert("pressure", /obj/screen/alert/lowpressure, 2) -// Used to stabilize the normal body temperature on living mobs -// returns the amount of change to body temperature -/datum/species/proc/natural_bodytemperature_stabilization(mob/living/carbon/human/H) - // Get the difference between our current body temp and what is a normal body temp - var/body_temperature_difference = bodytemp_normal - H.bodytemperature - - switch(H.bodytemperature) - - // When below the cold damage limit body temp raises faster - if(-INFINITY to bodytemp_cold_damage_limit) - return max((body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), \ - bodytemp_autorecovery_min) - - // When above the cold damage limit the body temp raises slower - if(bodytemp_cold_damage_limit to bodytemp_normal) - return max(body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \ - min(body_temperature_difference, bodytemp_autorecovery_min / 4)) - - // When below the heat damage limit the body temp lowers slower - if(bodytemp_normal to bodytemp_heat_damage_limit) - return min(body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \ - max(body_temperature_difference, -bodytemp_autorecovery_min / 4)) - - // When above the heat damage limit bring the body temp down faster - // We're dealing with negative numbers - if(bodytemp_heat_damage_limit to INFINITY) - return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -bodytemp_autorecovery_min) - - ////////// // FIRE // ////////// diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index e83667baea0..51635af5016 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -20,12 +20,6 @@ inherent_traits = list(TRAIT_NOHUNGER) sexes = FALSE //no fetish content allowed toxic_food = NONE - // Body temperature for ethereals is much higher - // they can handle hotter environments - // but they are hurt at cold temps faster as it is harder to move with out the heat energy - bodytemp_normal = (BODYTEMP_NORMAL + 50) - bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C - bodytemp_cold_damage_limit = (T20C - 10) // about 10c var/current_color var/EMPeffect = FALSE var/emageffect = FALSE @@ -37,6 +31,7 @@ var/static/b2 = 149 //this is shit but how do i fix it? no clue. + /datum/species/ethereal/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) .=..() if(ishuman(C)) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c6d6cf8fad5..56bf72b996e 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -25,15 +25,6 @@ deathsound = 'sound/voice/lizard/deathsound.ogg' wings_icon = "Dragon" species_language_holder = /datum/language_holder/lizard - // lizards are coldblooded - // and can stand a higher temperature range by a few points - bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + 10) - bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 10) - -// Lizards are cold blooded and do not stabilize body temperature naturally -// Return the the amount of change in temperature -/datum/species/lizard/natural_bodytemperature_stabilization(mob/living/carbon/human/H) - return 0 // No natural temperature change, only enviromental /datum/species/lizard/random_name(gender,unique,lastname) if(unique) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 8a3392df3ae..65484b964c3 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -23,17 +23,6 @@ outfit_important_for_life = /datum/outfit/plasmaman species_language_holder = /datum/language_holder/skeleton - // Body temperature for Plasmen is much lower - // they can handle colder environments - // but they are hurt at hot temps faster as it is harder to hold their form - // and they will regain temperature more slowly in some situations - bodytemp_normal = (BODYTEMP_NORMAL - 40) - bodytemp_autorecovery_min = 2 - bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT - 20) // about 40C - // In the event they loss the cold resit trait - // This also has an effect on how fast they stabilize body temp - bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 50) // about -50c - /datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() var/atmos_sealed = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 9bdd890d4e9..ef5f8546502 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -15,11 +15,6 @@ disliked_food = NONE liked_food = GROSS | MEAT | RAW changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN - // zombies have no body heat unless the environment gives it to them - // they will take damage when things catch fire, or when it is to cold to move - bodytemp_normal = T0C - bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - bodytemp_cold_damage_limit = MINIMUM_TEMPERATURE_TO_MOVE /datum/species/zombie/check_roundstart_eligible() if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) @@ -38,14 +33,10 @@ var/regen_cooldown = 0 changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN -// Zombies do not stabilize body temperature they are the walking dead and are cold blooded -// Return the the amount of change in temperature -/datum/species/zombie/natural_bodytemperature_stabilization(mob/living/carbon/human/H) - return 0 // No natural temperature change, only enviromental - /datum/species/zombie/infectious/check_roundstart_eligible() return FALSE + /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount) . = min(20, amount) @@ -89,6 +80,7 @@ infection = new() infection.Insert(C) + // Your skin falls off /datum/species/krokodil_addict name = "Human" diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 40be2346c87..72200d457e6 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -567,91 +567,18 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(drunkenness >= 101) adjustToxLoss(2) //Let's be honest you shouldn't be alive by now -// Base carbon environment handler -/mob/living/carbon/handle_environment(datum/gas_mixture/environment) - // Get the curent temperature of the area - var/areatemp = get_temperature(environment) - - // Have the body regulate it's own temperature - var/natural = 0 - if(stat != DEAD) - natural = natural_bodytemperature_stabilization() - - // Get the mobs thermal protection and environmental change - var/thermal_protection = 1 - var/environment_change = 0 - var/natural_change = 0 - if(areatemp > bodytemperature) // It is hot here - // Get the thermal protection of the mob, - // This returns a 0 - 1 value which corresponds to the percentage of protection - thermal_protection -= get_heat_protection(areatemp) - // How much the environment heats the mob - // with thermal protection - environment_change = min(thermal_protection * (areatemp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX) - if(bodytemperature < BODYTEMP_NORMAL) - // Our bodytemp is below normal we are cold, insulation helps us retain body heat - // and will reduce the heat we lose to the environment - natural_change = (thermal_protection + 1) * natural - else - // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat - // but will reduce the amount of heat we get from the environment - natural_change = (1 / (thermal_protection + 1)) * natural - else // It is cold here - // Get the thermal protection of the mob, this returns a 0 - 1 value - // which corresponds to the percentage of protection - thermal_protection -= get_cold_protection(areatemp) - if(!on_fire) // If on fire ignore ignore local temperature in cold areas - // How much the environment cools the mob - // with thermal protection - environment_change = max(thermal_protection * (areatemp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX) - if(bodytemperature < BODYTEMP_NORMAL) - // Our bodytemp is below normal, insulation helps us retain body heat - // and will reduce the heat we lose to the environment - natural_change = (thermal_protection + 1) * natural - else - // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat - // but will reduce the amount of heat we get from the environment - natural_change = (1 / (thermal_protection + 1)) * natural - - // Apply the temperature changes - adjust_bodytemperature(natural_change + environment_change) - -// Used to stabilize the normal body temperature on living mobs +//used in human and monkey handle_environment() /mob/living/carbon/proc/natural_bodytemperature_stabilization() - // Get the difference between our current body temp and what is a normal body temp var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature - switch(bodytemperature) - - // When below the cold damage limit body temp raises faster - if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) - return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), \ - BODYTEMP_AUTORECOVERY_MINIMUM) - - // When above the cold damage limit the body temp raises slower + if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //Cold damage limit is 50 below the default, the temperature where you start to feel effects. + return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) if(BODYTEMP_COLD_DAMAGE_LIMIT to BODYTEMP_NORMAL) - return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \ - min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM / 4)) - - // When below the heat damage limit the body temp lowers slower - if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) - return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \ - max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM / 4)) - - // When above the heat damage limit bring the body temp down faster - // We're dealing with negative numbers + return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4)) + if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) // Heat damage limit is 50 above the default, the temperature where you start to feel effects. + return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4)) if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) - return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) - -// Temperature is the temperature you're being exposed to. -// This returns a 0 - 1 value which corresponds to the percentage of protection -/mob/living/carbon/proc/get_heat_protection(temperature) - return heat_protection - -// Temperature is the temperature you're being exposed to. -// This returns a 0 - 1 value which corresponds to the percentage of protection -/mob/living/carbon/proc/get_cold_protection(temperature) - return cold_protection + return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers ///////// //LIVER// diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index f9a0f9443ef..ad54eb08a19 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -68,9 +68,20 @@ . = ..() // interact with body heat after dealing with the hot air /mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment) - // Run base mob body temperature proc before taking damage - // this balances body temp to the enviroment and natural stabilization - . = ..() + if(!environment) + return + + var/loc_temp = get_temperature(environment) + + if(stat != DEAD) + adjust_bodytemperature(natural_bodytemperature_stabilization()) + + if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases + if(loc_temp < bodytemperature) + adjust_bodytemperature(max((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)) + else + adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)) + if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT)) switch(bodytemperature) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index ea64a99d237..b1c48aa8c90 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -1,7 +1,3 @@ -// This is the divisor which comes into play when the mob's loc temperature is different than their body temperature. -// Make this lower to change body temp faster. -#define BODYTEMP_DIVISOR 8 - /mob/living/proc/Life(seconds, times_fired) set waitfor = FALSE set invisibility = 0 @@ -88,15 +84,7 @@ return /mob/living/proc/handle_environment(datum/gas_mixture/environment) - // Get the current air temperature - var/loc_temp = get_temperature(environment) - - // Update the body temperature - if(loc_temp < bodytemperature) // it is cold here - if(!on_fire) // do not reduce body temp when on fire - adjust_bodytemperature(max((loc_temp - bodytemperature) / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX)) - else // this is a hot place - adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX)) + return /mob/living/proc/handle_fire() if(fire_stacks < 0) //If we've doused ourselves in water to avoid fire, dry off slowly @@ -155,5 +143,3 @@ if(gravity >= GRAVITY_DAMAGE_TRESHOLD) //Aka gravity values of 3 or more var/grav_stregth = gravity - GRAVITY_DAMAGE_TRESHOLD adjustBruteLoss(min(grav_stregth,3)) - -#undef BODYTEMP_DIVISOR diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 3086e0ae094..88589b550b8 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -108,22 +108,14 @@ AIproc = 0 /mob/living/simple_animal/slime/handle_environment(datum/gas_mixture/environment) - // Get the current air temperature + if(!environment) + return + var/loc_temp = get_temperature(environment) - // This divisor controls how fast body temperature changes - // lowering this number changes body temp faster - var/divisor = 10 - // If the difference is great then reduce the divisor to stabilize faster - if(abs(loc_temp - bodytemperature) > 50) - divisor = 5 + adjust_bodytemperature(adjust_body_temperature(bodytemperature, loc_temp, 1)) - // Update the body temperature - if(loc_temp < bodytemperature) // It is cold here - if(!on_fire) // Do not reduce body temp when on fire - adjust_bodytemperature((loc_temp - bodytemperature) / divisor) - else // This is a hot place - adjust_bodytemperature((loc_temp - bodytemperature) / divisor) + //Account for massive pressure differences if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc if(bodytemperature <= (T0C - 40)) // stun temperature @@ -134,6 +126,7 @@ adjustBruteLoss(200) else adjustBruteLoss(round(sqrt(bodytemperature)) * 2) + else Tempstun = 0 @@ -158,8 +151,26 @@ updatehealth() + return //TODO: DEFERRED +/mob/living/simple_animal/slime/proc/adjust_body_temperature(current, loc_temp, boost) + var/temperature = current + var/difference = abs(current-loc_temp) //get difference + var/increments// = difference/10 //find how many increments apart they are + if(difference > 50) + increments = difference/5 + else + increments = difference/10 + var/change = increments*boost // Get the amount to change by (x per increment) + var/temp_change + if(current < loc_temp) + temperature = min(loc_temp, temperature+change) + else if(current > loc_temp) + temperature = max(loc_temp, temperature-change) + temp_change = (temperature - current) + return temp_change + /mob/living/simple_animal/slime/handle_status_effects() ..() if(prob(30) && !stat) diff --git a/code/modules/mob/living/simple_animal/status_procs.dm b/code/modules/mob/living/simple_animal/status_procs.dm index c5f0c8cb4b9..62a262f9e60 100644 --- a/code/modules/mob/living/simple_animal/status_procs.dm +++ b/code/modules/mob/living/simple_animal/status_procs.dm @@ -8,6 +8,8 @@ /mob/living/simple_animal/set_blindness() return + + /mob/living/simple_animal/blur_eyes() return @@ -17,5 +19,7 @@ /mob/living/simple_animal/set_blurriness() return + + /mob/living/simple_animal/become_blind() return diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm index af47d6360a7..7b9db10548c 100644 --- a/code/modules/reagents/reagent_containers/medigel.dm +++ b/code/modules/reagents/reagent_containers/medigel.dm @@ -70,17 +70,17 @@ name = "medical gel (libital)" desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains libital, for treating cuts and bruises. Libital does minor liver damage. Diluted with granibitaluri." icon_state = "brutegel" - list_reagents = list(/datum/reagent/medicine/C2/libital = 20, /datum/reagent/medicine/granibitaluri = 40) + list_reagents = list(/datum/reagent/medicine/C2/libital = 24, /datum/reagent/medicine/granibitaluri = 36) /obj/item/reagent_containers/medigel/aiuri name = "medical gel (aiuri)" desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains aiuri, useful for treating burns. Aiuri does minor eye damage. Diluted with granibitaluri." icon_state = "burngel" - list_reagents = list(/datum/reagent/medicine/C2/aiuri = 20, /datum/reagent/medicine/granibitaluri = 40) + list_reagents = list(/datum/reagent/medicine/C2/aiuri = 24, /datum/reagent/medicine/granibitaluri = 36) /obj/item/reagent_containers/medigel/instabitaluri name = "medical gel (instabitaluri)" - desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains instabitaluri, a brute and burn healing agent." + desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains instabitaluri, a slightly toxic medicine capable of healing both bruises and burns." icon_state = "synthgel" list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 60) custom_price = 600 diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index c22228e3814..10672f1158d 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -41,6 +41,6 @@ /obj/item/reagent_containers/pill/patch/instabitaluri name = "instabitaluri patch" - desc = "Helps with brute and burn injuries." + desc = "Helps with brute and burn injuries. Slightly toxic." list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 20) icon_state = "bandaid_both" diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 6ef72843aa7..e4ef90ff75b 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -391,8 +391,8 @@ icon_state = "genedrobe" product_ads = "Perfect for the mad scientist in you!" vend_reply = "Thank you for using the GeneDrobe!" - products = list(/obj/item/clothing/under/rank/medical/geneticist = 2, - /obj/item/clothing/under/rank/medical/geneticist/skirt = 2, + products = list(/obj/item/clothing/under/rank/rnd/geneticist = 2, + /obj/item/clothing/under/rank/rnd/geneticist/skirt = 2, /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/genetics = 2, /obj/item/storage/backpack/genetics = 2, diff --git a/html/changelog.html b/html/changelog.html index a29be0d1545..773a94c87fc 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -51,6 +51,66 @@ -->
+

01 January 2020

+

Cyberboss updated:

+ +

Fikou updated:

+ +

Krysonism updated:

+ +

ShizCalev updated:

+ +

Skoglol updated:

+ +

StonebayKyle updated:

+ +

WarlockD updated:

+ +

actioninja updated:

+ +

cacogen updated:

+ +

iain0 updated:

+ +

nightred updated:

+ +

31 December 2019

AnturK updated: