diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm index 0c83691bd7..c341464197 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm @@ -1,4 +1,35 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ab" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ac" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ad" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plating, +/area/engine/engineering) "aT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/button/door{ @@ -166,13 +197,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"wt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/engineering) "xx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -320,16 +344,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"HW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "In" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -366,13 +380,6 @@ /obj/machinery/power/am_control_unit, /turf/open/floor/plating, /area/engine/engineering) -"JC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "JZ" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -525,16 +532,6 @@ /obj/effect/turf_decal/box/red, /turf/open/floor/engine, /area/engine/engineering) -"YY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Zb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -862,7 +859,7 @@ xJ gf fh dN -YY +aa MD Ch dz @@ -890,7 +887,7 @@ LO Eu Pg cP -JC +ab WI rj dz @@ -918,7 +915,7 @@ NS xx fh zW -JC +ab WI rj dz @@ -946,7 +943,7 @@ yo me aT Aw -JC +ab WI rj dz @@ -973,7 +970,7 @@ MJ jH FK Ch -wt +ad Ch rj rj @@ -1026,7 +1023,7 @@ MJ MJ "} (17,1,1) = {" -wt +ad Zz Wf Ox @@ -1082,7 +1079,7 @@ MJ MJ "} (19,1,1) = {" -wt +ad eJ Zx nW @@ -1141,7 +1138,7 @@ MJ jH Nz Ch -wt +ad Ch rj rj @@ -1170,7 +1167,7 @@ fh WX HQ Aw -JC +ab WI rj dz @@ -1198,7 +1195,7 @@ fh kh fh fh -JC +ab WI rj dz @@ -1226,7 +1223,7 @@ fh kh uG cP -JC +ab WI rj dz @@ -1254,7 +1251,7 @@ eA FY mB Rp -HW +ac Mi Ch dz diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm index 402cfc73cf..da0a0036c5 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm @@ -1,4 +1,52 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ab" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ac" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ad" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ae" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen, +/turf/open/floor/plasteel, +/area/engine/engineering) +"af" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) "aT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/button/door{ @@ -35,16 +83,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"dW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "ea" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -299,23 +337,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"wt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/engineering) -"xg" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "xx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -542,16 +563,6 @@ /obj/structure/closet/radiation, /turf/open/floor/plasteel, /area/engine/engineering) -"HW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "In" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -582,19 +593,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"JC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Kg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -825,19 +823,6 @@ }, /turf/closed/wall, /area/engine/engineering) -"YY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Zb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -1169,7 +1154,7 @@ xJ gf fh dN -YY +aa MD Ch Pt @@ -1197,7 +1182,7 @@ LO Eu Pg cP -JC +ab tv rj Pt @@ -1225,7 +1210,7 @@ NS xx fh zW -dW +ac ea rj Pt @@ -1253,7 +1238,7 @@ yo me aT Aw -JC +ab tv rj Og @@ -1280,7 +1265,7 @@ MJ jH FK Ch -wt +af tE rj rj @@ -1333,7 +1318,7 @@ dz MJ "} (17,1,1) = {" -wt +af Zz Wf Ox @@ -1389,7 +1374,7 @@ MJ MJ "} (19,1,1) = {" -wt +af eJ Zx nW @@ -1448,7 +1433,7 @@ MJ jH Nz Ch -wt +af tE rj rj @@ -1477,7 +1462,7 @@ AF WX HQ Aw -JC +ab tv rj Og @@ -1505,7 +1490,7 @@ fh kh fh fh -dW +ac ea rj Pt @@ -1533,7 +1518,7 @@ fh kh uG cP -xg +ad tv rj Pt @@ -1561,7 +1546,7 @@ eA FY mB Rp -HW +ae Mi Ch Pt diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm.dmm index 6462cef211..e15eda336c 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm.dmm @@ -1,4 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "ab" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -13,6 +27,76 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ad" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ae" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/tank/internals/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"af" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ag" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ah" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "at" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/stripes/line{ @@ -178,21 +262,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"df" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "dl" = ( /obj/structure/cable{ icon_state = "1-4" @@ -600,21 +669,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"nW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/tank/internals/plasma, -/turf/open/floor/plating, -/area/engine/supermatter) "ou" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -636,20 +690,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"px" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "pA" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -737,19 +777,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/supermatter) -"re" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "rt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -1091,19 +1118,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"Cn" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "CH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -1571,20 +1585,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"Nw" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "Nx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2385,9 +2385,9 @@ VP EX Vg KX -px -nW -Cn +aa +ae +ag fj xB WI @@ -2609,9 +2609,9 @@ Ws Pa wz fj -Nw -df -re +ad +af +ah KX ni lw diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm index 05e6e4b63f..99c5ca9f76 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm @@ -1,4 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "ab" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1805,13 +1812,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"Vz" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "VP" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -2320,7 +2320,7 @@ Vg KX px nW -Vz +aa cN xB WI @@ -2348,7 +2348,7 @@ lQ KX RA tE -Vz +aa cN Xy Ml @@ -2376,7 +2376,7 @@ uz RA ti YY -Vz +aa cN JK WT @@ -2488,7 +2488,7 @@ RA Wf mW bq -Vz +aa cN JK WT @@ -2516,7 +2516,7 @@ wz fj RA cY -Vz +aa cN vO Np @@ -2544,7 +2544,7 @@ Ey fj Cn df -Vz +aa cN JK lw diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm index 3356ebaa77..ef18ab99d1 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm @@ -1,4 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "ab" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -13,6 +27,76 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ad" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ae" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/tank/internals/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"af" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ag" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ah" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "at" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/stripes/line{ @@ -178,21 +262,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"df" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "dl" = ( /obj/structure/cable{ icon_state = "1-4" @@ -591,21 +660,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"nW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/tank/internals/plasma, -/turf/open/floor/plating, -/area/engine/supermatter) "ou" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -627,20 +681,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"px" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "pA" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -728,19 +768,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/supermatter) -"re" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "rt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -1065,19 +1092,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"Cn" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "CH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -1546,20 +1560,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"Nw" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "Nx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2335,9 +2335,9 @@ VP EX Vg KX -px -nW -Cn +aa +ae +ag fj xB WI @@ -2559,9 +2559,9 @@ Ws Pa wz fj -Nw -df -re +ad +af +ah KX ni lw diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm index 3b3328a8f0..1c36e99ed6 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm @@ -1,4 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "ab" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -13,6 +27,76 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ad" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ae" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/tank/internals/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"af" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ag" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ah" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "at" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/stripes/line{ @@ -190,21 +274,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"df" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "dl" = ( /obj/structure/cable{ icon_state = "1-4" @@ -619,21 +688,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"nW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/tank/internals/plasma, -/turf/open/floor/plating, -/area/engine/supermatter) "ou" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -655,20 +709,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"px" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "pA" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -770,19 +810,6 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"re" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "rt" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -1127,19 +1154,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"Cn" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "CH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -1605,20 +1619,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"Nw" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "Nx" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2384,11 +2384,11 @@ bW VP rt Vg -px -px -nW -Cn -Cn +aa +aa +ae +ag +ag xB WI IE @@ -2608,12 +2608,12 @@ hy js Pa xB -Nw -Nw -df -re -re -Vg +ad +ad +af +ah +ah +vO lw bH JV diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm index af2ba1ffd7..0d52d2b3b8 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm @@ -1,4 +1,67 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"ab" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ac" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ad" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"ae" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"af" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/button/door{ @@ -348,23 +411,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"wt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/engineering) -"xg" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "xx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -478,19 +524,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"Bh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Bj" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -605,16 +638,6 @@ /obj/item/clothing/gloves/color/yellow, /turf/open/floor/plasteel, /area/engine/engineering) -"HW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "In" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -645,16 +668,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"JC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "JZ" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -968,19 +981,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"YY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Zb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -1318,7 +1318,7 @@ xJ gf fh dN -YY +ab MD Ch Pt @@ -1346,7 +1346,7 @@ LO Eu Pg cP -Bh +ac tv rj Pt @@ -1374,7 +1374,7 @@ NS xx fh zW -Bh +ac tv rj Pt @@ -1402,7 +1402,7 @@ yo me aT Aw -JC +ad WI rj Og @@ -1429,7 +1429,7 @@ MJ jH FK Ch -wt +aa tE rj rj @@ -1482,7 +1482,7 @@ dz MJ "} (17,1,1) = {" -wt +aa Zz Wf Ox @@ -1538,7 +1538,7 @@ MJ MJ "} (19,1,1) = {" -wt +aa eJ Zx nW @@ -1597,7 +1597,7 @@ MJ jH Nz Ch -wt +aa tE rj rj @@ -1626,7 +1626,7 @@ AF WX HQ Aw -JC +ad WI rj Og @@ -1654,7 +1654,7 @@ fh kh fh fh -Bh +ac tv rj Pt @@ -1682,7 +1682,7 @@ fh kh uG cP -xg +ae tv rj Pt @@ -1710,7 +1710,7 @@ eA FY mB Rp -HW +af Mi Ch Pt diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 82bfb49e38..a2f0026842 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2512,9 +2512,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "afa" = ( @@ -3231,11 +3228,10 @@ /turf/open/floor/plasteel, /area/security/brig) "agq" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory1"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory1" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agr" = ( @@ -3586,25 +3582,58 @@ pixel_y = -26; req_access_txt = "3" }, -/obj/machinery/door/poddoor/shutters{ - id = "armory1"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory1" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"agW" = ( +/obj/structure/rack, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/motion{ + c_tag = "Armory Motion Sensor"; + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agX" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory2"; - name = "Armoury Shutter" - }, -/obj/machinery/button/door{ - id = "armory2"; - name = "Armory Shutters"; - pixel_y = -26; - req_access_txt = "3" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agY" = ( @@ -3757,42 +3786,11 @@ /turf/open/floor/plasteel, /area/security/main) "ahm" = ( -/obj/structure/rack, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahn" = ( /turf/closed/wall, /area/maintenance/fore/secondary) @@ -3824,6 +3822,17 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"ahs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/sofa/right, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "aht" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -3971,6 +3980,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"ahC" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/closet/wardrobe/white, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/suit/straight_jacket, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahD" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4100,6 +4120,30 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ahO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"ahP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/wardrobe/mixed, +/obj/item/clothing/under/costume/kilt, +/obj/item/clothing/under/costume/kilt, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret, +/obj/structure/sign/poster/official/fashion{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahQ" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -4275,6 +4319,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) +"aia" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) "aib" = ( /obj/structure/cable{ icon_state = "2-8" @@ -4353,11 +4405,16 @@ /turf/open/floor/plasteel, /area/security/brig) "aih" = ( -/obj/machinery/door/poddoor/shutters{ +/obj/machinery/button/door{ id = "armory2"; - name = "Armoury Shutter" + name = "Armory Shutters"; + pixel_y = -26; + req_access_txt = "3" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "aii" = ( @@ -4614,6 +4671,16 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"aiB" = ( +/obj/machinery/vending/kink, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) "aiC" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4722,6 +4789,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"aiJ" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) "aiK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -4774,6 +4848,14 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/dark, /area/security/brig) +"aiP" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "aiQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -4797,6 +4879,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/processing) +"aiV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aiW" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/bot, @@ -4817,26 +4906,24 @@ /turf/open/floor/plating, /area/ai_monitored/security/armory) "aja" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory3"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory3" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ajb" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory3"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory3" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ajc" = ( @@ -4888,6 +4975,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"ajh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/pda_ad800{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aji" = ( /obj/structure/chair{ name = "Judge" @@ -4974,6 +5071,17 @@ }, /turf/open/floor/plating, /area/security/vacantoffice/b) +"ajs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sign/poster/official/pda_ad600{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/heads/hop) "ajt" = ( /obj/machinery/camera{ c_tag = "Vacant Office B"; @@ -5001,6 +5109,15 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ajv" = ( +/obj/machinery/computer/med_data{ + dir = 3 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "ajw" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -5056,6 +5173,12 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ajB" = ( +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "ajC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5069,6 +5192,13 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"ajD" = ( +/obj/effect/spawner/lootdrop/keg, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ajE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -5093,6 +5223,16 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"ajG" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ajH" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -5155,6 +5295,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"ajM" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ajN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5309,6 +5463,18 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) +"aka" = ( +/obj/structure/closet/secure_closet/bar{ + req_access_txt = "25" + }, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/gun/ballistic/revolver/doublebarrel, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/wood, +/area/crew_quarters/bar) "akb" = ( /obj/machinery/light{ dir = 8 @@ -5503,6 +5669,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/main) +"akt" = ( +/obj/machinery/chem_master/condimaster{ + name = "HoochMaster 2000" + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) "aku" = ( /obj/structure/cable{ icon_state = "1-8" @@ -5903,7 +6075,7 @@ "alq" = ( /obj/machinery/door/airlock/security/glass{ name = "Evidence Storage"; - req_access_txt = "1" + req_access_txt = "4" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -8917,20 +9089,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"asZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/structure/closet/wardrobe/white, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/item/clothing/suit/straight_jacket, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ata" = ( /turf/open/floor/wood, /area/lawoffice) @@ -9204,17 +9362,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"aua" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/closet/wardrobe/mixed, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/dress/skirt/purple, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "aub" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow, @@ -15263,16 +15410,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"aJE" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/item/gun/ballistic/revolver/doublebarrel, -/turf/open/floor/wood, -/area/crew_quarters/bar) "aJF" = ( /obj/machinery/newscaster{ pixel_x = 30 @@ -15667,11 +15804,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"aKK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/plasteel, -/area/hydroponics) "aKL" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -16630,15 +16762,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aND" = ( -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/cable_coil, -/obj/item/flashlight/lamp, -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar) "aNE" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -17828,13 +17951,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"aQU" = ( -/obj/machinery/vending/kink, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "aQV" = ( /obj/machinery/vending/autodrobe/all_access, /obj/structure/disposalpipe/segment{ @@ -21137,19 +21253,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) -"aYP" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/turf/open/floor/plasteel, -/area/hydroponics) "aYQ" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -24275,11 +24378,6 @@ /obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bhf" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "bhg" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -27673,10 +27771,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"boX" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "boY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27717,13 +27811,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) -"bpa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27755,14 +27842,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) -"bpf" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/crew_quarters/heads/hop) "bph" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30936,12 +31015,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/sleeper) -"bwC" = ( -/obj/machinery/computer/med_data{ - dir = 3 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "bwD" = ( /obj/machinery/sleeper{ dir = 8 @@ -44825,13 +44898,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) -"ccY" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/sugar, -/turf/open/floor/plating, -/area/maintenance/port/aft) "ccZ" = ( /obj/structure/chair/stool, /turf/open/floor/plating, @@ -55845,16 +55911,6 @@ }, /turf/open/space, /area/solar/starboard/fore) -"jJg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/chair/sofa{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jJF" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -56570,13 +56626,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/carpet, /area/crew_quarters/dorms) -"lXE" = ( -/obj/structure/chair/sofa/right, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "lZl" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -56849,12 +56898,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) -"mOO" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "mPk" = ( /obj/structure/bed, /obj/machinery/button/door{ @@ -57716,14 +57759,6 @@ /obj/item/target/syndicate, /turf/open/floor/plating, /area/security/range) -"pFX" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -60342,17 +60377,6 @@ "xxp" = ( /turf/open/floor/plating, /area/security/range) -"xzd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/chair/sofa, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "xzv" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -79828,7 +79852,7 @@ aLH aLE aOl aPA -aQU +aiB aQN nLw sLa @@ -79867,7 +79891,7 @@ aaa aaa aaa bCq -bJP +ajD bCq bSn bCq @@ -79880,7 +79904,7 @@ aaf bCq cAy cAB -ccY +ajG cAD cAH cfw @@ -86014,7 +86038,7 @@ bjz bkT bjz bjz -boX +aiV bqv bqv bqv @@ -86271,7 +86295,7 @@ bjB bkW bmp bjz -bpa +ajh bqy cBr bqy @@ -87813,7 +87837,7 @@ bcd bcd bms bnS -bpf +ajs bqC brZ btE @@ -89810,7 +89834,7 @@ aaZ aeY acn agR -ahm +agW ahA aeE agz @@ -91097,8 +91121,8 @@ agq agV aaZ aaZ -aih agX +aih aaZ aaZ aaZ @@ -96031,7 +96055,7 @@ aYV aYV bet bfH -bhf +aiP wbE bhh wbE @@ -96042,7 +96066,7 @@ bqP bsy bEe bvh -bwC +ajv bxN bze bAp @@ -96514,8 +96538,8 @@ wig str rrM clO -asZ -aua +ahC +ahP oZl awB att @@ -97283,9 +97307,9 @@ con eVJ dqb qeA -lXE -pFX -mOO +ahm +fHG +fHG fHG fHG pPi @@ -97298,7 +97322,7 @@ sEi alP aGJ aIe -aJE +aka aLU aKQ aNu @@ -97540,9 +97564,9 @@ fyS eVJ dqb veS -xzd +ahs sJI -jJg +ahO fHG eAJ rvr @@ -97815,7 +97839,7 @@ aHM aJm aKz mjr -aND +akt aJC aab aRg @@ -99127,7 +99151,7 @@ bsx bst bfJ bhh -bhh +ajB bwK bhh bhh @@ -100650,7 +100674,7 @@ aSR aUi aVJ aOX -aYP +aiJ bal bam aYV @@ -101154,7 +101178,7 @@ wBd aGC aIl aIq -aKK +aia aMy aIp nGf @@ -108931,7 +108955,7 @@ aaa cNW clt cQw -bNB +ajM cOe cOe cNW diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 73fe2cb8c1..54b5a9c221 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -124,6 +124,33 @@ }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"aaq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aar" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "aas" = ( /obj/docking_port/stationary/random{ id = "pod_lavaland1"; @@ -143,10 +170,265 @@ /obj/effect/landmark/xeno_spawn, /turf/open/space, /area/solar/starboard/fore) +"aav" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aaw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aax" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aay" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaz" = ( +/obj/effect/decal/cleanable/oil, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaA" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aaC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aaD" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engpa"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) "aaE" = ( /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) +"aaF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/atmospherics_engine) +"aaG" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/atmospherics_engine) +"aaH" = ( +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/atmospherics_engine) +"aaI" = ( +/obj/structure/dresser, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/cafeteria, +/area/maintenance/port/fore) +"aaJ" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/sign/poster/official/nt_storm_officer{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/security/main) +"aaK" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/nt_storm{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"aaL" = ( +/obj/structure/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/gun/energy/temperature/security, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/ion_rifle{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"aaM" = ( +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/medical/storage) +"aaN" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "aaO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -154,6 +436,30 @@ "aaP" = ( /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) +"aaQ" = ( +/obj/structure/sign/poster/official/medical_green_cross, +/turf/closed/wall, +/area/medical/medbay/central) +"aaR" = ( +/obj/structure/table/wood, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = 32 + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = 32 + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = 32 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) "aaS" = ( /turf/closed/wall/mineral/plastitanium, /area/construction/mining/aux_base) @@ -9068,13 +9374,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"avk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmospherics_engine) "avl" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ @@ -10232,20 +10531,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"axv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "axw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10303,19 +10588,6 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"axD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "axE" = ( /obj/structure/cable{ icon_state = "2-8" @@ -10427,12 +10699,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/fore) -"axN" = ( -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/cafeteria, -/area/maintenance/port/fore) "axO" = ( /obj/structure/table/wood, /obj/item/camera, @@ -10979,20 +11245,6 @@ }, /turf/open/floor/circuit/green, /area/engine/supermatter) -"ayM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "ayN" = ( /obj/structure/cable{ icon_state = "2-8" @@ -11587,19 +11839,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"azS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "azT" = ( /obj/machinery/power/rad_collector/anchored, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -16677,20 +16916,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/engine/atmospherics_engine) -"aID" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/structure/cable/white{ - icon_state = "0-2" - }, -/obj/structure/cable/white{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmospherics_engine) "aIE" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -16710,14 +16935,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"aIF" = ( -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmospherics_engine) "aIG" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/bot, @@ -41291,14 +41508,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"bwj" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/main) "bwk" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -60266,23 +60475,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"bXR" = ( -/obj/structure/rack, -/obj/item/gun/energy/ionrifle, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/gun/energy/temperature/security, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "bXS" = ( /obj/structure/window/reinforced{ dir = 8 @@ -66492,16 +66684,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/engine/engineering) -"chv" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "chw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -67523,19 +67705,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"cjf" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "cjg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -68306,26 +68475,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"ckA" = ( -/obj/effect/decal/cleanable/oil, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "ckB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -69094,19 +69243,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"clV" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "clW" = ( /obj/structure/rack, /obj/item/crowbar, @@ -70125,20 +70261,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/engine/engineering) -"cnE" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "cnF" = ( /obj/machinery/requests_console{ department = "Chapel Office"; @@ -71572,22 +71694,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"cqw" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "cqx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -76839,25 +76945,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating/airless, /area/space/nearstation) -"czs" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engpa"; - name = "Engineering Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "czt" = ( /obj/structure/cable{ icon_state = "1-8" @@ -85482,14 +85569,6 @@ }, /turf/open/floor/plasteel, /area/medical/storage) -"cNO" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/storage) "cNP" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -87271,17 +87350,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cRa" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "cRb" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -103990,17 +104058,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) -"duk" = ( -/obj/structure/table/wood, -/obj/item/assembly/igniter, -/obj/item/assembly/igniter, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) "dul" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -151484,10 +151541,10 @@ car cbV cdJ car -chv -cjf -ckA -clV +aax +aay +aaz +aaA cnC cpa cqs @@ -151495,10 +151552,10 @@ cqr ctq cuR cnC -cjf -czs -clV -chv +aay +aaD +aaA +aax car cFO cbV @@ -152002,13 +152059,13 @@ chx cjh ckC clX -cnE +aaB cpc cqu cqr cts cuT -cnE +aaB clX czt cAL @@ -152040,7 +152097,7 @@ dof dmi dry dta -duk +aaR dvY dod dmi @@ -152458,9 +152515,9 @@ asq atO auX awf -axv -axv -azS +aaq +aaq +aaw awi aCk aDn @@ -152518,9 +152575,9 @@ cjn clZ cnF car -cqw +aaC car -cqw +aaC car car cxF @@ -154514,16 +154571,16 @@ asy atW avf awi -axD -ayM -axD +aar +aav +aar awf aCp aDs aEv aFE aHh -aID +aaG aKb aLv aMG @@ -155037,7 +155094,7 @@ aDt aEx aFG aHj -aIF +aaH aKd aLx aMG @@ -155797,8 +155854,8 @@ aad alT alT alT -avk -avk +aaF +aaF alT alT azZ @@ -159140,7 +159197,7 @@ asL aue avt aws -axN +aaI ayY aAc aBo @@ -170534,7 +170591,7 @@ cNz dbm dcX dev -cPy +aaQ dhe diz dkp @@ -171296,7 +171353,7 @@ cKE bsE cNE cPy -cRa +aaN cSK cUE cQX @@ -174892,7 +174949,7 @@ cIc cAm cKO cMm -cNO +aaM vEq cRi cSV @@ -180771,7 +180828,7 @@ bFP bHI bJC bLs -bNp +aaK bNp bNp bTi @@ -181018,7 +181075,7 @@ bpp bru btt buQ -bwj +aaJ bhd byO bAs @@ -181804,7 +181861,7 @@ bPA bRw bTk bVr -bXR +aaL bZY cbL bLs diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 376046512f..446fe3e519 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -53,6 +53,17 @@ "aaf" = ( /turf/closed/wall/r_wall, /area/security/brig) +"aag" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aah" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -72321,17 +72332,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ai_monitored/security/armory) -"cin" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter) "cio" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -122951,9 +122951,9 @@ coc azE brn aLF -cin -cin -cin +aag +aag +aag aLF cut cuO @@ -125007,9 +125007,9 @@ cos aAd bFh aLF -cin -cin -cin +aag +aag +aag aLF cuA cuW diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e69b4b67ce..db9a620ad6 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2,10 +2,77 @@ "aaa" = ( /turf/open/space/basic, /area/space) +"aab" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/obj/structure/rack, +/obj/item/grenade/barrier{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/nt_storm_officer{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "aac" = ( /obj/effect/landmark/carpspawn, /turf/open/space, /area/space) +"aad" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/head/helmet/alt, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/head/helmet/alt, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/head/helmet/alt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/nt_storm{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"aae" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "aaf" = ( /obj/structure/lattice, /turf/open/space, @@ -246,6 +313,19 @@ }, /turf/open/floor/plating, /area/security/prison) +"aaM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aaN" = ( /obj/structure/cable{ icon_state = "0-2" @@ -288,6 +368,58 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"aaU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/crowbar, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aaV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aaW" = ( +/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/door/poddoor/shutters/window{ + id = "armory"; + name = "Armoury Shutters" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"aaX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/plasteel, +/area/engine/engineering) "aaY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -322,6 +454,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/security/prison) +"abd" = ( +/obj/machinery/vending/cola/random, +/obj/structure/sign/poster/official/pda_ad600{ + pixel_x = -32 + }, +/obj/structure/sign/poster/official/pda_ad800{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/structure/sign/poster/official/pda_ad{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/command) "abe" = ( /turf/closed/wall, /area/security/prison) @@ -376,6 +522,14 @@ /obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/plasteel, /area/security/prison) +"abk" = ( +/obj/structure/kitchenspike_frame, +/obj/effect/decal/cleanable/blood/gibs/old, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "abl" = ( /obj/structure/table, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -445,6 +599,25 @@ }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) +"abt" = ( +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "abu" = ( /obj/docking_port/stationary{ dwidth = 1; @@ -521,6 +694,16 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/security/prison) +"abE" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) "abF" = ( /obj/structure/table, /obj/structure/cable/yellow{ @@ -542,6 +725,30 @@ /obj/item/toy/cards/deck, /turf/open/floor/plasteel, /area/security/prison) +"abH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "abI" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -723,6 +930,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/prison) +"acd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "ace" = ( /obj/machinery/vending/sustenance{ desc = "A vending machine normally reserved for work camps."; @@ -1388,6 +1605,22 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"adk" = ( +/obj/structure/sign/poster/contraband/scum{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/fore) +"adl" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/item/storage/box/donkpockets, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "adm" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -1568,6 +1801,35 @@ }, /turf/open/space, /area/space/nearstation) +"adH" = ( +/obj/structure/closet/wardrobe/grey, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = -32 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/locker) +"adI" = ( +/obj/structure/rack, +/obj/item/hatchet, +/obj/item/reagent_containers/blood/random, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "adJ" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -2918,37 +3180,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"afZ" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 24 - }, -/obj/structure/rack, -/obj/item/grenade/barrier{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/item/grenade/barrier{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "aga" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -3427,26 +3658,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"agQ" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "agR" = ( /obj/machinery/airalarm{ dir = 4; @@ -4781,23 +4992,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/warden) -"ajs" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory"; - name = "armory shutters" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "ajt" = ( /obj/structure/closet{ name = "Evidence Closet 5" @@ -11663,13 +11857,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"awA" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/obj/item/storage/box/donkpockets, -/turf/open/floor/plating, -/area/maintenance/fore) "awB" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/storage/box/lights/mixed, @@ -16876,11 +17063,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"aGW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plasteel, -/area/engine/engineering) "aGX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -21786,20 +21968,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"aRq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "aRr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22834,15 +23002,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"aTF" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "aTG" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -23483,20 +23642,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) -"aUO" = ( -/obj/structure/closet/wardrobe/grey, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/locker) "aUP" = ( /obj/structure/closet/wardrobe/white, /obj/effect/turf_decal/tile/neutral{ @@ -26034,19 +26179,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"aZJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "aZK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/shower{ @@ -39514,10 +39646,6 @@ "bzJ" = ( /turf/closed/wall, /area/hallway/secondary/command) -"bzK" = ( -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/dark, -/area/hallway/secondary/command) "bzL" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -53582,22 +53710,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) -"ccp" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) "ccq" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people, @@ -56716,27 +56828,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"cik" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "cil" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -61846,12 +61937,6 @@ /obj/item/gun/syringe/dart, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"csb" = ( -/obj/structure/rack, -/obj/item/hatchet, -/obj/item/reagent_containers/blood/random, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "csc" = ( /obj/machinery/iv_drip, /obj/item/roller, @@ -80107,27 +80192,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/science/xenobiology) -"djt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/supermatter) -"djx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/crowbar, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "djz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -81817,11 +81881,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/security/vacantoffice) -"hvt" = ( -/obj/structure/kitchenspike_frame, -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plating, -/area/maintenance/port/aft) "hyP" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Two" @@ -99850,7 +99909,7 @@ dux iLj dvt bXE -hvt +abk dux dux dux @@ -105768,7 +105827,7 @@ cdr cew cfL bXK -cik +abH cjK clj cmr @@ -106515,7 +106574,7 @@ bsM bun bwi bkz -bzK +abd bBz bDa bEE @@ -110319,7 +110378,7 @@ aaa aaf aeq aeq -afZ +aab agR ahE aiA @@ -110394,7 +110453,7 @@ cdG caq cgb chg -chg +acd chg clx cmD @@ -111607,7 +111666,7 @@ afX agc dBX agc -ajs +aaW ajz akI amc @@ -111861,7 +111920,7 @@ aaa aaf aeq aeq -agQ +aad ahC ahI aeq @@ -115529,7 +115588,7 @@ bWH bYc bZq caG -ccp +abt bSS ceZ cgo @@ -116750,7 +116809,7 @@ agq agq aje alb -aje +adk agq aur aqb @@ -117034,7 +117093,7 @@ aOt aQU aSg aTt -aUO +adH aUM boW aZt @@ -117272,7 +117331,7 @@ ary asR aje auc -awA +adl axC ayK aAa @@ -117842,7 +117901,7 @@ bWQ soe bWQ caL -ccv +abE bST csg cgq @@ -121195,7 +121254,7 @@ dwX ciL ciL cou -csb +adI dvY mjJ krD @@ -123201,7 +123260,7 @@ axY aPY aRn aSt -aTF +aaV aUY aWA aYp @@ -123962,7 +124021,7 @@ aBK aCS aEo aFw -aGW +aHY aHY aHY aKB @@ -123970,7 +124029,7 @@ aMd aNr aOP dCw -aRq +aaM aSw aTI aVb @@ -124233,7 +124292,7 @@ aTJ dfX aWD aVc -aZJ +aaX bbz bcK bel @@ -126275,7 +126334,7 @@ ddZ ded del des -djt +aae daY daZ dbb @@ -126283,7 +126342,7 @@ aMk aNv dfk dfq -djt +aae dfG dfQ dfZ @@ -126532,7 +126591,7 @@ aBQ dee aEr des -djt +aae daY daZ dbb @@ -126540,7 +126599,7 @@ dfa aNv dfk daY -djx +aaU dfG cXz aVe @@ -126789,7 +126848,7 @@ aBQ dee aEr aKL -djt +aae daY deS dbb @@ -126797,7 +126856,7 @@ aMk aNv dfm daY -djt +aae dbg dfR dga diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 9031e9964b..2ca3c3deee 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -950,6 +950,23 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"abn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) "abo" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1257,6 +1274,20 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"abQ" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/gravity_generator) "abR" = ( /obj/structure/lattice, /turf/open/space, @@ -1638,6 +1669,54 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard) +"acz" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"acA" = ( +/obj/structure/cable/white, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/gravity_generator) +"acB" = ( +/obj/structure/cable/white, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"acC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "acD" = ( /obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, @@ -2076,6 +2155,33 @@ /obj/structure/sign/warning/vacuum, /turf/open/floor/plating, /area/quartermaster/storage) +"adr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"ads" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "adv" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -18300,19 +18406,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"aGl" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering) "aGm" = ( /obj/structure/sign/warning/radiation, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -20085,16 +20178,6 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) -"aJo" = ( -/obj/structure/cable/white{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/gravity_generator) "aJp" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -20171,16 +20254,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"aJA" = ( -/obj/structure/cable/white{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/engineering) "aJB" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal/fifty, @@ -21472,14 +21545,6 @@ /obj/item/clothing/glasses/meson/engine, /turf/open/floor/plasteel, /area/engine/gravity_generator) -"aLL" = ( -/obj/structure/cable/white, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/gravity_generator) "aLM" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -21574,11 +21639,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"aLX" = ( -/obj/structure/cable/white, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/engineering) "aLY" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -22553,20 +22613,6 @@ /obj/machinery/power/supermatter_crystal/shard/engine, /turf/open/floor/engine, /area/engine/supermatter) -"aOb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "aOd" = ( /obj/machinery/power/apc{ areastring = "/area/engine/engineering"; @@ -22788,19 +22834,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"aOB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "aOC" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -22827,19 +22860,6 @@ }, /turf/open/floor/circuit/green, /area/engine/supermatter) -"aOE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "aOF" = ( /obj/structure/cable{ icon_state = "1-8" @@ -72989,9 +73009,9 @@ aFq aGf sIA aIe -aJo +abQ aKx -aLL +acA aMN aMN sJD @@ -73763,9 +73783,9 @@ aIh aJr aKz aLO -aOB -aOB -aOB +acC +acC +acC aLU aQK aRH @@ -75042,7 +75062,7 @@ kaA aDr aEv aFx -aGl +abn aHp aIm bxa @@ -75819,9 +75839,9 @@ aIp aJw aKE aLU -aOE -aOb -aOE +adr +ads +adr aLO blK aRP @@ -76587,9 +76607,9 @@ aDv aDv aHv sHV -aJA +acz aKH -aLX +acB aEt aEt aOH diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 637913adf1..fc5f6e9778 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2,12 +2,267 @@ "aaa" = ( /turf/open/space/basic, /area/space) +"aab" = ( +/obj/machinery/holopad, +/obj/effect/landmark/start/cyborg, +/mob/living/simple_animal/bot/secbot/pingsky, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) +"aac" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) "aad" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg3" }, /area/maintenance/department/science) +"aae" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaf" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aag" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aah" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aai" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaj" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aak" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aal" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aam" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aan" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aao" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aap" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aaq" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"aar" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/tank/internals/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aas" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/oil, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"aat" = ( +/obj/structure/closet/wardrobe/green, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = -32 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white/corner, +/area/crew_quarters/fitness/recreation) +"aau" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"aav" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/cargo) +"aaw" = ( +/obj/structure/sign/poster/official/hydro_ad, +/turf/closed/wall, +/area/hydroponics) +"aax" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone3) +"aay" = ( +/obj/structure/sign/poster/official/medical_green_cross, +/turf/closed/wall, +/area/medical/medbay/central) +"aaz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"aaA" = ( +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/science) +"aaB" = ( +/obj/structure/closet/masks, +/obj/item/reagent_containers/food/snacks/deadmouse, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/engine) +"aaC" = ( +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/maintenance/department/engine) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -1589,12 +1844,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"afP" = ( -/obj/machinery/holopad, -/mob/living/simple_animal/bot/secbot/pingsky, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "afQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -11506,13 +11755,6 @@ }, /turf/open/floor/plasteel/white/corner, /area/crew_quarters/fitness/recreation) -"aBV" = ( -/obj/structure/closet/wardrobe/green, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, -/area/crew_quarters/fitness/recreation) "aBW" = ( /obj/structure/closet/wardrobe/grey, /obj/machinery/light, @@ -15182,13 +15424,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) -"aKm" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering) "aKn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18463,10 +18698,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"aSD" = ( -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/plasteel, -/area/hydroponics) "aSE" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -19833,11 +20064,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) -"aVF" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/department/cargo) "aVG" = ( /obj/structure/easel, /turf/open/floor/plating, @@ -27844,14 +28070,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) -"boB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone3) "boC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, @@ -31673,13 +31891,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bwM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "bwN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -36749,11 +36960,6 @@ icon_state = "platingdmg3" }, /area/maintenance/department/engine) -"bGL" = ( -/obj/structure/closet/masks, -/obj/item/reagent_containers/food/snacks/deadmouse, -/turf/open/floor/plating, -/area/maintenance/department/engine) "bGM" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plating, @@ -46083,13 +46289,6 @@ /obj/structure/sign/warning/nosmoking, /turf/closed/wall/r_wall, /area/engine/engineering) -"ccd" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/engine/engineering) "cci" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -47013,17 +47212,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"cfV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engine/engineering) "cfX" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 1 @@ -47378,23 +47566,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"chw" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/engine/engineering) -"chA" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "chB" = ( /obj/item/seeds/banana, /obj/item/seeds/grass, @@ -54807,17 +54978,6 @@ icon_state = "platingdmg3" }, /area/maintenance/department/science) -"hQy" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/item/tank/internals/plasma, -/turf/open/floor/plating, -/area/engine/supermatter) "hQz" = ( /obj/structure/closet/emcloset/anchored, /obj/structure/cable/yellow{ @@ -55157,11 +55317,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"izm" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engine/engineering) "izB" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod" @@ -56542,13 +56697,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"lRX" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, -/turf/open/floor/plating, -/area/engine/engineering) "lTC" = ( /obj/item/shard, /obj/effect/turf_decal/stripes/line{ @@ -57810,13 +57958,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"oJr" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engine/engineering) "oKa" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -58798,11 +58939,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"qOS" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/engineering) "qPB" = ( /obj/structure/chair/stool, /obj/machinery/light/small{ @@ -59976,13 +60112,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"tQT" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering) "tRc" = ( /obj/structure/ore_box, /turf/open/floor/plating{ @@ -60180,17 +60309,6 @@ luminosity = 2 }, /area/maintenance/department/science) -"uoq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/engine/supermatter) "uos" = ( /obj/machinery/computer/camera_advanced/base_construction, /obj/effect/turf_decal/stripes/line{ @@ -60626,13 +60744,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"vor" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/engine/engineering) "vpz" = ( /obj/structure/girder, /turf/open/floor/plating{ @@ -61074,17 +61185,6 @@ /obj/structure/sign/warning, /turf/closed/wall, /area/science/mixing) -"woh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, -/area/engine/supermatter) "woq" = ( /obj/structure/chair, /turf/open/floor/plating, @@ -61228,13 +61328,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"wHI" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/plating, -/area/engine/engineering) "wIo" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, @@ -83932,7 +84025,7 @@ bBX bva bEm bva -bGL +aaB bHQ bJe bKj @@ -85497,7 +85590,7 @@ bSw bva bOB bva -kRq +aaC kRq kRq bva @@ -87507,7 +87600,7 @@ aVS aVS aVS aVS -aRL +aaw aJI aDZ aHN @@ -88030,7 +88123,7 @@ bjR blc biX bny -boB +aax bpF brd bsz @@ -88522,7 +88615,7 @@ aKP aPz aQJ aRL -aSD +aau aTT aXS aRL @@ -90606,7 +90699,7 @@ brg bsG brf bvn -bwM +aaz byt bzX bpP @@ -90905,9 +90998,9 @@ svA mjK mjK mjK -wHI -eyj -eyj +aap +aac +aac bXk shH shH @@ -91157,7 +91250,7 @@ cah cdO ioF ceX -qOS +aah cfS fFv fmL @@ -91631,7 +91724,7 @@ bnD boJ bpS bjd -bjc +aay cqm bvl bwP @@ -91671,7 +91764,7 @@ cbh cbh cbh hjD -vor +aai cfU tIS iCs @@ -91929,12 +92022,12 @@ irM qFu cet ulY -cfV +aak cgu cgU -izm -chw -eyj +aam +aaq +aac jzE bXk bXk @@ -92181,9 +92274,9 @@ bZA can cbi ccc -eyj +aac cdR -tQT +aaf bXk bXk sWW @@ -92437,12 +92530,12 @@ bYR bZA can cbj -eyj +aac cbX wcs iyJ cfa -eyj +aac twv hoS sWj @@ -92694,7 +92787,7 @@ bYS bZA can qpS -ccd +aae ccX ccX ceu @@ -92703,9 +92796,9 @@ cfu tlN ncm cCI -uoq -hQy -chA +aan +aar +aao meF oKv wbB @@ -92951,12 +93044,12 @@ bYT bZB caq cbk -eyj +aac ccY cdT ccY cbX -eyj +aac vlC iej qeY @@ -93208,7 +93301,7 @@ bYU bZE car mgz -eyj +aac cbX wcs wcs @@ -94236,7 +94329,7 @@ bYQ bZA cam mgz -eyj +aac cbX wcs wcs @@ -94493,12 +94586,12 @@ wjm bZF cbm mgz -eyj +aac oHa oHa eWi cbX -eyj +aac vlC cgx qeY @@ -94750,7 +94843,7 @@ bYO bZA cam lrM -ccd +aae cAQ cAQ cLw @@ -94759,9 +94852,9 @@ cfu jBn oxw meF -chA -chA -woh +aao +aao +aas cCI cBS iLh @@ -94900,7 +94993,7 @@ aey aeO aff afy -afP +aab bIK agt agD @@ -95007,12 +95100,12 @@ bYY bZA cam cbn -eyj +aac cbX wcs cfP cff -eyj +aac cfX vVO iop @@ -95265,9 +95358,9 @@ bZG cax cbo ccc -eyj +aac cdR -oJr +aag bXq bXq cfY @@ -95527,7 +95620,7 @@ kTj qhE loz frj -lRX +aal eyj uIB eyj @@ -95783,7 +95876,7 @@ cam cam cam haA -aKm +aaj upc wIo hyh @@ -96040,7 +96133,7 @@ cCV ceb epV qLI -aKm +aaj eiV upc dsz @@ -103154,7 +103247,7 @@ axx ayv azD aAS -aBV +aat atn aEh aFe @@ -107799,7 +107892,7 @@ sZh aLm aTx aEj -aVF +aav aFi aFi aFi @@ -109372,7 +109465,7 @@ blX blX blX bkF -lWy +aaA lWy fKj lWy diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 4f4b7c6baa..7bcdded17b 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -236,6 +236,7 @@ #define APHRO_TRAIT "aphro" #define BLOODSUCKER_TRAIT "bloodsucker" #define CLOTHING_TRAIT "clothing" //used for quirky carrygloves +#define SHOES_TRAIT "shoes" //inherited from your sweet kicks // unique trait sources, still defines #define STATUE_MUTE "statue" diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 8a26b1f44b..0a4af736dd 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -320,8 +320,8 @@ parts += "[FOURSPACES]Nobody died this shift!" if(istype(SSticker.mode, /datum/game_mode/dynamic)) var/datum/game_mode/dynamic/mode = SSticker.mode - parts += "[FOURSPACES]Threat level: [mode.threat_level]" - parts += "[FOURSPACES]Threat left: [mode.threat]" + parts += "[FOURSPACES]Final threat level: [mode.threat_level]" + parts += "[FOURSPACES]Final threat: [mode.threat]" parts += "[FOURSPACES]Executed rules:" for(var/datum/dynamic_ruleset/rule in mode.executed_rules) parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - [rule.name]: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat" @@ -331,7 +331,7 @@ for(var/entry in mode.threat_tallies) parts += "[FOURSPACES][FOURSPACES][entry] added [mode.threat_tallies[entry]]" SSblackbox.record_feedback("tally","dynamic_threat",mode.threat_level,"Final threat level") - SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Threat left") + SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Final Threat") return parts.Join("
") /client/proc/roundend_report_file() diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 8b08366c50..f253bc543d 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -400,6 +400,10 @@ key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_NUM +/datum/config_entry/keyed_list/antag_threat + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_NUM + /datum/config_entry/number/monkeycap config_entry_value = 64 min_val = 0 diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 0b784328ab..8b82c1812e 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -72,9 +72,9 @@ return {" - - + + [head_content] diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index a9830e58dc..81db7deb68 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -175,6 +175,7 @@ var/html = {" + [title] " + var/dat = "[src.name]" if(screen == 0) dat += "

Tracking beacons data

" var/list/trackerlist = list() diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 774e30fa5d..8d6328cf08 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -5,7 +5,9 @@ /obj/mecha/proc/get_stats_html() . = {" - [src.name] data + + + [name] data " + var/dat = "Personal Data Assistant" dat += assets.css_tag() dat += emoji_s.css_tag() @@ -1192,7 +1192,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(incapacitated()) return if(!isnull(aiPDA)) - var/HTML = "AI PDA Message Log[aiPDA.tnote]" + var/HTML = "AI PDA Message Log[aiPDA.tnote]" user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") else to_chat(user, "You do not have a PDA. You should make an issue report about this.") diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 9631488397..210c3d0da0 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -14,6 +14,7 @@ //book contents below dat = {" +