From b5bad487ccb4014740bd2e13148c00ecfe9b30b1 Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Tue, 5 Feb 2019 19:53:17 -0500 Subject: [PATCH] Donutstation Tweaks (#42668) * nudges rad collectors closer, more extinguisher cabinets, motion cameras outside captain's office for external hull, removed 2 smes from engineering main room * circuit printer/protolathe, removed tech fab --- _maps/map_files/Donutstation/Donutstation.dmm | 428 +++++++++++------- 1 file changed, 272 insertions(+), 156 deletions(-) diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index 39d3dd29ee3..ec85d287cd5 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -4868,12 +4868,6 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/engine/engineering) -"ali" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable, -/obj/effect/turf_decal/bot, -/turf/open/floor/plating/airless, -/area/engine/engineering) "alj" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -4944,14 +4938,6 @@ }, /turf/open/floor/plating/airless, /area/engine/engineering) -"alt" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plating/airless, -/area/engine/engineering) "alu" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -5466,14 +5452,6 @@ /obj/item/lighter, /turf/open/floor/plasteel, /area/crew_quarters/bar) -"ams" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plating/airless, -/area/engine/engineering) "amt" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -6638,12 +6616,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 9 }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -7102,17 +7076,25 @@ /turf/open/floor/plating, /area/security/prison) "apK" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/engine/engineering) "apL" = ( /obj/structure/cable/yellow{ @@ -7679,6 +7661,9 @@ dir = 2; network = list("ss13") }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "aqX" = ( @@ -8201,7 +8186,14 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "arW" = ( -/obj/structure/table/glass, +/obj/machinery/computer/rdconsole/production{ + icon_state = "computer"; + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "arX" = ( @@ -8432,9 +8424,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "ass" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, +/obj/structure/chair/stool, /turf/open/floor/plasteel, /area/engine/atmos) "ast" = ( @@ -11168,9 +11158,6 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "ayq" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -11199,8 +11186,9 @@ /area/engine/atmos) "ayt" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics Foyer"; + req_access_txt = "0"; + req_one_access_txt = "24;10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -13494,6 +13482,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aDo" = ( @@ -15660,18 +15651,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/storage) -"aHz" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/engineering) "aHA" = ( /obj/machinery/disposal/bin, /obj/machinery/newscaster/security_unit{ @@ -17911,6 +17890,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aMG" = ( @@ -18083,6 +18065,9 @@ "aMZ" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet{ + pixel_x = 28 + }, /turf/open/floor/plasteel, /area/janitor) "aNa" = ( @@ -29432,16 +29417,9 @@ /turf/open/floor/plasteel, /area/security/brig) "biI" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -37960,6 +37938,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "bxG" = ( @@ -38663,15 +38644,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"byY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/rnd/production/techfab/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) "byZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -38876,6 +38848,9 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 28 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "bzu" = ( @@ -40098,6 +40073,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, /turf/open/floor/plasteel/chapel{ dir = 1 }, @@ -40685,17 +40663,23 @@ /turf/open/floor/plasteel, /area/hydroponics) "bCH" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/power/smes/engineering, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, /area/engine/engineering) "bCI" = ( /obj/machinery/firealarm{ @@ -40872,18 +40856,12 @@ }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bCY" = ( @@ -41871,18 +41849,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"bEK" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/engine/engineering) "bEL" = ( /obj/structure/table, /obj/machinery/light{ @@ -43312,24 +43278,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bHd" = ( @@ -43574,10 +43531,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bHx" = ( -/obj/structure/table/glass, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/rnd/production/circuit_imprinter, +/obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel, /area/engine/atmos) "bHy" = ( @@ -43766,6 +43730,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, /turf/open/floor/plasteel/dark, /area/bridge) "bHS" = ( @@ -44659,15 +44626,13 @@ /turf/open/floor/plating, /area/science/robotics/lab) "bJM" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, /obj/machinery/light/small, /obj/machinery/camera{ c_tag = "Atmospherics - Breakroom"; dir = 1; network = list("ss13","Atmospherics") }, +/obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel, /area/engine/atmos) "bJN" = ( @@ -46706,6 +46671,9 @@ dir = 1; network = list("ss13","Medical") }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "bNK" = ( @@ -48760,11 +48728,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bRw" = ( -/obj/structure/table/glass, -/obj/item/toy/figure/atmos, -/obj/item/toy/figure/atmos{ - pixel_x = 6; - pixel_y = 4 +/obj/machinery/rnd/production/protolathe/department/engineering, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -54492,7 +54462,8 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ name = "Atmospherics Delivery Access"; - req_access_txt = "24" + req_access_txt = "0"; + req_one_access_txt = "24;10" }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -55039,6 +55010,17 @@ "cIZ" = ( /turf/closed/wall, /area/crew_quarters/fitness/locker_room) +"cOZ" = ( +/obj/machinery/power/rad_collector/anchored, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/circuit/airless, +/area/engine/engineering) "dns" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -55057,6 +55039,20 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) +"dQM" = ( +/obj/machinery/computer/rdconsole/production{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, +/area/space) "esU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/closet/secure_closet/freezer/fridge, @@ -55083,6 +55079,18 @@ /obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"eRe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "gst" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55105,6 +55113,17 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"hac" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/rnd/production/circuit_imprinter, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/checker, +/area/space) "hnd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55120,6 +55139,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"htS" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/dark, +/area/science/lab) "hGn" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -55140,6 +55165,32 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"iJC" = ( +/obj/machinery/power/rad_collector/anchored, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/circuit/airless, +/area/engine/engineering) +"jjJ" = ( +/obj/machinery/light_switch{ + pixel_x = -23 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/rnd/production/protolathe/department/engineering, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, +/area/space) "jro" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/light/small{ @@ -55169,6 +55220,23 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"jZv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/engine/engineering) +"kow" = ( +/obj/machinery/power/rad_collector/anchored, +/obj/structure/cable, +/obj/effect/turf_decal/bot, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/circuit/airless, +/area/engine/engineering) "kLE" = ( /obj/machinery/power/apc{ areastring = "/area/crew_quarters/fitness/locker_room"; @@ -55221,6 +55289,12 @@ /obj/structure/curtain, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"njx" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/science/mixing) "nuq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, @@ -55231,9 +55305,23 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"plI" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "pBI" = ( /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) +"pWc" = ( +/obj/machinery/camera/motion{ + c_tag = "Secure - Captain's Office External"; + dir = 4; + network = list("AISat") + }, +/turf/open/space/basic, +/area/space) "qxZ" = ( /obj/structure/sign/warning/pods{ pixel_y = 32 @@ -55250,6 +55338,15 @@ }, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) +"qBt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "qIb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -55259,6 +55356,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"rfC" = ( +/obj/structure/lattice, +/obj/machinery/camera/motion{ + c_tag = "Secure - Captain's Private Quarters External"; + dir = 4; + network = list("AISat") + }, +/turf/open/space/basic, +/area/space/nearstation) "tQN" = ( /obj/machinery/shower{ dir = 1 @@ -55294,6 +55400,16 @@ /obj/structure/curtain, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/fitness/locker_room) +"vws" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engine/engineering) "vxP" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -76798,7 +76914,7 @@ aco aev aiZ bUj -adN +njx bUr aew aew @@ -81898,7 +82014,7 @@ bfz awe aks awe -awe +plI awe asn awe @@ -82190,7 +82306,7 @@ bmY bsh brb bgh -aih +qBt aih aLe acy @@ -82708,7 +82824,7 @@ aKT bro bkY acy -bVO +htS bVO acW adc @@ -89418,9 +89534,9 @@ anB aau aaa aaa -aaa -aaa -aaa +dQM +jjJ +hac aaa aaa aaa @@ -90436,9 +90552,9 @@ aat amy aav bPT -alt -alt -alt +apg +apg +apg bPT aav amy @@ -90693,9 +90809,9 @@ aay alf amN aHD -amN -amN -amN +iJC +iJC +iJC bPV amR amJ @@ -90710,7 +90826,7 @@ ahP aau aad bCF -bEK +bFB azW aor apA @@ -90967,8 +91083,8 @@ anz aau aad apK -bFB -azW +eRe +aUT aor apB aTL @@ -91225,7 +91341,7 @@ alQ aHR bCX bHc -aUT +aor aor aTU apq @@ -91716,8 +91832,8 @@ aRx aad aah alM -ali -aaz +alM +kow aaH aaH aaH @@ -91973,8 +92089,8 @@ bfU aad aaw alM -ali -aaz +alM +kow aaG alc alc @@ -91999,8 +92115,8 @@ bPI aUX bRr caG -byY bsU +jZv aBK bpx bAB @@ -92230,8 +92346,8 @@ aRB aad aaj alM -ali -aaz +alM +kow aaH aaH aaH @@ -92767,7 +92883,7 @@ alQ aIm aoQ biI -aHr +aor aor bzT apq @@ -93023,8 +93139,8 @@ anB aau aad bCH -blb -azW +vws +aHr aor aVq boH @@ -93263,9 +93379,9 @@ abY amB amN bPU -amN -amN -amN +cOZ +cOZ +cOZ bPZ amN amS @@ -93280,7 +93396,7 @@ ahP aau aad azX -aHz +blb anN aNK aUU @@ -93520,9 +93636,9 @@ aax amL aav bPW -ams -ams -ams +apg +apg +apg bPT aav bPK @@ -103274,7 +103390,7 @@ aiV aiV aiV aaa -aau +rfC aaa aED ahC @@ -103803,7 +103919,7 @@ bCt bCt bKB aaa -aaa +pWc aij adI aiz