From 88af37bfcf564b9f433a74839ab0756dfcee780d Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 26 Apr 2024 18:31:09 -0400 Subject: [PATCH] Adds the NTSS Shadow (#24778) * WIP * change this * the rest of the fucking owl * removes QWERTODO * let us fix the CC beacons too * makes it look better * makes CI work on everything but shadow, asking warriorstar * exclude ntss shadow from window spawner checks * final changes hopefully * moved around parts of the shuttle * Update code/modules/atmospherics/machinery/components/trinary_devices/filter.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * moves it moves it to it's own file * move it move it * bobby_drop_tables * oops * fuck --------- Co-authored-by: warriorstar-orion Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- _maps/map_files/generic/centcomm.dmm | 88 +- _maps/map_files/shuttles/emergency_shadow.dmm | 1869 +++++++++++++++++ _maps/map_files/stations/boxstation.dmm | 119 +- _maps/map_files/stations/cerestation.dmm | 4 +- _maps/map_files/stations/deltastation.dmm | 212 +- _maps/map_files/stations/metastation.dmm | 4 +- code/datums/shuttles.dm | 6 + code/game/machinery/doors/firedoor.dm | 1 - .../components/unary_devices/passive_vent.dm | 1 - .../mission_code/shuttle_shadow.dm | 32 + .../supply/supply_packs/pack_shuttle.dm | 5 + paradise.dme | 1 + .../maplint/lints/grille_window_stacking.yml | 4 + tools/maplint/source/__main__.py | 3 + tools/maplint/source/lint.py | 5 + 15 files changed, 2146 insertions(+), 208 deletions(-) create mode 100644 _maps/map_files/shuttles/emergency_shadow.dmm create mode 100644 code/modules/awaymissions/mission_code/shuttle_shadow.dm diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 816b7af9022..c5859d8697f 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -2878,12 +2878,12 @@ "kf" = ( /obj/docking_port/stationary{ area_type = /area/syndicate_mothership; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_syndicate"; name = "404 Not Found"; turf_type = /turf/simulated/floor/plating/asteroid/snow/airless; - width = 33 + width = 41 }, /turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) @@ -4489,11 +4489,11 @@ "pf" = ( /obj/docking_port/stationary/transit{ dir = 4; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_transit"; name = "emergency in transit"; - width = 33 + width = 41 }, /turf/space/transit, /area/space/centcomm) @@ -12184,11 +12184,11 @@ }, /obj/docking_port/stationary{ dir = 4; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_away"; name = "emergency centcom"; - width = 33 + width = 41 }, /turf/simulated/floor/plating, /area/shuttle/escape) @@ -49336,11 +49336,11 @@ aN aN aN aN -aN Db aN aN aN +aN Db aN aN @@ -49375,10 +49375,10 @@ Db aN aN aN +Db aN aN -aN -aN +Db aN aN aN @@ -50621,12 +50621,12 @@ aN aN aN aN -aN Db aN aN aN aN +aN od od vy @@ -50656,6 +50656,13 @@ XB od ux ux +aN +aN +aN +aN +aN +aN +aN Db aN aN @@ -50746,13 +50753,6 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN "} (141,1,1) = {" aN @@ -51906,12 +51906,12 @@ aN aN aN aN -aN Db aN aN aN aN +aN vy Ez Fq @@ -51941,6 +51941,13 @@ Pb vy Iv Zp +aN +aN +aN +aN +aN +aN +aN Db aN aN @@ -52031,13 +52038,6 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN "} (146,1,1) = {" aN @@ -52420,12 +52420,12 @@ aN aN aN aN -aN Db aN aN aN aN +aN vy EE Fo @@ -52455,6 +52455,13 @@ JC vy Iv Zp +aN +aN +aN +aN +aN +aN +aN Db aN aN @@ -52545,13 +52552,6 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN "} (148,1,1) = {" aN @@ -53705,7 +53705,6 @@ aN aN aN aN -aN Db aN aN @@ -53716,6 +53715,7 @@ aN aN aN aN +aN od JC Mc @@ -53740,6 +53740,13 @@ qF od Iv Zp +aN +aN +aN +aN +aN +aN +aN Db aN aN @@ -53830,13 +53837,6 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN "} (153,1,1) = {" aN @@ -54990,11 +54990,11 @@ aN aN aN aN -aN Db aN aN aN +aN Db aN aN @@ -55029,10 +55029,10 @@ Db aN aN aN +Db aN aN -aN -aN +Db aN aN aN diff --git a/_maps/map_files/shuttles/emergency_shadow.dmm b/_maps/map_files/shuttles/emergency_shadow.dmm new file mode 100644 index 00000000000..45bc697bdcf --- /dev/null +++ b/_maps/map_files/shuttles/emergency_shadow.dmm @@ -0,0 +1,1869 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"af" = ( +/obj/structure/bed/dogbed, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"ao" = ( +/obj/effect/turf_decal/stripes/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"aK" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = -3 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"aZ" = ( +/obj/effect/turf_decal/stripes/red/corner, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"bh" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"bD" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"bH" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/restraints/handcuffs, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"bT" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"cv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/hyper, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"cF" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"cH" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"cV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"cX" = ( +/obj/structure/window/full/plasmareinforced, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"dw" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"ee" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Infirmary" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"eJ" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"fb" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"fi" = ( +/obj/machinery/recharger, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"fE" = ( +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/machinery/igniter/on, +/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow{ + dir = 4; + invisibility = 99 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"fV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"ge" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"gs" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/trinary/filter/shadow{ + invisibility = 99 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"gF" = ( +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"gG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"gV" = ( +/obj/structure/marker_beacon/dock_marker/collision, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"hm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"hz" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/dispenser, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"ix" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"jl" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"jB" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/escape) +"jR" = ( +/turf/simulated/floor/engine/o2, +/area/shuttle/escape) +"kx" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"kU" = ( +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"kY" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/storage/surgical_tray, +/obj/item/stack/nanopaste, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"ll" = ( +/obj/machinery/computer/security, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"lo" = ( +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"lw" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"lD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"mp" = ( +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"mw" = ( +/obj/machinery/sleeper, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"my" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"nq" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"nL" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"nQ" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"ow" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/escape) +"oK" = ( +/mob/living/simple_animal/bot/medbot, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"oQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"pi" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"qk" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"qo" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/flash, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"rg" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"rm" = ( +/obj/machinery/computer/emergency_shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"rS" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"sh" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"sE" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"tb" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"uu" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"uA" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"uF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"uL" = ( +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/machinery/door/airlock/command/glass{ + name = "Cockpit" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"uW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/escape) +"vv" = ( +/obj/machinery/atmospherics/portable/canister/air, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"vw" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"vx" = ( +/obj/item/defibrillator/loaded, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"vU" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/escape) +"wb" = ( +/obj/structure/window/full/plastitanium, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/grille, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"wj" = ( +/obj/machinery/space_heater, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"wz" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"wF" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"xy" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"yg" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"yQ" = ( +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"yU" = ( +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/shuttle/escape) +"zj" = ( +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"zs" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow"; + dir = 1 + }, +/area/shuttle/escape) +"zu" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"zI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Ah" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow"; + dir = 1 + }, +/area/shuttle/escape) +"AA" = ( +/obj/effect/turf_decal/arrows, +/obj/effect/turf_decal/arrows{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"AS" = ( +/obj/effect/turf_decal/stripes/white/line, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Bm" = ( +/obj/machinery/sleeper, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Bu" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/red/line, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"BB" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/machinery/recharger, +/obj/item/gun/energy/gun/mini, +/obj/machinery/firealarm{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"BJ" = ( +/mob/living/simple_animal/bot/secbot, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Cw" = ( +/turf/template_noop, +/area/template_noop) +"CD" = ( +/obj/machinery/igniter/shadow, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"CK" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"Dl" = ( +/obj/structure/window/full/plastitanium, +/obj/structure/grille, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"Dq" = ( +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Dz" = ( +/obj/item/storage/box/cups, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"DN" = ( +/obj/structure/window/full/plastitanium, +/obj/machinery/door/firedoor/heavy, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"DY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"DZ" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"EM" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"Fn" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"Fu" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Fz" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"FT" = ( +/obj/structure/closet/crate/freezer/iv_storage, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/shuttle/escape) +"FW" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/delivery/red, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Gp" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Gs" = ( +/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow{ + dir = 4; + invisibility = 99 + }, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"Gx" = ( +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/shuttle/escape) +"GB" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/storage/firstaid/doctor, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"GC" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"GI" = ( +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"GK" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"GR" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Hh" = ( +/obj/structure/rack, +/obj/item/soap/nanotrasen, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/machinery/alarm/directional/north, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow"; + dir = 1 + }, +/area/shuttle/escape) +"Hu" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"HB" = ( +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"IG" = ( +/obj/structure/chair/comfy/shuttle, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"IR" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Jh" = ( +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Jw" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"JM" = ( +/obj/machinery/door/airlock/hatch, +/obj/docking_port/mobile/emergency{ + dir = 2; + name = "NTSS Shadow emergency shuttle"; + dwidth = 16; + width = 41; + timid = 1; + height = 13 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"Kf" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/structure/decorative_structures/flammable/lava_land_display{ + pixel_x = 12 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Lv" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"LA" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"LI" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"LJ" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/megaphone, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"MP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"MT" = ( +/obj/effect/turf_decal/stripes/red/corner, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"Nd" = ( +/obj/machinery/hologram/holopad, +/obj/effect/turf_decal/box/white, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"NI" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"NO" = ( +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Brig" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Oe" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"OL" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow"; + dir = 1 + }, +/area/shuttle/escape) +"OU" = ( +/obj/machinery/space_heater, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"OX" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"PX" = ( +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"Qj" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plasteel{ + icon_regular_floor = "yellowsiding"; + icon_state = "tranquillite" + }, +/area/shuttle/escape) +"Qz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"QM" = ( +/obj/effect/turf_decal/stripes/white/corner, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Rk" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"RL" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"RS" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluecorners" + }, +/area/shuttle/escape) +"RV" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Sb" = ( +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/mask/surgical, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/reagent_containers/glass/bottle/reagent/hydrocodone, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Sn" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"So" = ( +/obj/item/lazarus_injector, +/obj/item/healthanalyzer, +/obj/machinery/light, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Tl" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/reagent_containers/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass{ + pixel_x = -5 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"TW" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Ux" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"US" = ( +/obj/structure/window/full/plastitanium, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"Vg" = ( +/obj/structure/rack, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"VD" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"VR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + name = "west bump"; + pixel_x = -27 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Wv" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"Wy" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/obj/machinery/door/firedoor/heavy, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"WQ" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"WW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/engine/plasma, +/area/shuttle/escape) +"Xp" = ( +/obj/structure/marker_beacon/dock_marker/collision, +/obj/machinery/atmospherics/unary/outlet_injector/on{ + dir = 1; + invisibility = 99 + }, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"XA" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/escape) +"XW" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Yb" = ( +/obj/structure/window/full/plasmareinforced, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/engine/airless, +/area/shuttle/escape) +"Yc" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Yq" = ( +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/machinery/door/airlock/command/glass{ + name = "Cockpit" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"YD" = ( +/obj/machinery/economy/vending/medical, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"YP" = ( +/obj/effect/turf_decal/delivery/blue/partial{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) +"Zc" = ( +/obj/item/surgical_drapes, +/obj/machinery/optable, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"Zk" = ( +/obj/item/storage/box/handcuffs, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Zq" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/pod/dark, +/area/shuttle/escape) +"ZN" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/escape) + +(1,1,1) = {" +Cw +Cw +Cw +CK +CK +CK +vU +CK +CK +CK +Cw +Cw +Cw +"} +(2,1,1) = {" +Cw +Cw +vU +fE +fE +fE +vU +fE +fE +fE +vU +Cw +Cw +"} +(3,1,1) = {" +Cw +Cw +vU +uW +uW +jB +vv +ow +uW +uW +vU +Cw +Cw +"} +(4,1,1) = {" +Cw +vU +XA +MT +vw +vw +LA +vw +vw +fb +XA +vU +Cw +"} +(5,1,1) = {" +gV +Dl +zs +Bu +NI +Yb +zu +cX +cX +Zq +wj +wb +Xp +"} +(6,1,1) = {" +Cw +vU +Ah +Sn +uu +fV +zj +Gs +cX +wF +OU +vU +Cw +"} +(7,1,1) = {" +vU +XA +Hh +bh +gs +oQ +DY +WW +cX +wF +aK +XA +vU +"} +(8,1,1) = {" +US +Lv +OL +Bu +tb +jR +CD +jR +cX +wF +cH +Lv +US +"} +(9,1,1) = {" +vU +hz +OL +Bu +Wv +Yb +Yb +Yb +Yb +my +cH +GR +vU +"} +(10,1,1) = {" +US +eJ +OL +wz +EM +EM +hm +EM +EM +nQ +cH +eJ +US +"} +(11,1,1) = {" +vU +vU +Wy +vU +DN +DN +vU +DN +DN +vU +Wy +vU +vU +"} +(12,1,1) = {" +US +xy +Dq +VR +cV +cV +cV +cV +cV +VR +QM +Oe +US +"} +(13,1,1) = {" +US +Jw +Rk +aZ +nq +nq +nq +nq +nq +DZ +AS +MP +US +"} +(14,1,1) = {" +vU +GK +Rk +XA +US +US +US +US +US +XA +AS +lD +vU +"} +(15,1,1) = {" +US +Jw +Rk +vU +kx +gF +Zk +gF +zI +vU +AS +MP +vU +"} +(16,1,1) = {" +US +Jw +Rk +vU +kx +gF +fi +gF +zI +vU +AS +MP +US +"} +(17,1,1) = {" +PX +AA +Rk +vU +cF +gF +BJ +gF +uF +vU +AS +MP +vU +"} +(18,1,1) = {" +vU +bD +Rk +vU +IG +gF +gF +gF +GC +vU +AS +MP +vU +"} +(19,1,1) = {" +PX +AA +Ux +vU +kx +gF +gF +gF +zI +vU +IR +MP +US +"} +(20,1,1) = {" +US +Qj +Rk +XA +US +US +NO +US +US +XA +AS +lD +vU +"} +(21,1,1) = {" +US +Hu +jl +RL +XW +XW +bT +XW +XW +yg +Gp +Dz +US +"} +(22,1,1) = {" +vU +FW +Fu +FW +Fu +FW +RV +FW +Fu +FW +Fu +FW +vU +"} +(23,1,1) = {" +US +ge +ZN +cV +yQ +yQ +lo +yQ +yQ +cV +LI +cv +US +"} +(24,1,1) = {" +US +OX +Rk +XA +US +US +ee +US +US +XA +AS +lD +vU +"} +(25,1,1) = {" +JM +AA +Rk +vU +vx +Fz +WQ +dw +Vg +vU +AS +MP +US +"} +(26,1,1) = {" +vU +bD +Rk +vU +qk +WQ +WQ +WQ +FT +vU +AS +MP +US +"} +(27,1,1) = {" +PX +AA +Rk +vU +Sb +WQ +oK +WQ +So +vU +AS +MP +vU +"} +(28,1,1) = {" +US +Jw +Rk +vU +Jh +WQ +WQ +WQ +Gx +vU +AS +MP +US +"} +(29,1,1) = {" +US +Jw +Ux +vU +Zc +kY +mw +YD +Bm +vU +IR +MP +US +"} +(30,1,1) = {" +vU +GK +Rk +XA +US +US +US +US +US +XA +AS +lD +vU +"} +(31,1,1) = {" +US +Jw +Rk +kU +YP +YP +YP +YP +YP +kU +AS +MP +US +"} +(32,1,1) = {" +US +pi +ao +mp +mp +mp +mp +mp +mp +mp +HB +pi +US +"} +(33,1,1) = {" +vU +vU +US +US +uL +vU +vU +vU +Yq +US +US +vU +vU +"} +(34,1,1) = {" +Cw +vU +lw +uA +kU +qo +BB +GB +kU +rS +bH +vU +Cw +"} +(35,1,1) = {" +Cw +vU +Tl +Qz +kU +sh +kU +sh +kU +RS +LJ +vU +Cw +"} +(36,1,1) = {" +Cw +vU +XA +TW +kU +kU +Nd +kU +kU +Yc +XA +vU +Cw +"} +(37,1,1) = {" +Cw +Cw +US +af +gG +kU +kU +kU +Fn +ix +US +Cw +Cw +"} +(38,1,1) = {" +Cw +Cw +US +US +sE +kU +Kf +kU +yU +US +US +Cw +Cw +"} +(39,1,1) = {" +Cw +Cw +Cw +US +ll +gG +rg +Fn +GI +US +Cw +Cw +Cw +"} +(40,1,1) = {" +Cw +Cw +Cw +US +US +VD +rm +nL +US +US +Cw +Cw +Cw +"} +(41,1,1) = {" +Cw +Cw +Cw +Cw +US +US +US +US +US +Cw +Cw +Cw +Cw +"} diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 31bfcbabf97..66adb73fc8a 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -22947,11 +22947,11 @@ "brK" = ( /obj/docking_port/stationary{ dir = 4; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_home"; name = "emergency evac bay"; - width = 33 + width = 41 }, /turf/space, /area/space) @@ -40410,6 +40410,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) "cDL" = ( @@ -67422,13 +67423,6 @@ icon_state = "darkyellow" }, /area/station/science/robotics/chargebay) -"kOa" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating/airless, -/area/station/science/toxins/test) "kOt" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, @@ -73862,6 +73856,15 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry/north) +"oao" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel/airless, +/area/station/science/toxins/test) "oap" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -76502,6 +76505,13 @@ icon_state = "dark" }, /area/station/medical/morgue) +"pkf" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel/airless, +/area/station/science/toxins/test) "pko" = ( /obj/structure/chair/stool{ dir = 8 @@ -79640,6 +79650,11 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) +"qES" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance, +/turf/simulated/floor/plasteel/airless, +/area/station/science/toxins/test) "qFg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -152677,9 +152692,9 @@ aaa aaa aaa aaa -doE -doE -doE +aaa +aaa +aaa aaa aaa aab @@ -152932,15 +152947,15 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa aab -gnU -ldS -clB -cnk -cid -cie -cie cie +cij cvs cie cie @@ -153189,18 +153204,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aab aab -ldS -cjZ -cjZ -cjZ cie -cie -ckb -cdK +pkf cjZ -udq -ckb +oao +cie cie cie clA @@ -153446,19 +153461,19 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa aab -ldS -cjZ -cjZ -cjZ -clB -ckb -ckb +aab +cie +cie cdK cjZ udq ckb -ckb +cie cie jgm cjZ @@ -153703,13 +153718,13 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aab aab -ldS -clA -kOa -jgm cie -ckb +cie ckb cdK cjZ @@ -153961,9 +153976,9 @@ aaa aaa aaa aaa -cid -cid -cie +aaa +aab +aab cie cie ckb @@ -154218,13 +154233,13 @@ aaa aaa aaa aaa -cid +aab +aab cie cie ckb ckb ckb -ckb cdK cjZ udq @@ -154474,10 +154489,10 @@ aaa aaa aaa aaa -aaa -cij +aab +aab +cie cie -ckb ckb ckb ckb @@ -154731,9 +154746,9 @@ aaa aaa aaa aaa -aaa +aab +cie cie -ckb ckb ckb ckb @@ -155247,7 +155262,7 @@ aaa aaa aab cie -ckb +qES ckb ckb ckb diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 31aa308fa5a..c85769be6e9 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -60296,11 +60296,11 @@ "mgu" = ( /obj/docking_port/stationary{ dir = 4; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_home"; name = "emergency evac bay"; - width = 33 + width = 41 }, /turf/space, /area/space) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 37a1dedd289..6d0af2fbf78 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -13792,6 +13792,10 @@ icon_state = "bar" }, /area/station/service/bar) +"aTq" = ( +/obj/effect/spawner/airlock, +/turf/simulated/wall, +/area/station/hallway/secondary/exit) "aTr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -61705,21 +61709,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "dHO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + d2 = 2; + icon_state = "1-2" }, +/obj/structure/cable, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "dHQ" = ( @@ -62698,11 +62694,11 @@ "dNS" = ( /obj/docking_port/stationary{ dir = 4; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_home"; name = "emergency evac bay"; - width = 33 + width = 41 }, /turf/space, /area/space) @@ -63953,6 +63949,16 @@ /obj/item/crowbar/red, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) +"dSB" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/obj/machinery/atmospherics/portable/canister/air, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "dSD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -64687,8 +64693,8 @@ /area/station/hallway/primary/central) "dUY" = ( /obj/machinery/light, -/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "dUZ" = ( @@ -66426,16 +66432,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/station/legal/lawoffice) -"evE" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable, -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/exit) "evX" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, @@ -66570,22 +66566,6 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/port/east) -"ezr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "ezR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -71043,16 +71023,6 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) -"hli" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/obj/machinery/atmospherics/portable/canister/air, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel/dark, @@ -73770,10 +73740,6 @@ icon_state = "bar" }, /area/station/service/kitchen) -"iVe" = ( -/obj/effect/spawner/airlock, -/turf/simulated/wall, -/area/station/service/chapel/office) "iVg" = ( /obj/machinery/economy/atm/directional/west, /turf/simulated/floor/plasteel{ @@ -75594,6 +75560,15 @@ icon_state = "whiteblue" }, /area/station/medical/storage) +"kdg" = ( +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "kdm" = ( /obj/machinery/power/apc/critical/directional/north, /obj/machinery/firealarm{ @@ -75694,15 +75669,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) -"kfC" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "kfT" = ( /obj/structure/cable{ d2 = 4; @@ -82388,6 +82354,22 @@ icon_state = "red" }, /area/station/security/permabrig) +"ogR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "ogX" = ( /obj/machinery/camera{ c_tag = "Experimentation Lab Office"; @@ -91325,21 +91307,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/research) -"tjT" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "tkb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -91872,6 +91839,24 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/port/west) +"tEp" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/exit) "tEw" = ( /obj/structure/showcase{ density = 0; @@ -92369,6 +92354,21 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) +"tSp" = ( +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, +/obj/machinery/newscaster{ + dir = 1; + name = "south bump"; + pixel_y = -28 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "tSt" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/drinkingglass{ @@ -136431,7 +136431,7 @@ dUQ dYU dIx abj -aaa +abj aaa aaa aaa @@ -136686,7 +136686,8 @@ dIx dIx dIx dIx -iVe +dIx +aTq abj aaa aaa @@ -136730,7 +136731,6 @@ aaa aaa aaa aaa -aaa "} (145,1,1) = {" aaa @@ -136931,6 +136931,7 @@ dLA dMo dKP dKP +dKP dOv dPb eBl @@ -136987,7 +136988,6 @@ aaa aaa aaa aaa -aaa "} (146,1,1) = {" aaa @@ -137189,6 +137189,7 @@ sZI dPM dPM dPM +dPM rCw dPM dPM @@ -137197,7 +137198,7 @@ dPM dkq dSs dSP -hli +dSB dIH dIH dIH @@ -137244,7 +137245,6 @@ aaa aaa aaa aaa -aaa "} (147,1,1) = {" aaa @@ -137446,6 +137446,7 @@ hVf dKo dKo dKo +dKo rvx dKo dKo @@ -137455,8 +137456,8 @@ dNa dXJ dKo dUj -kfC -tjT +kdg +tSp dIH abj aaa @@ -137501,7 +137502,6 @@ aaa aaa aaa aaa -aaa "} (148,1,1) = {" aaa @@ -137700,6 +137700,7 @@ cYk cYk cYk dbR +cYk dbV ddw dNa @@ -137758,7 +137759,6 @@ aaa aaa aaa aaa -aaa "} (149,1,1) = {" aaa @@ -137957,6 +137957,7 @@ dKo dKo dKo hVf +dKo dNb dNN dOw @@ -138015,7 +138016,6 @@ aaa aaa aaa aaa -aaa "} (150,1,1) = {" aaa @@ -138214,6 +138214,7 @@ dKo gkk dKo hVf +dKo dNc dNO dXF @@ -138272,7 +138273,6 @@ aaa aaa aaa aaa -aaa "} (151,1,1) = {" aaa @@ -138471,6 +138471,7 @@ dKo dKo dKo hVf +dKo dNb dNP dOw @@ -138529,7 +138530,6 @@ aaa aaa aaa aaa -aaa "} (152,1,1) = {" aaa @@ -138728,6 +138728,7 @@ dKp dKp dKp dIh +dKo dOu dNQ dOx @@ -138786,7 +138787,6 @@ aaa aaa aaa aaa -aaa "} (153,1,1) = {" aaa @@ -138985,6 +138985,7 @@ wgY rIb rIb pJE +dKo dNb bGr dOw @@ -139043,7 +139044,6 @@ aaa aaa aaa aaa -aaa "} (154,1,1) = {" aaa @@ -139245,6 +139245,7 @@ iFB iqq iqq iqq +iqq uFa sbt sDb @@ -139268,7 +139269,6 @@ aaa aaa aaa aaa -aaa aaZ aaa aaa @@ -139501,6 +139501,7 @@ nIs ngE kuJ kuJ +kuJ tJT dXn dXn @@ -139557,7 +139558,6 @@ aaa aaa aaa aaa -aaa "} (156,1,1) = {" aaa @@ -139758,6 +139758,7 @@ dTJ dMs jac jac +jac vSW scA ajq @@ -139814,7 +139815,6 @@ aaa aaa aaa aaa -aaa "} (157,1,1) = {" aaa @@ -140016,6 +140016,7 @@ dVp dKp dKp dKp +dKp pGr rev vJu @@ -140071,7 +140072,6 @@ aaa aaa aaa aaa -aaa "} (158,1,1) = {" aaa @@ -140273,6 +140273,7 @@ ulH dTy dTy dTy +dTy rmq msT dKP @@ -140328,7 +140329,6 @@ aaa aaa aaa aaa -aaa "} (159,1,1) = {" aaa @@ -140526,9 +140526,10 @@ pIY kuJ kpd kpd +tEp +dHO +dHO dHO -evE -evE tJT dKQ jpk @@ -140585,7 +140586,6 @@ aaa aaa aaa aaa -aaa "} (160,1,1) = {" aaa @@ -140786,6 +140786,7 @@ abj abj abj abj +abj pjC dKP pjC @@ -140842,7 +140843,6 @@ aaa aaa aaa aaa -aaa "} (161,1,1) = {" aaa @@ -141043,6 +141043,7 @@ aaa aaa aaa aaa +aaa pjC dKQ pjC @@ -141099,7 +141100,6 @@ aaa aaa aaa aaa -aaa "} (162,1,1) = {" aaa @@ -141303,8 +141303,8 @@ aaa aaa aaa aaa -dNS aaa +dNS aaa aaa aaa @@ -149011,7 +149011,7 @@ dGw dGw hGZ qgr -ezr +ogR wWW qfH sRk diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 2876dab601b..188474412c2 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -42602,11 +42602,11 @@ "cZp" = ( /obj/docking_port/stationary{ dir = 2; - dwidth = 15; + dwidth = 16; height = 21; id = "emergency_home"; name = "emergency evac bay"; - width = 33 + width = 41 }, /turf/space, /area/space) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 7c47f32eb81..a848d94a8bc 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -119,6 +119,12 @@ This escape shuttle boasts shields and numerous anti-personnel turrets guarding its perimeter to fend off meteors and enemy boarding attempts." admin_notes = "Comes with turrets that will target simple mobs." +/datum/map_template/shuttle/emergency/shadow + suffix = "shadow" + name = "The NTSS Shadow" + description = "Guaranteed to get you somewhere FAST. With a custom-built plasma engine, this bad boy will put more distance between you and certain danger than any other!" + admin_notes = "The aft of the ship has a plasma tank that starts ignited. May get released by crew. The plasma windows next to the engine heaters will also erupt into flame, and also risk getting released by crew." + /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index d829305b3d6..00defea21fb 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -338,7 +338,6 @@ name = "heavy firelock" icon = 'icons/obj/doors/doorfire.dmi' glass = FALSE - opacity = TRUE explosion_block = 2 assemblytype = /obj/structure/firelock_frame/heavy max_integrity = 550 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index df5daac3548..4468f0a662f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -21,7 +21,6 @@ /obj/machinery/atmospherics/unary/passive_vent/process_atmos() ..() - if(!node) return 0 diff --git a/code/modules/awaymissions/mission_code/shuttle_shadow.dm b/code/modules/awaymissions/mission_code/shuttle_shadow.dm new file mode 100644 index 00000000000..e1ed6df4c1f --- /dev/null +++ b/code/modules/awaymissions/mission_code/shuttle_shadow.dm @@ -0,0 +1,32 @@ +/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow + on = FALSE + +/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow/process_atmos() + if(!on) + return + ..() + +/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow/onTransitZ(old_z, new_z) + . = ..() + if(is_station_level(new_z)) + on = TRUE + +/obj/machinery/atmospherics/trinary/filter/shadow + name = "gas filter (Co2 Outlet)" + dir = 1 + filter_type = 3 + on = FALSE + target_pressure = 99999 + +/obj/machinery/atmospherics/trinary/filter/shadow/onTransitZ(old_z, new_z) + . = ..() + if(is_station_level(new_z)) + on = TRUE + +/obj/machinery/igniter/shadow + +/obj/machinery/igniter/shadow/onTransitZ(old_z, new_z) + . = ..() + if(is_station_level(new_z)) + on = TRUE + update_icon() diff --git a/code/modules/supply/supply_packs/pack_shuttle.dm b/code/modules/supply/supply_packs/pack_shuttle.dm index 6afc8e46aff..4a5ba2d7703 100644 --- a/code/modules/supply/supply_packs/pack_shuttle.dm +++ b/code/modules/supply/supply_packs/pack_shuttle.dm @@ -93,6 +93,11 @@ cost = 4500 //I do wonder about shuttle prices, especially considering how many guns you could get for this price. Perhaps a lowering in the future. template = /datum/map_template/shuttle/emergency/raven +/datum/supply_packs/abstract/shuttle/shadow + cost = 3250 + template = /datum/map_template/shuttle/emergency/shadow + speed_factor = 2 //Fast enough that it probably won't burn down entirely after the crew looses the plasma + // these, otoh, have some pretty silly features, and are hidden behind emag /datum/supply_packs/abstract/shuttle/clown diff --git a/paradise.dme b/paradise.dme index 8daac3cf887..5769581d103 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1585,6 +1585,7 @@ #include "code\modules\awaymissions\maploader\writer.dm" #include "code\modules\awaymissions\mission_code\beach.dm" #include "code\modules\awaymissions\mission_code\challenge.dm" +#include "code\modules\awaymissions\mission_code\shuttle_shadow.dm" #include "code\modules\awaymissions\mission_code\ghost_role_spawners\golems.dm" #include "code\modules\awaymissions\mission_code\ghost_role_spawners\oldstation_spawns.dm" #include "code\modules\awaymissions\mission_code\ruins\derelict5.dm" diff --git a/tools/maplint/lints/grille_window_stacking.yml b/tools/maplint/lints/grille_window_stacking.yml index 3db422380ea..3dcd24fe636 100644 --- a/tools/maplint/lints/grille_window_stacking.yml +++ b/tools/maplint/lints/grille_window_stacking.yml @@ -1,4 +1,8 @@ help: "Replace the grille and window with the proper spawner." +exclude_files: + # atmos can tick before the windows from the spawner spawn, leading to gas leakage + # on this shuttle + - _maps/map_files/shuttles/emergency_shadow.dmm /obj/structure/grille: banned_neighbors: - /obj/structure/window/full diff --git a/tools/maplint/source/__main__.py b/tools/maplint/source/__main__.py index dcb575e99bd..03b72869351 100644 --- a/tools/maplint/source/__main__.py +++ b/tools/maplint/source/__main__.py @@ -24,8 +24,11 @@ def process_dmm(map_filename, lints: dict[str, lint.Lint]) -> list[MaplintError] # No structured data to lint. return problems + map_path = pathlib.Path(map_filename) for lint_name, lint in lints.items(): try: + if map_path in lint.exclude_files: + continue problems.extend(lint.run(map_data)) except KeyboardInterrupt: raise diff --git a/tools/maplint/source/lint.py b/tools/maplint/source/lint.py index ee86d29be52..c35c359ac12 100644 --- a/tools/maplint/source/lint.py +++ b/tools/maplint/source/lint.py @@ -1,4 +1,5 @@ import re +import pathlib from typing import Optional from .common import Constant, Typepath @@ -219,6 +220,7 @@ class Rules: class Lint: help: Optional[str] = None rules: dict[TypepathExtra, Rules] + exclude_files: list[str] = list() def __init__(self, data): expect(isinstance(data, dict), "Lint must be a dictionary.") @@ -226,6 +228,9 @@ class Lint: if "help" in data: self.help = data.pop("help") + if "exclude_files" in data: + self.exclude_files = [pathlib.Path(x) for x in data.pop("exclude_files")] + expect(isinstance(self.help, str) or self.help is None, "Lint help must be a string.") self.rules = {}