diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index edda9074099..18cc26438d5 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2853,7 +2853,7 @@ /area/ruin/space/has_grav/ancientstation/betacorridor) "hK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/rad_collector, +/obj/machinery/power/tesla_coil, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "hL" = ( @@ -6300,6 +6300,11 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) +"rZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/grounding_rod, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "sy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11432,8 +11437,8 @@ bE hK hK dh -dh -dh +rZ +rZ dh Zk DC diff --git a/_maps/map_files/Blueshift/BlueShift.dmm b/_maps/map_files/Blueshift/BlueShift.dmm index fc38508606b..0819c52061e 100644 --- a/_maps/map_files/Blueshift/BlueShift.dmm +++ b/_maps/map_files/Blueshift/BlueShift.dmm @@ -10927,6 +10927,17 @@ }, /turf/open/floor/iron/white, /area/science/research) +"bGM" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "bHg" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -37368,11 +37379,11 @@ /obj/structure/window/reinforced/plasma{ dir = 4 }, -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "fwb" = ( @@ -70449,11 +70460,11 @@ /obj/structure/window/reinforced/plasma{ dir = 8 }, -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "kso" = ( @@ -99020,11 +99031,11 @@ /obj/structure/window/reinforced/plasma{ dir = 4 }, -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "oFX" = ( @@ -119514,11 +119525,11 @@ /obj/structure/window/reinforced/plasma{ dir = 8 }, -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "rMR" = ( @@ -141313,6 +141324,17 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/engineering/supermatter) +"uUU" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "uVc" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/brown{ @@ -260397,7 +260419,7 @@ hKy uUT srD lVX -fwa +bGM fwa oFW srD @@ -261425,7 +261447,7 @@ gWr uUT srD qBO -rMM +uUU rMM krR srD diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2c9eb0b6096..f3048f56ffe 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9943,6 +9943,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/cargo/miningoffice) +"bFF" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "bFL" = ( /turf/closed/wall/r_wall, /area/security/warden) @@ -28104,6 +28112,19 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/break_room) +"dDF" = ( +/obj/structure/noticeboard/directional/east, +/obj/machinery/camera{ + c_tag = "Science - Robotics Lab"; + dir = 8; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/robotics/lab) "dDI" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -28235,26 +28256,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint) -"dEa" = ( -/obj/structure/cable, -/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/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/simple_animal/sloth/citrus, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/cargo/qm) "dEb" = ( /obj/machinery/door/poddoor/preopen{ id = "surgeryb"; @@ -38650,18 +38651,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/aft) -"fCC" = ( -/obj/structure/bed/dogbed/runtime, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/mob/living/simple_animal/pet/cat/runtime, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/command/heads_quarters/cmo) "fCE" = ( /obj/machinery/washing_machine, /obj/structure/sign/warning/electricshock{ @@ -38673,17 +38662,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"fCQ" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "fDa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -42746,19 +42724,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/hallway/primary/central/aft) -"gPr" = ( -/obj/structure/noticeboard/directional/east, -/obj/machinery/camera{ - c_tag = "Science - Robotics Lab"; - dir = 8; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/robotics/lab) "gPw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -42825,6 +42790,17 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/grimy, /area/commons/vacant_room/office) +"gRd" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "gRl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -46788,14 +46764,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/command/heads_quarters/rd) -"hVW" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 4 - }, -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable, -/turf/open/floor/engine, -/area/engineering/supermatter) "hVZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -48656,6 +48624,16 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/engineering/main) +"ixt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/mob/living/basic/cockroach, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ixv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49747,6 +49725,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/customs) +"iOb" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "iOi" = ( /obj/machinery/cell_charger, /obj/structure/table/reinforced, @@ -49938,16 +49924,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/service/library) -"iQX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/basic/cockroach, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "iRw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -52375,17 +52351,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/engineering/break_room) -"jGJ" = ( -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "jGK" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -52875,6 +52840,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) +"jOi" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "jOj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -54945,6 +54918,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) +"ksU" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "ksX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -56706,6 +56690,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/service/abandoned_gambling_den) +"kTf" = ( +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "kTl" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -73116,6 +73111,18 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/security/warden) +"pFC" = ( +/obj/structure/bed/dogbed/runtime, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/mob/living/simple_animal/pet/cat/runtime, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/command/heads_quarters/cmo) "pFD" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -73173,22 +73180,6 @@ }, /turf/open/floor/iron/dark, /area/engineering/gravity_generator) -"pGB" = ( -/obj/structure/bed/dogbed/renault, -/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 - }, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/command/heads_quarters/captain) "pGD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -73456,6 +73447,22 @@ }, /turf/open/floor/iron, /area/security/brig) +"pKi" = ( +/obj/structure/bed/dogbed/renault, +/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 + }, +/mob/living/simple_animal/pet/fox/renault, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/command/heads_quarters/captain) "pKR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple{ @@ -78735,17 +78742,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"rhJ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "rhZ" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -87235,14 +87231,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/cargo/storage) -"tLP" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 1 - }, -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable, -/turf/open/floor/engine, -/area/engineering/supermatter) "tLT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/nanotrasen{ @@ -88705,6 +88693,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/main) +"ulM" = ( +/obj/structure/cable, +/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/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/mob/living/simple_animal/sloth/citrus, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/cargo/qm) "ume" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -94565,6 +94573,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"vUU" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "vVc" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -123167,9 +123183,9 @@ aTe cnP kuB qzf -hVW -hVW -hVW +iOb +vUU +iOb qzf qzf qzf @@ -123427,7 +123443,7 @@ qzf rgQ tii wrL -tLP +bFF lBd lZd hfD @@ -123684,7 +123700,7 @@ hWu rgQ uqa wrL -tLP +jOi vyP eZx hfD @@ -123941,7 +123957,7 @@ qzf rgQ tii wrL -tLP +bFF lYR tKt nYt @@ -135236,7 +135252,7 @@ eXA bWD aaI nJo -rhJ +ksU mFG mfh lxk @@ -135493,7 +135509,7 @@ eXA cNT bYO nJo -jGJ +kTf ttd mFG tqz @@ -135750,7 +135766,7 @@ eXA bWD bYO nJo -fCQ +gRd ybZ ybZ lxk @@ -137099,7 +137115,7 @@ dfm dfm dfm dOM -iQX +ixt dSF dOM wfC @@ -140427,7 +140443,7 @@ dyd dzK dAO dCv -gPr +dDF dEN dGd dHA @@ -142940,7 +142956,7 @@ glH glH jLq qqj -pGB +pKi glH sfH bXb @@ -146849,7 +146865,7 @@ ivY loW nSm txo -fCC +pFC stU pxA qfr @@ -148052,7 +148068,7 @@ suJ viJ pxq kKx -dEa +ulM lhS qIO oBs diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index d1bcc1c3981..f7c512c3314 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -196,6 +196,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/fore) +"aaL" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "aaO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5907,8 +5915,8 @@ /obj/structure/window/reinforced/plasma/spawner/west{ dir = 4 }, -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "aUK" = ( @@ -41083,6 +41091,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/service/theater/abandoned) +"fTW" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "fUc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -53276,9 +53292,11 @@ /turf/open/floor/iron/dark, /area/service/chapel/office) "jJm" = ( -/obj/machinery/power/rad_collector/anchored, +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, /obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/north, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "jJq" = ( @@ -123723,7 +123741,7 @@ rNb ezC qzf aUH -aUH +fTW aUH qzf qzf @@ -124239,7 +124257,7 @@ hWu rgQ uqa wrL -jJm +aaL vyP eZx hnW diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index d665ef39b87..f266d92592f 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2044,6 +2044,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/security/brig) +"aly" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "alA" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -15314,18 +15323,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/atmos) -"dyM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46;70" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plastic, -/area/hallway/secondary/service) "dzt" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -15365,11 +15362,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/commons/fitness) -"dAL" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/science/research) "dAN" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue, @@ -15836,6 +15828,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/cafeteria, /area/command/heads_quarters/rd) +"dOR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46;70" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plastic, +/area/hallway/secondary/service) "dPb" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -17334,6 +17338,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"eJJ" = ( +/obj/structure/table, +/obj/machinery/airalarm/kitchen_cold_room{ + dir = 4; + pixel_x = -24 + }, +/turf/open/floor/iron/freezer, +/area/service/kitchen/coldroom) "eKm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18297,6 +18309,15 @@ /obj/item/clothing/under/rank/prisoner/skirt, /turf/open/floor/iron/cafeteria, /area/security/prison) +"fnG" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "fnW" = ( /obj/structure/closet/secure_closet/freezer/kitchen/maintenance, /obj/effect/decal/cleanable/cobweb, @@ -18334,6 +18355,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) +"fpN" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "fql" = ( /obj/structure/cable, /turf/open/floor/carpet, @@ -20430,29 +20460,6 @@ /obj/item/ai_module/core, /turf/open/floor/iron, /area/command/heads_quarters/rd) -"guG" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics South East"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Air Outlet Pump" - }, -/turf/open/floor/iron/white/corner, -/area/engineering/atmos) "guJ" = ( /turf/open/floor/plating{ icon_state = "panelscorched" @@ -20496,16 +20503,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) -"gwq" = ( -/obj/structure/sign/warning/fire{ - pixel_y = -32 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics Project Room West"; - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/atmos/project) "gxu" = ( /obj/machinery/airalarm/directional/north, /obj/structure/rack, @@ -21497,6 +21494,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/cargo/sorting) +"gWT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Testing Lab Maintenance"; + req_access_txt = "47" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "gXk" = ( /obj/structure/mineral_door/wood, /obj/structure/barricade/wooden/crude/snow, @@ -25816,6 +25824,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/command/bridge) +"jtd" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/research) "jtf" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -27405,15 +27418,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"kpY" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "kqc" = ( /obj/structure/sign/departments/chemistry{ pixel_y = -32 @@ -27519,15 +27523,6 @@ /obj/structure/window/reinforced, /turf/open/floor/iron, /area/science/xenobiology) -"ksu" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "ksz" = ( /obj/structure/sign/poster/official/wtf_is_co2, /turf/closed/wall/r_wall, @@ -28653,6 +28648,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/medical) +"kXW" = ( +/obj/structure/sign/warning/fire{ + pixel_y = -32 + }, +/obj/machinery/camera{ + c_tag = "Atmospherics Project Room West"; + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/atmos/project) "kYh" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/south, @@ -30121,6 +30126,14 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"lPf" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/camera{ + c_tag = "Atmospherics Project Room East"; + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/atmos/project) "lPh" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30916,6 +30929,29 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/service/hydroponics) +"mkZ" = ( +/obj/machinery/camera{ + c_tag = "Atmospherics South East"; + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air Outlet Pump" + }, +/turf/open/floor/iron/white/corner, +/area/engineering/atmos) "mlv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, @@ -32820,6 +32856,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/maintenance/department/medical) +"njb" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/aft) "njf" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance/two, @@ -33210,12 +33251,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/atmos) -"nsX" = ( -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, -/turf/open/floor/iron/freezer, -/area/service/kitchen/coldroom) "nsZ" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -33673,17 +33708,6 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/iron, /area/command/heads_quarters/hop) -"nGh" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - name = "Testing Lab Maintenance"; - req_access_txt = "47" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "nGs" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -36675,6 +36699,15 @@ }, /turf/open/floor/iron/dark, /area/service/chapel) +"pli" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "plV" = ( /obj/structure/chair{ dir = 8; @@ -38025,11 +38058,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/engineering/supermatter) -"pXk" = ( -/obj/effect/turf_decal/trimline/green/filled/corner, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) "pXw" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -38813,16 +38841,6 @@ }, /turf/open/floor/iron/dark, /area/science/genetics) -"qrX" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/science/research) "qsi" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 1; @@ -42643,6 +42661,16 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/command/meeting_room) +"sve" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/science/research) "svg" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/door/firedoor, @@ -43323,11 +43351,6 @@ /obj/item/clothing/gloves/boxing, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"sOe" = ( -/obj/machinery/light/directional/east, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron/white, -/area/science/robotics/lab) "sOq" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ dir = 8 @@ -43799,6 +43822,12 @@ }, /turf/open/openspace, /area/commons/storage/mining) +"tcs" = ( +/obj/structure/sink/kitchen{ + pixel_y = 24 + }, +/turf/open/floor/iron/freezer, +/area/service/kitchen/coldroom) "tcv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46496,14 +46525,6 @@ /obj/machinery/navbeacon/wayfinding, /turf/open/floor/iron, /area/command/bridge) -"uyM" = ( -/obj/structure/table, -/obj/machinery/airalarm/kitchen_cold_room{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/iron/freezer, -/area/service/kitchen/coldroom) "uyS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -46862,14 +46883,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) -"uGl" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera{ - c_tag = "Atmospherics Project Room East"; - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/atmos/project) "uGv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48554,6 +48567,11 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/large, /area/service/kitchen/diner) +"vJF" = ( +/obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/white, +/area/science/robotics/lab) "vJL" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -81683,9 +81701,9 @@ ydg wOE hua tLr -ksu -ksu -ksu +fpN +aly +fpN hua mLE cfZ @@ -82711,9 +82729,9 @@ jDt hua mWg tLr -kpY -kpY -kpY +fnG +pli +fnG hua mLE cfZ @@ -88093,7 +88111,7 @@ wNJ rDD pBb pBb -guG +mkZ fJb bIZ vLT @@ -88539,7 +88557,7 @@ tSm ukW wld xEh -dyM +dOR snW jIc kSl @@ -91174,7 +91192,7 @@ qMC qMC qJd xXW -gwq +kXW tQo uhT byw @@ -91887,7 +91905,7 @@ gaY qBm koB kNx -uyM +eJJ cZy kaF dXY @@ -92658,7 +92676,7 @@ alP fel kth alP -nsX +tcs xFA ueN xNX @@ -93230,7 +93248,7 @@ dfl bRa diO gAK -uGl +lPf bRa tjs cKT @@ -98588,7 +98606,7 @@ aYV bfX bhy biP -sOe +vJF qJy maG lxr @@ -99367,7 +99385,7 @@ rHq sYj bWr bWr -dAL +jtd ezY ilR ilR @@ -99397,7 +99415,7 @@ gVp nPK vdD xGt -nGh +gWT wEm jsw jsw @@ -99879,7 +99897,7 @@ bgc boB qaX xPP -qrX +sve bhA bhA bhA @@ -99923,7 +99941,7 @@ oTL tkC cNW iyF -pXk +njb enN fDn rFe diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm index a0903bbb88b..99ba516e976 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm @@ -10367,6 +10367,15 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors) +"bKq" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "bKr" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -41031,12 +41040,12 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "shj" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/window/reinforced/plasma{ dir = 8 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "shw" = ( @@ -41621,12 +41630,12 @@ /turf/open/floor/engine, /area/engineering/supermatter/room) "syN" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/window/reinforced/plasma{ dir = 4 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "syO" = ( @@ -49095,6 +49104,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) +"wJi" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "wJm" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -80414,7 +80432,7 @@ wOE hua lPn syN -syN +bKq syN hua cIT @@ -81442,7 +81460,7 @@ hua mWg lPn shj -shj +wJi shj hua cIT diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 1e3e5b76f28..60159e43644 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5775,6 +5775,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/primary/fore) +"aAF" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/robotics/lab) "aAI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -9648,6 +9658,30 @@ }, /turf/open/floor/iron/dark, /area/medical/virology) +"aVL" = ( +/obj/machinery/camera{ + c_tag = "Medical Operating Theater A"; + dir = 1; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clipboard{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/surgery) "aVQ" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -13917,6 +13951,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/central) +"bun" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/simple_animal/pet/fox/renault, +/obj/machinery/button/door/directional/south{ + id = "captain_escape"; + name = "Tactical Relocation Toggle" + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "bux" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -22249,15 +22292,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/security/warden) -"coG" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/button/door/directional/south{ - id = "captain_escape"; - name = "Tactical Relocation Toggle" - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "coH" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -27500,6 +27534,17 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/medical/paramedic) +"dgP" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "dhc" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -27614,13 +27659,6 @@ icon_state = "platingdmg3" }, /area/maintenance/fore) -"dhN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/spawner/random/structure/crate, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/port) "dhR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -28488,29 +28526,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) -"dAx" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/corner, -/mob/living/simple_animal/bot/cleanbot{ - auto_patrol = 1; - icon_state = "cleanbot1"; - name = "Mopficcer Sweepsky" - }, -/obj/machinery/button/door/directional/south{ - id = "custodialwagon"; - name = "Custodial Bay Toggle"; - req_access_txt = "26'" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "dAD" = ( /obj/structure/sign/warning/securearea{ pixel_y = -32 @@ -29306,6 +29321,17 @@ }, /turf/open/floor/iron, /area/engineering/main) +"dRm" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "dRs" = ( /obj/effect/turf_decal/delivery, /obj/machinery/pipedispenser/disposal, @@ -35193,6 +35219,23 @@ /obj/item/trash/syndi_cakes, /turf/open/floor/iron/white, /area/security/prison) +"gfH" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/rcl/pre_loaded, +/obj/item/storage/crayons, +/obj/item/storage/crayons, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "gfK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36806,14 +36849,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) -"gMF" = ( -/obj/structure/bookcase/random/religion, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "gNg" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/emitter, @@ -40396,12 +40431,6 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) -"igd" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/airless, -/area/engineering/main) "ige" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42581,6 +42610,20 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) +"iTZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/mob/living/simple_animal/bot/cleanbot/medbay, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "iUa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43131,13 +43174,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) -"jdw" = ( -/obj/structure/easel, -/obj/effect/turf_decal/bot, -/obj/item/canvas/twentythree_twentythree, -/obj/item/airlock_painter, -/turf/open/floor/iron/dark, -/area/service/library) "jdN" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43823,18 +43859,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/commons/fitness/recreation) -"jsd" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/water_source/puddle, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/carbon/human/species/monkey, -/turf/open/floor/grass, -/area/science/genetics) "jsj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44004,16 +44028,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"jvz" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engineering/atmos) "jvE" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -44514,6 +44528,13 @@ /obj/effect/spawner/random/decoration/carpet, /turf/open/floor/iron, /area/security/prison) +"jId" = ( +/obj/structure/easel, +/obj/effect/turf_decal/bot, +/obj/item/canvas/twentythree_twentythree, +/obj/item/airlock_painter, +/turf/open/floor/iron/dark, +/area/service/library) "jIo" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -45187,16 +45208,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"jVh" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/robotics/lab) "jVm" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -46475,6 +46486,13 @@ icon_state = "platingdmg1" }, /area/maintenance/starboard) +"ksR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/port) "ksT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47133,17 +47151,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"kDe" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole{ - pixel_y = 5 - }, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "kDm" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -47647,6 +47654,20 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/service/chapel) +"kLn" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/vending/games, +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/radio/intercom/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "kLr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -48089,20 +48110,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/engineering/atmos) -"kTa" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/games, -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/radio/intercom/directional/east, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "kTl" = ( /obj/machinery/power/port_gen/pacman, /obj/item/stack/sheet/mineral/plasma{ @@ -48259,17 +48266,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/hallway/primary/fore) -"kVo" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "kVv" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/radiation, @@ -48448,6 +48444,17 @@ /obj/effect/decal/remains/human, /turf/open/floor/plating, /area/cargo/warehouse) +"kZp" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole{ + pixel_y = 5 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "kZq" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -50551,6 +50558,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel) +"lRa" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "lRf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/chef_order{ @@ -50802,6 +50820,12 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/cargo/storage) +"lUX" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "lVq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -50890,22 +50914,6 @@ /obj/item/stack/cable_coil/five, /turf/open/floor/plating, /area/cargo/warehouse) -"lXn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg{ - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "lXq" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -52308,6 +52316,12 @@ }, /turf/open/floor/iron/dark, /area/commons/vacant_room/commissary) +"mwX" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/robotics/lab) "mwZ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow, @@ -52698,12 +52712,6 @@ }, /turf/open/floor/iron/dark, /area/service/bar/atrium) -"mCx" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/robotics/lab) "mCS" = ( /obj/effect/turf_decal/stripes/end, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -54084,6 +54092,18 @@ }, /turf/open/floor/iron/dark, /area/commons/storage/primary) +"ndz" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/water_source/puddle, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/science/genetics) "ndE" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, @@ -56275,23 +56295,6 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) -"oar" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/north, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/rcl/pre_loaded, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "oaA" = ( /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, @@ -59396,6 +59399,12 @@ icon_state = "panelscorched" }, /area/ai_monitored/command/storage/satellite) +"pim" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/engineering/main) "piF" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65923,17 +65932,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/science/mixing) -"rzN" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "rAp" = ( /obj/structure/weightmachine/weightlifter, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -69336,20 +69334,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/engineering/atmos) -"sLT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/mob/living/simple_animal/bot/cleanbot/medbay, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "sMk" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -72272,6 +72256,29 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/fore) +"tTo" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/corner, +/mob/living/simple_animal/bot/cleanbot{ + auto_patrol = 1; + icon_state = "cleanbot1"; + name = "Mopficcer Sweepsky" + }, +/obj/machinery/button/door/directional/south{ + id = "custodialwagon"; + name = "Custodial Bay Toggle"; + req_access_txt = "26'" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "tTB" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -75047,6 +75054,22 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/rust, /area/command/heads_quarters/hos) +"vaY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_y = 5 + }, +/obj/structure/sign/poster/contraband/red_rum{ + pixel_y = -30 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "vbp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -76041,6 +76064,14 @@ }, /turf/open/floor/iron, /area/command/teleporter) +"vtN" = ( +/obj/structure/bookcase/random/religion, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "vtT" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -77669,6 +77700,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/service/bar) +"vYO" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "vZl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -79772,6 +79814,16 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"wRO" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engineering/atmos) "wRX" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/carpspawn, @@ -80484,30 +80536,6 @@ }, /turf/open/floor/plating/asteroid, /area/space/nearstation) -"xcX" = ( -/obj/machinery/camera{ - c_tag = "Medical Operating Theater A"; - dir = 1; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clipboard{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/surgery) "xdf" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/neutral, @@ -83737,12 +83765,6 @@ /obj/machinery/light/broken/directional/west, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) -"ymi" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engineering/atmos) (1,1,1) = {" aaa @@ -100322,7 +100344,7 @@ aRP aTk nJS tiX -dhN +ksR skO rbF amA @@ -101085,7 +101107,7 @@ vEl mkY wMM vte -sLT +iTZ eRK dsd pgJ @@ -102633,7 +102655,7 @@ iSA aVC sns aZu -xcX +aVL aVC nTA rDL @@ -108033,13 +108055,13 @@ mjX nEu gUd thp -gMF +vtN fau iRt oIr eyj sim -jdw +jId pHZ dfF sim @@ -108290,13 +108312,13 @@ duf pes mRD sim -kDe +kZp rZe kxy dXx gXK sim -oar +gfH pkU pBc thp @@ -109575,7 +109597,7 @@ qCn uxJ kyH sim -kTa +kLn hUi jXf fyv @@ -110605,7 +110627,7 @@ wAO fDo pmd dyi -lXn +vaY wAO bpq bRY @@ -115758,7 +115780,7 @@ iyc vgz rJI nMC -coG +bun lih lih bOZ @@ -116567,8 +116589,8 @@ iVw wlK iVw iVw -jvz -ymi +wRO +lUX iVw ygU aDU @@ -116825,7 +116847,7 @@ gNg rJb qGy jJi -igd +pim eHf ozk aDU @@ -118880,9 +118902,9 @@ dTq eAV gOw eux -kVo -kVo -kVo +dRm +dgP +dRm qkL jts wRB @@ -119908,9 +119930,9 @@ kyz qkL qoR opS -rzN -rzN -rzN +vYO +lRa +vYO qkL dlF wRB @@ -120096,7 +120118,7 @@ atq aXe aqU auk -mCx +mwX xFs bFj bbQ @@ -120348,12 +120370,12 @@ xvD iTj aXU bdb -jsd +ndz bah otz jSc wWz -jVh +aAF rfZ lzk aZS @@ -120906,7 +120928,7 @@ bAz bEg put rXt -dAx +tTo hNK bmT oRw diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm index daeff06aa8a..e717623dfe8 100644 --- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm +++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm @@ -36991,6 +36991,15 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/command/teleporter) +"dby" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "dbz" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -38132,6 +38141,15 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/security/prison) +"dFJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "dFU" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -54382,10 +54400,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "kVo" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -68808,10 +68826,10 @@ /turf/open/floor/plating, /area/cargo/warehouse) "rzN" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -118982,7 +119000,7 @@ eAV gOw eux kVo -kVo +dFJ kVo qkL ets @@ -120010,7 +120028,7 @@ qkL qoR opS rzN -rzN +dby rzN qkL lUR diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4de75b1e21f..ff53793da7d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2038,6 +2038,12 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) +"apX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "aqe" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -4769,6 +4775,15 @@ "aRA" = ( /turf/closed/wall, /area/hallway/secondary/entry) +"aRB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "aRE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -7370,6 +7385,14 @@ /obj/machinery/power/apc/auto_name/south, /turf/open/floor/plating, /area/maintenance/port) +"byb" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "byo" = ( /obj/structure/closet, /obj/item/clothing/gloves/color/fyellow, @@ -7762,6 +7785,14 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/dark, /area/engineering/atmos) +"bDe" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "bDt" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -8635,6 +8666,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) +"bOJ" = ( +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "bON" = ( /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -8983,6 +9021,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"bUL" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) "bUT" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -9986,13 +10028,6 @@ /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"chJ" = ( -/obj/machinery/door/airlock/medical{ - name = "Medical Cold Room"; - req_access_txt = "5" - }, -/turf/open/floor/iron, -/area/medical/coldroom) "chR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10053,6 +10088,14 @@ /obj/structure/cable, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) +"cjk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/east, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/secondary) "cjw" = ( /obj/structure/table/glass, /obj/item/retractor, @@ -11733,12 +11776,6 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"cAa" = ( -/obj/structure/cable, -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, -/area/construction/storage_wing) "cAd" = ( /obj/structure/window/reinforced{ dir = 8 @@ -13062,6 +13099,35 @@ }, /turf/open/floor/iron/kitchen_coldroom, /area/medical/coldroom) +"cNj" = ( +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/cultivator, +/obj/item/clothing/head/chefhat, +/obj/item/storage/box/lights/mixed, +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/cultivator, +/obj/item/clothing/head/chefhat, +/obj/machinery/camera{ + c_tag = "Service - Starboard"; + dir = 4 + }, +/obj/item/storage/box/lights/mixed, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "cNu" = ( /obj/machinery/door/airlock/hatch{ name = "Secure Pen"; @@ -13195,26 +13261,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"cOK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/drinkingglasses, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/closet/crate, -/obj/item/storage/box/drinkingglasses, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "cOM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -13242,12 +13288,6 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) -"cOZ" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/aft) "cPa" = ( /obj/structure/chair{ dir = 8 @@ -13827,6 +13867,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"cVt" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "cVx" = ( /obj/docking_port/stationary{ dir = 8; @@ -14114,6 +14163,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/commons/locker) +"cYS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/science/research) "cYT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -14200,10 +14260,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/command/heads_quarters/rd) -"dan" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/starboard) "day" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -15012,13 +15068,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/maintenance/port/fore) -"dnv" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "dny" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating{ @@ -16135,6 +16184,25 @@ }, /turf/open/floor/engine, /area/science/misc_lab/range) +"dFC" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) +"dFG" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/carpet/royalblue, +/area/service/library) "dGK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -16709,15 +16777,6 @@ icon_state = "platingdmg2" }, /area/maintenance/disposal) -"dRr" = ( -/obj/machinery/firealarm/directional/east, -/obj/structure/chair/office/light, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "dRv" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -17077,6 +17136,12 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/science/research) +"dWU" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "dXG" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -17627,6 +17692,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"ehJ" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "ehQ" = ( /obj/structure/window/reinforced, /obj/structure/table, @@ -18307,21 +18381,6 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) -"ete" = ( -/obj/machinery/camera{ - c_tag = "Science Hallway - Admin"; - dir = 1; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/science/research) "eti" = ( /obj/machinery/light/directional/west, /obj/machinery/light_switch/directional/west, @@ -19240,6 +19299,9 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"eIv" = ( +/turf/closed/wall, +/area/service/janitor) "eII" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/structure/window/reinforced{ @@ -20790,15 +20852,6 @@ dir = 1 }, /area/command/gateway) -"fiM" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "fiR" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;27" @@ -22298,6 +22351,15 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/medical/medbay/central) +"fHy" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fHF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/southright{ @@ -23283,12 +23345,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/hallway/primary/central) -"fZW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "gaa" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -23352,6 +23408,19 @@ }, /turf/open/floor/iron/dark, /area/engineering/atmos) +"gaP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "gbu" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -23818,16 +23887,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard) -"gjx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light_switch/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "gjG" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -25427,15 +25486,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/hallway/primary/aft) -"gPJ" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) "gPT" = ( /turf/closed/wall/r_wall, /area/medical/coldroom) @@ -26211,9 +26261,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) -"hfK" = ( -/turf/closed/wall, -/area/service/janitor) "hfX" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable, @@ -26484,17 +26531,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) -"hkw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/science/research) "hkA" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -27079,32 +27115,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel/office) -"huT" = ( -/obj/item/reagent_containers/spray/plantbgone{ - pixel_y = 3 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 13; - pixel_y = 5 - }, -/obj/item/watertank, -/obj/item/grenade/chem_grenade/antiweed, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/service/hydroponics) "hva" = ( /obj/machinery/door_timer{ id = "Cell 3"; @@ -27689,6 +27699,18 @@ }, /turf/open/space/basic, /area/space/nearstation) +"hHX" = ( +/obj/machinery/vending/boozeomat, +/obj/structure/sign/plaques/deempisi{ + pixel_y = -28 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/service/bar) "hIa" = ( /obj/structure/chair, /obj/effect/landmark/start/chaplain, @@ -27853,15 +27875,6 @@ "hKH" = ( /turf/closed/wall/mineral/plastitanium, /area/commons/fitness/recreation) -"hLa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "hLg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/white, @@ -28730,6 +28743,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/fore) +"icp" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral, +/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/machinery/button/door/directional/south{ + id = "roboticsprivacy2"; + name = "Robotics Privacy Control"; + req_access_txt = "29" + }, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "icG" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -28832,14 +28864,6 @@ /obj/effect/landmark/start/head_of_security, /turf/open/floor/wood, /area/command/heads_quarters/hos) -"idW" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "iej" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -29533,14 +29557,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/maintenance/starboard) -"iqO" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ - dir = 6 - }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "iri" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -30648,15 +30664,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"iMH" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "iMR" = ( /obj/structure/table, /obj/item/stack/package_wrap{ @@ -31079,6 +31086,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"iVh" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "iVt" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -31985,14 +32000,6 @@ }, /turf/open/floor/iron, /area/security/warden) -"joN" = ( -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "joX" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -32889,6 +32896,26 @@ }, /turf/open/floor/iron/white, /area/security/prison) +"jEP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/drinkingglasses, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet/crate, +/obj/item/storage/box/drinkingglasses, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "jEX" = ( /obj/machinery/seed_extractor, /turf/open/floor/plating, @@ -33243,6 +33270,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"jMv" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "jMF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -33746,10 +33782,6 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) -"jXH" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "jXL" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -35627,6 +35659,10 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"kFz" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "kGc" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -36400,6 +36436,17 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/aft) +"kVh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/closet/crate, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/cargo/warehouse) "kVr" = ( /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; @@ -37311,23 +37358,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/security/prison) -"lmu" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/eastleft{ - name = "Kitchen Delivery"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/airalarm/kitchen_cold_room{ - pixel_y = 24 - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/service/kitchen/coldroom) "lmx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -38009,6 +38039,15 @@ /obj/item/storage/crayons, /turf/open/floor/iron, /area/commons/storage/art) +"lzA" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "lzN" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -38776,23 +38815,18 @@ /obj/structure/reagent_dispensers/plumbed/storage, /turf/open/floor/iron/white, /area/medical/chemistry) +"lPb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall, +/area/service/janitor) "lPh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) -"lPp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/closet/crate, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/cargo/warehouse) "lPG" = ( /obj/effect/landmark/start/station_engineer, /obj/structure/cable, @@ -39034,10 +39068,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"lVM" = ( -/obj/machinery/telecomms/server/presets/security, -/turf/open/floor/circuit/telecomms/mainframe, -/area/tcommsat/server) "lVV" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /turf/open/floor/iron/dark, @@ -39334,14 +39364,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"lZJ" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "lZK" = ( /obj/machinery/shower{ dir = 8 @@ -39789,13 +39811,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine/n2o, /area/engineering/atmos) -"mfL" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "mfM" = ( /turf/open/floor/engine/co2, /area/engineering/atmos) @@ -39863,18 +39878,6 @@ "mhf" = ( /turf/open/floor/iron/showroomfloor, /area/maintenance/starboard/secondary) -"mhh" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/service/library) "mhk" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -40209,6 +40212,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/miningoffice) +"mnY" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/chair/office/light, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "mob" = ( /obj/structure/sink{ dir = 8; @@ -40271,6 +40283,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/port) +"mpI" = ( +/obj/machinery/camera{ + c_tag = "Science Hallway - Admin"; + dir = 1; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/research) "mpM" = ( /obj/structure/barricade/wooden, /obj/structure/girder, @@ -41044,15 +41071,6 @@ icon_state = "platingdmg2" }, /area/maintenance/fore) -"mFW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "mFZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/mousetraps{ @@ -41482,13 +41500,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/commons/toilet/auxiliary) -"mMd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/thermomachine/heater{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "mMX" = ( /obj/structure/chair{ dir = 1 @@ -41703,6 +41714,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/service/cafeteria) +"mPy" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "mPK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41864,14 +41883,6 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"mTe" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "mTh" = ( /obj/structure/closet/emcloset, /obj/structure/disposalpipe/segment{ @@ -42433,6 +42444,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron/white, /area/science/xenobiology) +"naF" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/virology) "naM" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure{ @@ -43469,25 +43487,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engineering/atmos) -"nti" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral, -/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/machinery/button/door/directional/south{ - id = "roboticsprivacy2"; - name = "Robotics Privacy Control"; - req_access_txt = "29" - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "ntx" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/engine/o2, @@ -43730,18 +43729,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/starboard) -"nxh" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "nxp" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment/directional/west, @@ -44036,18 +44023,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) -"nDs" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator Room"; - req_access_txt = "19;23" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "nDM" = ( /obj/structure/fireaxecabinet/directional/south, /obj/item/paper_bin{ @@ -44174,18 +44149,6 @@ /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, /area/science/storage) -"nFR" = ( -/obj/machinery/vending/boozeomat, -/obj/structure/sign/plaques/deempisi{ - pixel_y = -28 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/service/bar) "nGv" = ( /obj/machinery/power/terminal{ dir = 1 @@ -45250,14 +45213,6 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"nYX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/maintenance/starboard/secondary) "nZb" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -45489,19 +45444,6 @@ /obj/machinery/atmospherics/components/trinary/filter, /turf/open/floor/plating, /area/maintenance/starboard) -"ocg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "oci" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -46362,6 +46304,32 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/science/robotics/lab) +"osa" = ( +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 13; + pixel_y = 5 + }, +/obj/item/watertank, +/obj/item/grenade/chem_grenade/antiweed, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/hydroponics) "osc" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2, @@ -47546,14 +47514,6 @@ }, /turf/open/floor/iron, /area/commons/locker) -"oQE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "oQJ" = ( /obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; @@ -48235,12 +48195,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) -"pcJ" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/port/fore) "pdh" = ( /obj/structure/chair{ dir = 1 @@ -48282,15 +48236,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"pdy" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "pdS" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -48936,12 +48881,6 @@ /obj/item/mop, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"ppu" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall, -/area/service/janitor) "ppz" = ( /obj/machinery/vending/boozeomat/all_access, /obj/effect/decal/cleanable/cobweb, @@ -49468,6 +49407,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) +"pxR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/thermomachine/heater{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "pxX" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster/directional/south, @@ -49884,12 +49830,6 @@ }, /turf/open/floor/iron, /area/engineering/main) -"pFr" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "pFA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50220,6 +50160,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/treatment_center) +"pLb" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "pLc" = ( /obj/structure/chair, /turf/open/floor/iron/grimy, @@ -50790,6 +50737,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) +"pVT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "pVX" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, @@ -51740,6 +51695,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"qlY" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/port/fore) "qmf" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -51772,6 +51733,15 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/science/research) +"qmL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "qmS" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -54920,6 +54890,14 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"rxr" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "rxz" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -55782,6 +55760,13 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/medical/coldroom) +"rOi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "rOn" = ( /obj/structure/table/wood, /obj/item/hand_tele, @@ -56760,6 +56745,16 @@ }, /turf/open/floor/iron, /area/service/hydroponics) +"seO" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "seP" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -57021,6 +57016,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"sjt" = ( +/obj/machinery/door/airlock/medical{ + name = "Medical Cold Room"; + req_access_txt = "5" + }, +/turf/open/floor/iron, +/area/medical/coldroom) "sjF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57119,14 +57121,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/engine/cult, /area/service/library) -"smb" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "sme" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -58635,6 +58629,23 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/engine, /area/engineering/supermatter/room) +"sPQ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/eastleft{ + name = "Kitchen Delivery"; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/airalarm/kitchen_cold_room{ + pixel_y = 24 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/service/kitchen/coldroom) "sQe" = ( /obj/machinery/sparker/directional/north{ id = "Xenobio" @@ -60291,6 +60302,13 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"tsT" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "tsX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -60425,6 +60443,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/science/genetics) +"tuI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "tuP" = ( /turf/closed/wall, /area/cargo/miningoffice) @@ -60720,6 +60748,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/cargo/storage) +"tzQ" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "tzW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -61150,6 +61190,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/break_room) +"tIb" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/aft) "tIr" = ( /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 3"; @@ -61646,6 +61692,18 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"tRH" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Gravity Generator Room"; + req_access_txt = "19;23" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "tRX" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -61687,16 +61745,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"tSJ" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "tSO" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -62860,6 +62908,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) +"uqX" = ( +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/construction/storage_wing) "urh" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/structure/cable, @@ -63229,6 +63283,10 @@ }, /turf/open/floor/plating, /area/engineering/storage_shared) +"uwU" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/closed/wall, +/area/maintenance/starboard) "uwX" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law{ @@ -64996,13 +65054,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/medical/storage) -"veE" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/virology) "veJ" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -67349,19 +67400,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/wood, /area/service/library) -"vVn" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/window/reinforced, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/service/library) "vVo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -68100,6 +68138,13 @@ "wkj" = ( /turf/open/floor/iron/dark, /area/engineering/atmos) +"wkk" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "wkv" = ( /obj/structure/railing{ dir = 8 @@ -68946,13 +68991,6 @@ }, /turf/open/floor/iron, /area/engineering/main) -"wBx" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "wBP" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -68968,6 +69006,14 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/engineering/storage/tech) +"wBX" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "wCc" = ( /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, @@ -69412,35 +69458,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/dorms) -"wJF" = ( -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/cultivator, -/obj/item/clothing/head/chefhat, -/obj/item/storage/box/lights/mixed, -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/cultivator, -/obj/item/clothing/head/chefhat, -/obj/machinery/camera{ - c_tag = "Service - Starboard"; - dir = 4 - }, -/obj/item/storage/box/lights/mixed, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "wJM" = ( /obj/machinery/light_switch/directional/east, /obj/structure/cable, @@ -70074,6 +70091,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/brig) +"wTW" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/window/reinforced, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/carpet/royalblue, +/area/service/library) "wTZ" = ( /obj/machinery/shower{ dir = 4 @@ -71759,13 +71789,6 @@ }, /turf/open/floor/grass, /area/service/hydroponics/garden) -"xzX" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/holopad, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "xzZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -72094,13 +72117,6 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) -"xFO" = ( -/obj/effect/spawner/random/structure/crate, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) "xGa" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/wood, @@ -88744,7 +88760,7 @@ hhQ fTJ nbk dPi -veE +naF wxS tlA iew @@ -89001,7 +89017,7 @@ hJT nxD hkv nEK -tSJ +seO nsX yhM qby @@ -92256,7 +92272,7 @@ dnF dnk aRG rQt -xFO +bOJ dnk uqE dne @@ -92591,7 +92607,7 @@ dux ejb kUo ilb -chJ +sjt xfb asc uPR @@ -92770,11 +92786,11 @@ qmS oaS dou dne -gPJ +ehJ doJ dne dne -pcJ +qlY doJ aRG dnk @@ -94070,7 +94086,7 @@ qmo erH uCS sYe -lPp +kVh bqh sHw fBH @@ -94114,7 +94130,7 @@ qQS alK lUJ olq -ocg +gaP tqf aiX mRw @@ -94580,7 +94596,7 @@ ucI cXC aEH aEH -cAa +uqX uwx mVk rFS @@ -94663,7 +94679,7 @@ wCc lJX cHy bTs -cOZ +tIb cMo bTs ivO @@ -95377,8 +95393,8 @@ dCD sQf lCP eMW -mhh -vVn +dFG +wTW oMN oMN xls @@ -97492,7 +97508,7 @@ hEd pzV fRx cpz -nxh +tzQ bTs cFQ vBI @@ -103126,7 +103142,7 @@ eHX smS uqQ rVb -nti +icp cDi qmv ipr @@ -106692,7 +106708,7 @@ eSv jrj exS tZf -nFR +hHX uRF kvC ibl @@ -107442,7 +107458,7 @@ uxz tEQ ngq dnh -fiM +jMv dnh svi czL @@ -107496,7 +107512,7 @@ gUB nhL sGS ipr -hkw +cYS nOc jcD nOc @@ -108010,7 +108026,7 @@ xnS uDv qcO ipr -ete +mpI nOc bBv nOc @@ -108496,7 +108512,7 @@ ggE hyy qEj ruR -cOK +jEP iri oQJ bQP @@ -109012,7 +109028,7 @@ upb rnj bKl oXQ -wJF +cNj xVl mqS sYq @@ -109498,7 +109514,7 @@ pyb dnh dnh dnh -iMH +fHy dnh aaa aaa @@ -109795,7 +109811,7 @@ ovj nrS aSB dvN -nYX +cjk qrB qrB nhS @@ -111072,7 +111088,7 @@ qbY xVl dKp rhw -huT +osa alq rxV alq @@ -111579,7 +111595,7 @@ bEH nER gDt eLr -lmu +sPQ crV alq iay @@ -112360,11 +112376,11 @@ bpp teN apc lNs -dan -ppu -hfK -hfK -hfK +uwU +lPb +eIv +eIv +eIv ovj arh cmb @@ -112618,10 +112634,10 @@ apc oCR lNs mKO -mMd +pxR aaX -fZW -lZJ +apX +mPy ovj ovj ovj @@ -112878,7 +112894,7 @@ tSb adk afQ ejw -iqO +bDe oeB orT uAj @@ -115640,10 +115656,10 @@ bTT jyv mQn kEv -hLa -gjx -nDs -mFW +qmL +tuI +tRH +aRB cMF rUg sKe @@ -115898,7 +115914,7 @@ sqk xTq kEv jRw -oQE +wBX rzR vZC kXz @@ -116155,7 +116171,7 @@ wEK aia wHT jRw -xzX +wkk rzR dqT nED @@ -116412,8 +116428,8 @@ qvB szy kEv xro -idW -smb +rxr +iVh dqT xYr dqT @@ -116668,9 +116684,9 @@ iPU qRx sKk kEv -wBx -jXH -dnv +rOi +kFz +dFC dqT nkh dqT @@ -116683,11 +116699,11 @@ qLO gsg ugD toS -mfL +tsT jrn toS mNF -pdy +lzA cuj kBa jqt @@ -116925,9 +116941,9 @@ rzR rzR rzR rzR -joN -jXH -pFr +byb +kFz +dWU dqT tIU dqT @@ -116940,11 +116956,11 @@ aGS gsg iYv wST -mfL +pLb jrn ctk mNF -pdy +cVt wST ifR jqt @@ -117182,8 +117198,8 @@ aaa aaa aaa kEv -mTe -dRr +pVT +mnY lud dqT jNT @@ -117197,11 +117213,11 @@ aGS kuT ugD toS -mfL +tsT jrn toS mNF -pdy +lzA toS kBa xVP @@ -128282,7 +128298,7 @@ sbk bGd bGd bGd -lVM +bUL bCD gfU gfU diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index 4ac4f6e60a5..4829fcc566f 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -36565,6 +36565,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"kXA" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "kXP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39871,10 +39878,10 @@ /turf/open/floor/engine/n2o, /area/engineering/atmos) "mfL" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/window/reinforced/plasma, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "mfM" = ( @@ -41179,12 +41186,12 @@ /turf/open/floor/iron, /area/commons/dorms) "mDk" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/window/reinforced/plasma{ dir = 1 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "mDo" = ( @@ -68951,6 +68958,15 @@ /obj/item/hfr_box/body/fuel_input, /turf/open/floor/iron, /area/engineering/atmos) +"wqR" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "wrf" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/machinery/airalarm/directional/north, @@ -117635,11 +117651,11 @@ vbt gsg iYv wST -mfL +kXA jrn ctk mNF -mDk +wqR wST mzw jqt diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index da1a58ba190..f9cb8187ab5 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -35071,12 +35071,12 @@ /turf/open/floor/engine, /area/engineering/supermatter) "cEv" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 8 }, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "cEw" = ( @@ -35092,12 +35092,12 @@ /turf/open/floor/engine, /area/engineering/supermatter) "cEy" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 4 }, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "cEz" = ( @@ -35191,12 +35191,12 @@ /turf/open/floor/engine, /area/engineering/main) "cFe" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 5 }, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "cFf" = ( @@ -35207,12 +35207,12 @@ }, /area/science/research) "cFh" = ( -/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 9 }, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "cFi" = ( @@ -46666,6 +46666,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) +"mPH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "mQo" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -54409,6 +54418,15 @@ }, /turf/open/floor/iron/dark, /area/engineering/gravity_generator) +"uij" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 + }, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "uio" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -87577,7 +87595,7 @@ cqf cqD cMD crs -cEv +uij cEv cFe cMD @@ -88605,7 +88623,7 @@ cqi cMD cAP crv -cEy +mPH cEy cFh cMD diff --git a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm index 98eeaae7eb1..9687f7dd5e3 100644 --- a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm +++ b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm @@ -58262,6 +58262,17 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/iron/showroomfloor, /area/service/kitchen) +"fOY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "fPg" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, @@ -65368,12 +65379,12 @@ /turf/open/floor/iron/dark, /area/service/chapel/office) "jNZ" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 8 }, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -67758,12 +67769,12 @@ }, /area/maintenance/port) "kVo" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 5 }, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -71346,12 +71357,12 @@ /turf/open/floor/iron/dark, /area/engineering/atmos) "mKV" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 4 }, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -80272,12 +80283,12 @@ /turf/open/floor/plating, /area/cargo/warehouse) "rzN" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 9 }, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -88546,6 +88557,17 @@ }, /turf/open/floor/plating, /area/cargo/office) +"vSX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "vTw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -128033,7 +128055,7 @@ rxB eAV gOw wyL -jNZ +vSX jNZ kVo qkL @@ -129061,7 +129083,7 @@ dgl qkL qoR xDn -mKV +fOY mKV rzN qkL diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 7eb2e4c1081..1fb6185c3ce 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2210,6 +2210,15 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/science/research) +"alL" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "alP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -2219,20 +2228,6 @@ "alW" = ( /turf/closed/wall, /area/commons/storage/tools) -"alZ" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "ame" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/bot{ @@ -2350,21 +2345,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/security/checkpoint/supply) -"amC" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = -32 - }, -/turf/open/floor/carpet, -/area/service/library) "amD" = ( /turf/open/floor/iron, /area/commons/storage/primary) @@ -4570,6 +4550,27 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/science/xenobiology) +"ava" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_ccw, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = -28 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = -34 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -40 + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/directions/vault{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/left) "avc" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -4775,6 +4776,25 @@ /obj/effect/landmark/observer_start, /turf/open/floor/iron, /area/hallway/primary/tram/center) +"avW" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -28 + }, +/obj/structure/sign/directions/medical{ + pixel_y = -34 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = -40 + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/directions/upload{ + dir = 4; + pixel_y = -22 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/center) "avX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -5555,20 +5575,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/vault, /area/hallway/primary/tram/left) -"azz" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "azA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, @@ -6254,6 +6260,33 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/security/checkpoint/escape) +"aDv" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ + dir = 1 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 28 + }, +/obj/structure/sign/directions/security{ + dir = 8; + pixel_y = 34 + }, +/obj/structure/sign/directions/command{ + dir = 8; + pixel_y = 40 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/directions/vault{ + dir = 8; + pixel_y = 22 + }, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/center) "aDw" = ( /obj/structure/sign/poster/official/report_crimes{ pixel_y = -32 @@ -7477,6 +7510,13 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/commons/dorms) +"aHZ" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/science/robotics/lab) "aIc" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -8081,21 +8121,6 @@ /obj/machinery/navbeacon/wayfinding/bar, /turf/open/floor/iron, /area/hallway/primary/tram/center) -"aOt" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = -32 - }, -/turf/open/floor/carpet, -/area/service/library) "aOv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9654,6 +9679,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"bcN" = ( +/obj/structure/sign/directions/engineering{ + pixel_y = 40 + }, +/turf/closed/wall/r_wall, +/area/command/teleporter) "bcU" = ( /obj/machinery/door/airlock/mining{ name = "Ore Silo Access"; @@ -9699,15 +9730,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) -"bdI" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/turf/open/floor/engine, -/area/engineering/supermatter) "bdJ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -10617,6 +10639,15 @@ }, /turf/open/floor/plating, /area/science/research) +"bwd" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "bwg" = ( /obj/machinery/button/door/incinerator_vent_atmos_aux{ pixel_x = -8; @@ -10827,13 +10858,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/commons/toilet/restrooms) -"bzB" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/science/robotics/lab) "bzF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ dir = 8 @@ -11393,6 +11417,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/science/mixing) +"bOw" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + dir = 1; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/turf/open/floor/carpet, +/area/service/library) "bOz" = ( /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" @@ -11875,6 +11914,19 @@ }, /turf/open/floor/iron/freezer, /area/science/research) +"bYZ" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/service/bar) "bZi" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -20710,6 +20762,21 @@ }, /turf/open/floor/iron, /area/maintenance/tram/left) +"fqD" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + dir = 1; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/turf/open/floor/carpet, +/area/service/library) "fqJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -22220,13 +22287,6 @@ }, /turf/open/floor/plating, /area/maintenance/tram/mid) -"fSC" = ( -/obj/machinery/icecream_vat, -/obj/machinery/airalarm/kitchen_cold_room{ - pixel_y = 24 - }, -/turf/open/floor/iron/showroomfloor, -/area/service/kitchen/coldroom) "fSF" = ( /turf/open/floor/plating/elevatorshaft, /area/security/prison) @@ -25066,33 +25126,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) -"gXJ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ - dir = 1 - }, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = 28 - }, -/obj/structure/sign/directions/security{ - dir = 8; - pixel_y = 34 - }, -/obj/structure/sign/directions/command{ - dir = 8; - pixel_y = 40 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/directions/vault{ - dir = 8; - pixel_y = 22 - }, -/obj/effect/landmark/start/hangover, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/center) "gYh" = ( /obj/machinery/computer/operating{ dir = 8 @@ -28386,6 +28419,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/science/lab) +"imK" = ( +/obj/machinery/icecream_vat, +/obj/machinery/airalarm/kitchen_cold_room{ + pixel_y = 24 + }, +/turf/open/floor/iron/showroomfloor, +/area/service/kitchen/coldroom) "imM" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -29813,6 +29853,15 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white, /area/science/research) +"iLp" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "iLD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -31358,30 +31407,6 @@ "jqQ" = ( /turf/open/floor/engine, /area/engineering/supermatter/room) -"jrd" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ - dir = 1 - }, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = 28 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = 34 - }, -/obj/structure/sign/directions/command{ - dir = 1; - pixel_y = 40 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/directions/vault{ - dir = 1; - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/tram/left) "jre" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Chemistry Maintenance"; @@ -38617,6 +38642,15 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/ce) +"mpn" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "mpr" = ( /obj/effect/turf_decal/trimline/green/corner, /obj/effect/turf_decal/trimline/green/corner{ @@ -39662,27 +39696,6 @@ }, /turf/open/floor/iron/white, /area/medical/pharmacy) -"mNY" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_ccw, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = -28 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = -34 - }, -/obj/structure/sign/directions/command{ - dir = 1; - pixel_y = -40 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/directions/vault{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/left) "mOo" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 @@ -45135,6 +45148,20 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/genetics) +"oXg" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "oXj" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/light/small/directional/west, @@ -45995,6 +46022,30 @@ /obj/item/radio, /turf/open/floor/plating/airless, /area/mine/explored) +"pov" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ + dir = 1 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 28 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 34 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = 40 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/directions/vault{ + dir = 1; + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/tram/left) "poO" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -50101,25 +50152,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/white, /area/medical/medbay/central) -"qUB" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw, -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = -28 - }, -/obj/structure/sign/directions/medical{ - pixel_y = -34 - }, -/obj/structure/sign/directions/engineering{ - pixel_y = -40 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/directions/upload{ - dir = 4; - pixel_y = -22 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/center) "qUO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -55794,15 +55826,6 @@ }, /turf/open/floor/iron/white, /area/science/robotics/lab) -"tip" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/turf/open/floor/engine, -/area/engineering/supermatter) "tiq" = ( /turf/open/floor/iron, /area/cargo/storage) @@ -57620,12 +57643,6 @@ }, /turf/open/floor/plating, /area/maintenance/tram/right) -"tSw" = ( -/obj/structure/sign/directions/engineering{ - pixel_y = 40 - }, -/turf/closed/wall/r_wall, -/area/command/teleporter) "tSC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -64766,6 +64783,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/main) +"wME" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "wNa" = ( /obj/effect/landmark/start/depsec/engineering, /obj/structure/chair/office, @@ -67017,19 +67048,6 @@ /obj/machinery/telecomms/server/presets/security, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"xFp" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/service/bar) "xFv" = ( /obj/effect/decal/cleanable/dirt, /obj/item/screwdriver, @@ -87502,7 +87520,7 @@ aEc aEc dhe aCa -alZ +oXg lDT kAc aFN @@ -87512,7 +87530,7 @@ kQF aFN aFN xTs -aOt +fqD aKl aKl aKl @@ -87759,7 +87777,7 @@ aMK aEc dhe aCa -azz +wME lDT hqP sLF @@ -87769,7 +87787,7 @@ xTs xTs xTs xTs -amC +bOw aCa anD alI @@ -98845,9 +98863,9 @@ eeA oms wKG roS -tip -tip -tip +iLp +alL +iLp wKG qMI mlb @@ -99873,9 +99891,9 @@ cps wKG oAv roS -bdI -bdI -bdI +mpn +bwd +mpn wKG jqb gNU @@ -101088,7 +101106,7 @@ lYO amK vif jZY -fSC +imK nIq xos jZY @@ -101354,7 +101372,7 @@ aKt acU amm aej -xFp +bYZ iFb reZ ayI @@ -153794,7 +153812,7 @@ kzH eFM xWF aDN -tSw +bcN acE anG awF @@ -155338,7 +155356,7 @@ iMZ hKt kYm auX -mNY +ava anG axX vUA @@ -155346,7 +155364,7 @@ azB qbg axX anG -jrd +pov aEH aJV asq @@ -165626,7 +165644,7 @@ xJA kpr tlq avn -gXJ +aDv aFf aGi aFD @@ -167160,7 +167178,7 @@ frk xwL xwL aOk -qUB +avW avn tlq pss @@ -174380,7 +174398,7 @@ qwW fuC npC aHT -bzB +aHZ dyg lSU nBt diff --git a/_maps/map_files/tramstation/tramstation_skyrat.dmm b/_maps/map_files/tramstation/tramstation_skyrat.dmm index bea1f500384..b3ab8eaf636 100644 --- a/_maps/map_files/tramstation/tramstation_skyrat.dmm +++ b/_maps/map_files/tramstation/tramstation_skyrat.dmm @@ -29697,6 +29697,13 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"ivV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "iwb" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, @@ -31469,10 +31476,10 @@ /turf/open/floor/plating, /area/maintenance/central/secondary) "jdd" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "jdj" = ( @@ -31513,6 +31520,13 @@ /obj/structure/girder, /turf/open/floor/plating, /area/mine/explored) +"jef" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "jek" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -44413,10 +44427,10 @@ /turf/open/floor/engine/air, /area/engineering/atmos) "oyb" = ( -/obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "oyh" = ( @@ -98636,7 +98650,7 @@ oms wKG nfK jdd -jdd +ivV jdd wKG jgj @@ -99664,7 +99678,7 @@ wKG oAv nfK oyb -oyb +jef oyb wKG knR diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 967ce5e4d07..eb49762c85c 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -173,6 +173,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define ZAP_MOB_DAMAGE (1<<3) #define ZAP_MOB_STUN (1<<4) #define ZAP_GENERATES_POWER (1<<5) +/// Zaps with this flag will generate less power through tesla coils +#define ZAP_LOW_POWER_GEN (1<<6) #define ZAP_DEFAULT_FLAGS ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE #define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index c0b618e630d..19cdcbc9a6f 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -219,19 +219,6 @@ greyscale_colors = CIRCUIT_COLOR_ENGINEERING build_path = /obj/machinery/rnd/production/protolathe/department/engineering -/obj/item/circuitboard/machine/rad_collector - name = "Radiation Collector (Machine Board)" - greyscale_colors = CIRCUIT_COLOR_ENGINEERING - desc = "Comes with a small amount solder of arranged in the corner: \"If you can read this, you're too close.\"" - build_path = /obj/machinery/power/rad_collector - req_components = list( - /obj/item/stack/cable_coil = 5, - /obj/item/stock_parts/matter_bin = 1, - /obj/item/stack/sheet/plasmarglass = 2, - /obj/item/stock_parts/capacitor = 1, - /obj/item/stock_parts/manipulator = 1) - needs_anchored = FALSE - /obj/item/circuitboard/machine/rtg name = "RTG (Machine Board)" greyscale_colors = CIRCUIT_COLOR_ENGINEERING diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index fe095f5ea41..7872a980f35 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -324,7 +324,7 @@ var/obj/structure/cable/C = T.get_cable_node() if(C) playsound(src, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) - tesla_zap(src, 3, C.newavail() * 0.01, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_ALLOW_DUPLICATES) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. + tesla_zap(src, 3, C.newavail() * 0.01, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index a52a1b4be60..84466609168 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -71,11 +71,6 @@ unit_name = "field generator" export_types = list(/obj/machinery/field/generator) -/datum/export/large/collector - cost = CARGO_CRATE_VALUE * 2 - unit_name = "radiation collector" - export_types = list(/obj/machinery/power/rad_collector) - /datum/export/large/tesla_coil cost = CARGO_CRATE_VALUE * 2.25 unit_name = "tesla coil" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index df7d5c1f803..4fd001980e1 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -946,15 +946,6 @@ crate_name = "grounding rod crate" crate_type = /obj/structure/closet/crate/engineering/electrical -/datum/supply_pack/engine/collector - name = "Radiation Collector Crate" - desc = "Contains three radiation collectors. Useful for collecting energy off nearby Supermatter Crystals, Singularities or Teslas!" - cost = CARGO_CRATE_VALUE * 8 - contains = list(/obj/machinery/power/rad_collector, - /obj/machinery/power/rad_collector, - /obj/machinery/power/rad_collector) - crate_name = "collector crate" - /datum/supply_pack/engine/solar name = "Solar Panel Crate" desc = "Go green with this DIY advanced solar array. Contains twenty one solar assemblies, a solar-control circuit board, and tracker. If you have any questions, please check out the enclosed instruction book." diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index eecf13a857d..505d740891d 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -16,7 +16,6 @@ req_access = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS) max_integrity = 350 integrity_failure = 0.2 - circuit = /obj/item/circuitboard/machine/rad_collector rad_insulation = RAD_EXTREME_INSULATION ///Stores the loaded tank instance var/obj/item/tank/internals/plasma/loaded_tank = null diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index d83c1839882..c10043b3dd2 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -221,7 +221,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/power_changes = TRUE ///Disables the sm's proccessing totally. var/processes = TRUE - + ///Stores the time of when the last zap occurred + var/last_power_zap = 0 /obj/machinery/power/supermatter_crystal/Initialize(mapload) @@ -493,7 +494,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //Ok, get the air from the turf var/datum/gas_mixture/env = local_turf.return_air() - + var/env_pressure = env.return_pressure() var/datum/gas_mixture/removed if(produces_gas) //Remove gas from surrounding area @@ -650,6 +651,23 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //(1 + (tritRad + pluoxDampen * bzDampen * o2Rad * plasmaRad / (10 - bzrads))) * freonbonus radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus/(10-(gas_comp[/datum/gas/bz] * BZ_RADIOACTIVITY_MODIFIER)))) * freonbonus))// RadModBZ(500%) + //Zaps around 2.5 seconds at 1500 MeV, limited to 0.5 from 4000 MeV and up + if(power && (last_power_zap + 4 SECONDS - (power * 0.001)) < world.time) + //(1 + (tritRad + pluoxDampen * bzDampen * o2Rad * plasmaRad / (10 - bzrads))) * freonbonus + playsound(src, 'sound/weapons/emitter2.ogg', 70, TRUE) + var/power_multiplier = max(0, (1 + (power_transmission_bonus / (10 - (gas_comp[/datum/gas/bz] * BZ_RADIOACTIVITY_MODIFIER)))) * freonbonus)// RadModBZ(500%) + var/pressure_multiplier = max((1 / ((env_pressure ** 1.5) + 5.5) * 0.01) + 0.8, 1) + var/co2_power_increase = max(gas_comp[/datum/gas/carbon_dioxide] * 2, 1) + supermatter_zap( + zapstart = src, + range = 3, + zap_str = 2.5 * power * power_multiplier * pressure_multiplier * co2_power_increase, + zap_flags = ZAP_SUPERMATTER_FLAGS, + zap_cutoff = 300, + power_level = power + ) + last_power_zap = world.time + if(prob(gas_comp[/datum/gas/zauker])) playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10) supermatter_zap(src, 6, clamp(power*2, 4000, 20000), ZAP_MOB_STUN, zap_cutoff = src.zap_cutoff, power_level = power, zap_icon = src.zap_icon) @@ -1242,58 +1260,61 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if(arc_targets.len)//Pick from our pool target = pick(arc_targets) - if(!QDELETED(target))//If we found something - //Do the animation to zap to it from here - if(!(zap_flags & ZAP_ALLOW_DUPLICATES)) - LAZYSET(targets_hit, target, TRUE) - zapstart.Beam(target, icon_state=zap_icon, time = 5) - var/zapdir = get_dir(zapstart, target) - if(zapdir) - . = zapdir + if(QDELETED(target))//If we didn't found something + return - //Going boom should be rareish - if(prob(80)) - zap_flags &= ~ZAP_MACHINE_EXPLOSIVE - if(target_type == COIL) - //In the best situation we can expect this to grow up to 2120kw before a delam/IT'S GONE TOO FAR FRED SHUT IT DOWN - //The formula for power gen is zap_str * zap_mod / 2 * capacitor rating, between 1 and 4 - var/multi = 10 - switch(power_level)//Between 7k and 9k it's 20, above that it's 40 - if(SEVERE_POWER_PENALTY_THRESHOLD to CRITICAL_POWER_PENALTY_THRESHOLD) - multi = 20 - if(CRITICAL_POWER_PENALTY_THRESHOLD to INFINITY) - multi = 40 - target.zap_act(zap_str * multi, zap_flags) - zap_str /= 3 //Coils should take a lot out of the power of the zap - - else if(isliving(target))//If we got a fleshbag on our hands - var/mob/living/creature = target - creature.set_shocked() - addtimer(CALLBACK(creature, /mob/living/proc/reset_shocked), 10) - //3 shots a human with no resistance. 2 to crit, one to death. This is at at least 10000 power. - //There's no increase after that because the input power is effectivly capped at 10k - //Does 1.5 damage at the least - var/shock_damage = ((zap_flags & ZAP_MOB_DAMAGE) ? (power_level / 200) - 10 : rand(5,10)) - creature.electrocute_act(shock_damage, "Supermatter Discharge Bolt", 1, ((zap_flags & ZAP_MOB_STUN) ? SHOCK_TESLA : SHOCK_NOSTUN)) - zap_str /= 1.5 //Meatsacks are conductive, makes working in pairs more destructive + //Do the animation to zap to it from here + if(!(zap_flags & ZAP_ALLOW_DUPLICATES)) + LAZYSET(targets_hit, target, TRUE) + zapstart.Beam(target, icon_state=zap_icon, time = 0.5 SECONDS) + var/zapdir = get_dir(zapstart, target) + if(zapdir) + . = zapdir + //Going boom should be rareish + if(prob(80)) + zap_flags &= ~ZAP_MACHINE_EXPLOSIVE + if(target_type == COIL) + var/multi = 2 + switch(power_level)//Between 7k and 9k it's 4, above that it's 8 + if(SEVERE_POWER_PENALTY_THRESHOLD to CRITICAL_POWER_PENALTY_THRESHOLD) + multi = 4 + if(CRITICAL_POWER_PENALTY_THRESHOLD to INFINITY) + multi = 8 + if(zap_flags & ZAP_SUPERMATTER_FLAGS) + var/remaining_power = target.zap_act(zap_str * multi, zap_flags) + zap_str = remaining_power * 0.5 //Coils should take a lot out of the power of the zap else - zap_str = target.zap_act(zap_str, zap_flags) - //This gotdamn variable is a boomer and keeps giving me problems - var/turf/target_turf = get_turf(target) - var/pressure = 1 - if(target_turf?.return_air()) - pressure = max(1,target_turf.return_air().return_pressure()) - //We get our range with the strength of the zap and the pressure, the higher the former and the lower the latter the better - var/new_range = clamp(zap_str / pressure * 10, 2, 7) - var/zap_count = 1 - if(prob(5)) - zap_str -= (zap_str/10) - zap_count += 1 - for(var/j in 1 to zap_count) - if(zap_count > 1) - targets_hit = targets_hit.Copy() //Pass by ref begone - supermatter_zap(target, new_range, zap_str, zap_flags, targets_hit, zap_cutoff, power_level, zap_icon) + zap_str /= 3 + + else if(isliving(target))//If we got a fleshbag on our hands + var/mob/living/creature = target + creature.set_shocked() + addtimer(CALLBACK(creature, /mob/living/proc/reset_shocked), 1 SECONDS) + //3 shots a human with no resistance. 2 to crit, one to death. This is at at least 10000 power. + //There's no increase after that because the input power is effectivly capped at 10k + //Does 1.5 damage at the least + var/shock_damage = ((zap_flags & ZAP_MOB_DAMAGE) ? (power_level / 200) - 10 : rand(5,10)) + creature.electrocute_act(shock_damage, "Supermatter Discharge Bolt", 1, ((zap_flags & ZAP_MOB_STUN) ? SHOCK_TESLA : SHOCK_NOSTUN)) + zap_str /= 1.5 //Meatsacks are conductive, makes working in pairs more destructive + + else + zap_str = target.zap_act(zap_str, zap_flags) + //This gotdamn variable is a boomer and keeps giving me problems + var/turf/target_turf = get_turf(target) + var/pressure = 1 + if(target_turf?.return_air()) + pressure = max(1,target_turf.return_air().return_pressure()) + //We get our range with the strength of the zap and the pressure, the higher the former and the lower the latter the better + var/new_range = clamp(zap_str / pressure * 10, 2, 7) + var/zap_count = 1 + if(prob(5)) + zap_str -= (zap_str/10) + zap_count += 1 + for(var/j in 1 to zap_count) + if(zap_count > 1) + targets_hit = targets_hit.Copy() //Pass by ref begone + supermatter_zap(target, new_range, zap_str, zap_flags, targets_hit, zap_cutoff, power_level, zap_icon) /obj/overlay/psy icon = 'icons/obj/supermatter.dmi' diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 040d0dafefe..2cdb11c5884 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -13,14 +13,25 @@ circuit = /obj/item/circuitboard/machine/tesla_coil - var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE + ///Flags of the zap that the coil releases when the wire is pulsed + var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN + ///Multiplier for power conversion var/input_power_multiplier = 1 + ///Cooldown between pulsed zaps var/zap_cooldown = 100 + ///Reference to the last zap done var/last_zap = 0 + ///Amount of power stored inside the coil to be released in the powernet + var/stored_energy = 0 + +/obj/machinery/power/tesla_coil/anchored + anchored = TRUE /obj/machinery/power/tesla_coil/Initialize(mapload) . = ..() wires = new /datum/wires/tesla_coil(src) + if(anchored) + connect_to_network() /obj/machinery/power/tesla_coil/should_have_node() return anchored @@ -71,25 +82,26 @@ return ..() +/obj/machinery/power/tesla_coil/process(delta_time) + var/power_produced = min(stored_energy, (stored_energy * 0.04) + 1000) * delta_time + add_avail(power_produced) + stored_energy -= power_produced + /obj/machinery/power/tesla_coil/zap_act(power, zap_flags) - if(anchored && !panel_open) - //don't lose arc power when it's not connected to anything - //please place tesla coils all around the station to maximize effectiveness - obj_flags |= BEING_SHOCKED - addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS) - zap_buckle_check(power) - if(zap_flags & ZAP_GENERATES_POWER) //I don't want no tesla revolver making 8GW you hear - return power / 2 - var/power_produced = powernet ? power * input_power_multiplier : power - add_avail(power_produced) - var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_ENG) - if(D) - D.adjust_money(min(power_produced, 1)) - flick("coilhit", src) - playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) - return power - power_produced //You get back the amount we didn't use - else - . = ..() + if(!anchored || panel_open) + return ..() + obj_flags |= BEING_SHOCKED + addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS) + flick("coilhit", src) + playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) + if(!(zap_flags & ZAP_GENERATES_POWER)) //Prevent infinite recursive power + return 0 + if(zap_flags & ZAP_LOW_POWER_GEN) + power /= 10 + zap_buckle_check(power) + var/power_removed = powernet ? power * input_power_multiplier : power + stored_energy += max((power_removed - 80) * 200, 0) + return max(power - power_removed, 0) //You get back the amount we didn't use /obj/machinery/power/tesla_coil/proc/zap() if((last_zap + zap_cooldown) > world.time || !powernet) @@ -114,6 +126,9 @@ buckle_lying = 0 buckle_requires_restraints = TRUE +/obj/machinery/power/grounding_rod/anchored + anchored = TRUE + /obj/machinery/power/grounding_rod/default_unfasten_wrench(mob/user, obj/item/I, time = 20) . = ..() if(. == SUCCESSFUL_UNFASTEN) diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm index 52d94a942ff..9afb816088f 100644 --- a/code/modules/projectiles/projectile/energy/tesla.dm +++ b/code/modules/projectiles/projectile/energy/tesla.dm @@ -3,7 +3,7 @@ icon_state = "tesla_projectile" impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser damage = 10 //A worse lasergun - var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE + var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN var/zap_range = 3 var/power = 10000 diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 71ffe97c7f1..31dec465216 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -479,7 +479,7 @@ var/zap_power = 20000 var/zap_range = 15 - var/zap_flags = ZAP_MOB_DAMAGE | ZAP_MOB_STUN | ZAP_OBJ_DAMAGE + var/zap_flags = ZAP_MOB_DAMAGE | ZAP_MOB_STUN | ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN var/chain var/mob/living/caster @@ -502,7 +502,7 @@ /obj/projectile/magic/aoe/lightning/no_zap zap_power = 10000 zap_range = 4 - zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE + zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN /obj/projectile/magic/aoe/lightning/Destroy() qdel(chain) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index feccf72d85e..cf4ca82baac 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -539,7 +539,7 @@ modifier = -100 mix_message = "The teslium starts to spark as electricity arcs away from it!" mix_sound = 'sound/machines/defib_zap.ogg' - var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN + var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN reaction_tags = REACTION_TAG_EASY | REACTION_TAG_EXPLOSIVE | REACTION_TAG_DANGEROUS /datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 3c45dddc148..b635ed98943 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -467,14 +467,6 @@ category = list ("Misc. Machinery") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE -/datum/design/board/rad_collector - name = "Machine Design (Radiation Collector Board)" - desc = "The circuit board for a radiation collector array." - id = "rad_collector" - build_path = /obj/item/circuitboard/machine/rad_collector - category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE - /datum/design/board/grounding_rod name = "Machine Design (Grounding Rod Board)" desc = "The circuit board for a grounding rod." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index fb62154d321..78444fada51 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -484,7 +484,6 @@ "pneumatic_seal", "power control", "powermonitor", - "rad_collector", "recharger", "recycler", "rped", diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm index 6ac151adc2f..7902b912c9d 100644 --- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm @@ -95,7 +95,7 @@ playsound(carbon, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) carbon.cut_overlay(overcharge) - tesla_zap(carbon, 2, crystal_charge*2.5, ZAP_OBJ_DAMAGE | ZAP_ALLOW_DUPLICATES) + tesla_zap(carbon, 2, crystal_charge*2.5, ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES) adjust_charge(ETHEREAL_CHARGE_FULL - crystal_charge) to_chat(carbon, span_warning("You violently discharge energy!")) carbon.visible_message(span_danger("[carbon] violently discharges energy!"))