From db4655fdcfc317e95a294897fb44dabac6d279ac Mon Sep 17 00:00:00 2001 From: Carl? Date: Sat, 25 May 2024 16:35:08 -0400 Subject: [PATCH 1/2] temp --- .../LayeniaStation/LayeniaStation.dmm | 853 +++++++----------- .../objects/structures/signs/signs_warning.dm | 41 + icons/obj/decals.dmi | Bin 36413 -> 36408 bytes 3 files changed, 344 insertions(+), 550 deletions(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 11651c7d7..918dde230 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -5006,7 +5006,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants{ @@ -5336,7 +5335,6 @@ /area/science/xenobiology) "aBw" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/tile/blue{ @@ -6555,7 +6553,9 @@ /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank/high, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" + }, /area/ai_monitored/storage/eva) "aMn" = ( /obj/effect/turf_decal/loading_area{ @@ -6744,11 +6744,10 @@ }, /area/maintenance/disposal/incinerator) "aOn" = ( -/obj/effect/turf_decal/arrows{ - icon_state = "arrows_flip" +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" }, -/turf/open/floor/plating, -/area/ai_monitored/storage/eva) +/area/maintenance/theatre) "aOo" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -7781,14 +7780,13 @@ }, /area/ai_monitored/turret_protected/ai) "aXz" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/arrows{ - dir = 4; - icon_state = "arrows_flip" - }, -/turf/open/floor/plating, +/turf/open/floor/engine, /area/ai_monitored/storage/eva) "aXA" = ( /obj/effect/turf_decal/tile/red{ @@ -9457,7 +9455,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/showroomfloor, @@ -9769,7 +9766,6 @@ /area/maintenance/fore) "bnx" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ @@ -10826,16 +10822,10 @@ /turf/open/floor/plating, /area/engine/atmos) "bvv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 4; - name = "scrubbers pipe" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - dir = 8; - name = "air supply pipe" - }, -/turf/open/floor/plasteel/dark, -/area/bridge) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/internals, +/turf/open/floor/plasteel, +/area/engine/engineering) "bvG" = ( /obj/machinery/door/airlock/atmos/abandoned{ dir = 4; @@ -12277,7 +12267,6 @@ /turf/open/floor/plating, /area/engine/atmos) "bHG" = ( -/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 1 }, @@ -12707,17 +12696,6 @@ "bNF" = ( /turf/closed/wall, /area/crew_quarters/dorms/D) -"bNG" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/engine/atmos) "bNL" = ( /obj/effect/turf_decal/loading_area{ icon_state = "drain"; @@ -13127,24 +13105,15 @@ /turf/open/floor/wood, /area/engine/break_room) "bRX" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/loading_area{ - icon_state = "steel_panel"; - name = "steel pannel" + icon_state = "drain_corner"; + name = "drain" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 10; name = "scrubbers pipe" }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "floor_plate" - }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "bSb" = ( /turf/closed/wall/r_wall, @@ -14483,8 +14452,9 @@ /turf/open/floor/plating/layenia, /area/layenia/cloudlayer) "cdW" = ( -/obj/effect/turf_decal/plaque, -/obj/effect/turf_decal/box, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/engine, /area/ai_monitored/storage/eva) "cdY" = ( @@ -14988,11 +14958,10 @@ /turf/open/floor/plasteel/dark, /area/security/checkpoint/supply) "chR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" }, -/turf/open/floor/engine, -/area/ai_monitored/storage/eva) +/area/maintenance/starboard/central/upper) "chT" = ( /obj/structure/lattice/catwalk, /obj/structure/flora/crystal/small/growth, @@ -16823,7 +16792,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark/side, @@ -17614,7 +17582,6 @@ dir = 4 }, /obj/machinery/meter, -/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 1 }, @@ -17907,14 +17874,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel, /area/engine/engineering) -"cJq" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, -/obj/machinery/meter, -/obj/structure/grille, -/turf/closed/wall/r_wall, -/area/engine/atmos) "cJr" = ( /turf/open/floor/plasteel{ dir = 8; @@ -18624,7 +18583,7 @@ /turf/open/floor/plasteel/checker, /area/maintenance/department/engine/upper) "cPH" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/miner/n2o, /turf/open/floor/engine/n2o, /area/engine/atmos) "cPI" = ( @@ -19796,9 +19755,7 @@ }, /area/engine/break_room) "dbl" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree" - }, +/obj/structure/flora/tree/jungle, /turf/open/floor/grass, /area/crew_quarters/park) "dbm" = ( @@ -20490,11 +20447,9 @@ /turf/open/floor/plating/layenia, /area/layenia) "dhi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/effect/turf_decal/loading_area{ - icon_state = "drain"; + dir = 1; + icon_state = "drain_corner"; name = "drain" }, /turf/open/floor/plating, @@ -20858,7 +20813,6 @@ "dkq" = ( /obj/machinery/pdapainter, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/loading_area{ @@ -21039,10 +20993,8 @@ dir = 8; name = "air supply pipe" }, -/turf/open/floor/plasteel{ - dir = 8; - icon_plating = "floor"; - icon_state = "floor_whole_alt" +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" }, /area/ai_monitored/storage/eva) "dlJ" = ( @@ -21369,7 +21321,6 @@ /obj/machinery/atmospherics/pipe/simple{ dir = 4 }, -/obj/structure/grille, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/atmos) @@ -21665,7 +21616,6 @@ /area/medical/sleeper) "dqV" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ @@ -21931,7 +21881,6 @@ /area/crew_quarters/dorms) "dts" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_x = -25 }, /turf/open/floor/grass, @@ -22321,12 +22270,9 @@ /turf/open/floor/plating/layenia, /area/layenia) "dvI" = ( +/obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1; - pixel_y = 16 + dir = 8 }, /turf/open/floor/engine, /area/ai_monitored/storage/eva) @@ -22460,7 +22406,7 @@ }, /area/crew_quarters/fitness) "dwK" = ( -/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/atmospherics/miner/toxins, /turf/open/floor/engine/plasma, /area/engine/atmos) "dwO" = ( @@ -24411,7 +24357,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel, @@ -24780,23 +24725,17 @@ }, /area/storage/primary) "dTz" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, /obj/effect/turf_decal/loading_area{ - dir = 4; - icon_state = "steel_panel"; - name = "steel pannel" + dir = 8; + icon_state = "drain_corner"; + name = "drain" }, +/obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ dir = 9; name = "air supply pipe" }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plasteel{ - icon_state = "floor_plate" - }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "dTA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ @@ -24851,7 +24790,6 @@ /area/security/brig/upper) "dUl" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/stairs/left{ @@ -25933,7 +25871,6 @@ /area/maintenance/fore/upper) "efH" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ @@ -26060,7 +25997,7 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "egw" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, /area/engine/atmos) "egx" = ( @@ -26243,11 +26180,11 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "eig" = ( -/obj/effect/turf_decal/bot, /obj/machinery/light{ dir = 4; pixel_x = 7 }, +/obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" @@ -26535,24 +26472,6 @@ }, /turf/open/floor/wood, /area/security/prison) -"ekL" = ( -/obj/effect/turf_decal/loading_area{ - dir = 10; - icon_state = "steel_panel"; - name = "steel pannel" - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "floor_plate" - }, -/area/ai_monitored/storage/eva) "ekP" = ( /obj/structure/railing{ dir = 4 @@ -27577,7 +27496,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/dark/corner, @@ -27614,7 +27532,6 @@ /turf/open/floor/plasteel/white, /area/science/lab) "etP" = ( -/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 10 }, @@ -29323,8 +29240,9 @@ }, /area/layenia) "eGs" = ( -/obj/structure/medkit_cabinet{ - pixel_y = 28 +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = 27 }, /turf/open/floor/plating, /area/ai_monitored/storage/eva) @@ -29450,13 +29368,12 @@ }, /area/library) "eHp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/box/corners{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain_corner"; + name = "drain" }, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "eHu" = ( /obj/machinery/light{ @@ -29844,7 +29761,6 @@ /area/layenia) "eJu" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark, @@ -29992,12 +29908,6 @@ }, /turf/open/floor/plating/asteroid/layenia, /area/layenia) -"eKV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/ai_monitored/storage/eva) "eLb" = ( /obj/machinery/door/airlock{ dir = 4; @@ -30250,8 +30160,7 @@ /area/maintenance/port) "eMT" = ( /obj/structure/disposalpipe/trunk{ - dir = 1; - icon_state = "pipe-t" + dir = 1 }, /obj/structure/disposaloutlet, /obj/effect/turf_decal/stripes/line, @@ -33136,9 +33045,7 @@ icon_state = "drain"; name = "drain" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel{ icon_state = "floor_plate" }, @@ -34972,7 +34879,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants/random, @@ -35092,7 +34998,6 @@ pixel_y = 24 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/structure/cable{ @@ -36235,6 +36140,10 @@ /turf/open/floor/plating, /area/maintenance/department/engine/upper) "fHT" = ( +/obj/machinery/light{ + dir = 4; + pixel_x = 7 + }, /turf/open/floor/plasteel/dark{ dir = 4; icon_state = "darkfull_plate" @@ -37126,7 +37035,6 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/tree/jungle{ - icon_state = "tree"; pixel_y = -37 }, /obj/effect/turf_decal/weather/grass/line{ @@ -38192,7 +38100,6 @@ /area/engine/engineering/reactor_control) "fXj" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ @@ -40476,7 +40383,6 @@ dir = 8 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -40592,7 +40498,6 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ @@ -41019,7 +40924,6 @@ /area/security/checkpoint/supply) "gtc" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree"; pixel_x = -22 }, /turf/open/floor/grass, @@ -42812,7 +42716,6 @@ name = "air vent" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -43734,15 +43637,11 @@ }, /area/chapel/main) "gOZ" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "evashutter"; - name = "EVA Storage Shutters" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ + dir = 4; + name = "air scrubber" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "gPj" = ( /obj/effect/turf_decal/tile/red{ @@ -45247,11 +45146,10 @@ /turf/open/floor/wood, /area/security/prison) "hbu" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/effect/turf_decal/loading_area{ + icon_state = "half_stairs_darkfull"; + name = "dark steps" }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "hbv" = ( @@ -45648,7 +45546,6 @@ name = "drain" }, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_x = -25; pixel_y = 0 }, @@ -45901,7 +45798,6 @@ pixel_y = 16 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark, @@ -45933,7 +45829,6 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = 7 }, /obj/structure/window/reinforced, @@ -46706,9 +46601,7 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/pointybush, /obj/structure/flora/junglebush, -/obj/structure/flora/junglebush/large{ - icon_state = "bush" - }, +/obj/structure/flora/junglebush/large, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ name = "scrubbers pipe" }, @@ -48355,7 +48248,6 @@ /area/engine/break_room) "hxL" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/dark, @@ -49399,7 +49291,6 @@ /area/hallway/primary/fore/upper) "hEV" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/light{ @@ -50099,7 +49990,6 @@ pixel_x = 23 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/tile/red{ @@ -50375,7 +50265,6 @@ "hLE" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark{ @@ -52873,8 +52762,7 @@ }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ - dir = 1; - icon_state = "pipe-t" + dir = 1 }, /turf/open/floor/wood, /area/security/detectives_office) @@ -53454,12 +53342,7 @@ /turf/open/floor/wood, /area/security/visitation) "ijB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/ai_monitored/storage/eva) "ijK" = ( @@ -54056,12 +53939,12 @@ /turf/open/transparent/glass/reinforced, /area/layenia/cloudlayer) "ios" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/light{ dir = 8; pixel_x = -7 }, /obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "iox" = ( @@ -56363,7 +56246,6 @@ /area/hallway/primary/fore) "iDI" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/structure/closet/secure_closet/engineering_electrical, @@ -56884,7 +56766,6 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel, @@ -59896,7 +59777,6 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = -24 }, /obj/structure/window/reinforced{ @@ -59931,7 +59811,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/dark{ @@ -60999,7 +60878,6 @@ name = "wood" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 28 }, /turf/open/floor/wood{ @@ -63314,7 +63192,6 @@ pixel_y = 16 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel, @@ -64340,7 +64217,6 @@ /area/engine/custom) "jNm" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/structure/plasticflaps/opaque, @@ -65443,6 +65319,7 @@ icon_state = "drain"; name = "drain" }, +/obj/structure/railing, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "jVP" = ( @@ -67279,7 +67156,6 @@ "klb" = ( /obj/structure/flora/junglebush, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree"; pixel_x = -12 }, /turf/open/floor/grass, @@ -70647,7 +70523,6 @@ "kIL" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/structure/sign/warning/electricshock{ @@ -70899,7 +70774,6 @@ "kLk" = ( /obj/structure/chair/sofa/right, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/loading_area{ @@ -72583,9 +72457,9 @@ /turf/open/floor/plasteel, /area/quartermaster/mail) "kZw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 4; - name = "air scrubber" + name = "scrubbers pipe" }, /turf/open/floor/plating, /area/ai_monitored/storage/eva) @@ -72659,7 +72533,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/power/apc{ @@ -74085,7 +73958,6 @@ /obj/structure/flora/grass/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = -24 }, /turf/open/floor/grass, @@ -74409,7 +74281,6 @@ }, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = -24 }, /turf/open/floor/grass, @@ -74852,7 +74723,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/engine, /area/ai_monitored/storage/eva) "ltj" = ( /turf/closed/wall/r_wall, @@ -75883,7 +75754,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/camera/autoname, @@ -77067,7 +76937,6 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark, @@ -78720,13 +78589,10 @@ /area/security/prison) "lWJ" = ( /obj/effect/turf_decal/loading_area{ - dir = 5; - icon_state = "steel_panel"; - name = "steel pannel" - }, -/turf/open/floor/plasteel{ - icon_state = "floor_plate" + icon_state = "half_stairs_darkfull"; + name = "dark steps" }, +/turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "lWK" = ( /obj/effect/turf_decal/loading_area{ @@ -79248,7 +79114,6 @@ /area/layenia) "mcb" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree"; pixel_x = -12; pixel_y = 14 }, @@ -80287,13 +80152,13 @@ }, /area/hydroponics) "mkY" = ( -/obj/effect/turf_decal/arrows{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 6 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/engine, /area/ai_monitored/storage/eva) "mlc" = ( /obj/machinery/door/firedoor{ @@ -82191,7 +82056,6 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -82629,7 +82493,6 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/loading_area{ @@ -83514,7 +83377,6 @@ /area/arcade) "mHF" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/tile/blue{ @@ -83553,14 +83415,11 @@ }, /area/hallway/secondary/exit) "mHN" = ( -/obj/machinery/door/airlock/command/glass{ - dir = 8; - name = "EVA Storage"; - req_access_txt = "18" - }, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/effect/turf_decal/loading_area{ + icon_state = "drain_corner"; + name = "drain" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "mHP" = ( /obj/machinery/light{ @@ -84826,26 +84685,23 @@ /turf/open/floor/plasteel/white/corner, /area/engine/break_room) "mRn" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/loading_area{ - dir = 6; - icon_state = "steel_panel"; - name = "steel pannel" + dir = 4; + icon_state = "drain"; + name = "drain" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 5; - name = "scrubbers pipe" +/obj/structure/railing{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ dir = 6; name = "air supply pipe" }, -/turf/open/floor/plasteel{ - dir = 8; - icon_state = "floor_plate" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 5; + name = "scrubbers pipe" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "mRr" = ( /obj/effect/turf_decal/loading_area{ @@ -88522,7 +88378,6 @@ pixel_y = 24 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark/side, @@ -89770,9 +89625,7 @@ layer = 4; pixel_y = 15 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/layenia, /area/layenia) "nAJ" = ( @@ -93230,10 +93083,6 @@ dir = 4; network = list("ss13","engine") }, -/obj/machinery/firealarm{ - dir = 2; - pixel_x = -24 - }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "och" = ( @@ -94033,7 +93882,6 @@ "ohe" = ( /obj/structure/flora/junglebush, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree"; pixel_x = -20; pixel_y = 2 }, @@ -97849,9 +97697,7 @@ /area/science/research) "oHc" = ( /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/hallway/primary/central) "oHd" = ( @@ -101486,7 +101332,6 @@ /area/quartermaster/mail) "pcZ" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/tile/blue, @@ -101827,7 +101672,6 @@ pixel_y = 28 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/white, @@ -102188,7 +102032,9 @@ }, /area/ai_monitored/turret_protected/ai) "pin" = ( -/obj/structure/closet/crate/internals, +/obj/machinery/firealarm{ + pixel_x = -24 + }, /turf/open/floor/plasteel, /area/engine/engineering) "pit" = ( @@ -103527,7 +103373,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/white/corner, @@ -104022,11 +103867,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"pvh" = ( -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" - }, -/area/ai_monitored/storage/eva) "pvi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 4; @@ -104040,7 +103880,6 @@ /area/chapel/main) "pvv" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree"; pixel_y = -13 }, /obj/effect/turf_decal/weather/grass, @@ -106337,7 +106176,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/dark/side{ @@ -107673,8 +107511,8 @@ }, /area/medical/psych/rec) "pVk" = ( -/obj/machinery/door/poddoor{ - name = "Elevator door" +/obj/machinery/door/poddoor/multi_tile/three_tile_hor{ + name = "elevator door" }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" @@ -109712,7 +109550,6 @@ "qlg" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/tree/jungle/small{ - icon_state = "tree"; pixel_x = -20; pixel_y = -9 }, @@ -110869,9 +110706,7 @@ icon_state = "drain"; name = "drain" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel{ icon_state = "floor_trim" }, @@ -111294,10 +111129,8 @@ /turf/open/floor/plating/layenia, /area/layenia/cloudlayer) "qwk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - dir = 8; - name = "air vent" - }, +/obj/structure/closet/crate/rcd, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -111399,7 +111232,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/structure/cable, @@ -111596,7 +111428,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/tile/blue{ @@ -111616,8 +111447,8 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "qyT" = ( -/obj/machinery/door/poddoor{ - name = "Elevator door" +/obj/machinery/door/poddoor/multi_tile/three_tile_hor{ + name = "elevator door" }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" @@ -111799,9 +111630,8 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms/upper) "qAH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/effect/turf_decal/plaque, +/obj/effect/turf_decal/box, /turf/open/floor/engine, /area/ai_monitored/storage/eva) "qAL" = ( @@ -112379,7 +112209,6 @@ dir = 8 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants/random, @@ -112701,11 +112530,10 @@ }, /area/engine/break_room) "qGU" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/crate/rcd, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "qHf" = ( /obj/structure/disposalpipe/segment, @@ -113596,10 +113424,8 @@ /turf/open/floor/plasteel/checker, /area/maintenance/department/engine/upper) "qMb" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4; - icon_state = "drain"; - name = "drain" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, /turf/open/floor/plating, /area/ai_monitored/storage/eva) @@ -113701,11 +113527,12 @@ name = "Cafe Kitchen" }) "qNr" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "half_stairs_darkfull"; + name = "dark steps" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "qNu" = ( /obj/structure/railing, @@ -113952,7 +113779,6 @@ "qOW" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/loading_area{ @@ -113969,7 +113795,6 @@ /area/medical/medbay/zone2) "qPb" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_x = -3; pixel_y = -5 }, @@ -114417,9 +114242,7 @@ }, /area/bridge) "qRz" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree" - }, +/obj/structure/flora/tree/jungle/small, /turf/open/floor/grass, /area/crew_quarters/park) "qRA" = ( @@ -115846,7 +115669,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft/upper) "qZR" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/button/door{ id = "evashutter"; name = "EVA Shutters Control"; @@ -115858,6 +115680,12 @@ icon_state = "drain"; name = "drain" }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "rab" = ( @@ -116124,13 +115952,12 @@ /obj/machinery/light{ pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ +/obj/effect/turf_decal/loading_area{ dir = 8; - name = "air supply pipe" - }, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" + icon_state = "half_stairs_darkfull"; + name = "dark steps" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "rcv" = ( /obj/structure/closet/emcloset, @@ -117133,6 +116960,9 @@ name = "air supply pipe" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/machinery/door/poddoor/shutters{ + id = "station_power_grid_shutter" + }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -118021,11 +117851,15 @@ }, /area/medical/virology) "rpn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" }, -/obj/effect/turf_decal/box/corners, -/turf/open/floor/engine, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "rpt" = ( /obj/machinery/atmospherics/components/trinary/filter{ @@ -118961,8 +118795,7 @@ "rvc" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ - dir = 1; - icon_state = "pipe-t" + dir = 1 }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_plate" @@ -118991,11 +118824,10 @@ /area/crew_quarters/heads/captain) "rvt" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters{ - id = "evashutter"; - name = "EVA Storage Shutters" - }, /obj/structure/fans/tiny, +/obj/machinery/door/poddoor/multi_tile/three_tile_hor{ + id = "evashutter" + }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -119482,8 +119314,7 @@ }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ - dir = 1; - icon_state = "pipe-t" + dir = 1 }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" @@ -120179,7 +120010,6 @@ name = "steel pannel" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/tile/blue{ @@ -123471,6 +123301,11 @@ name = "air supply pipe" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/machinery/button/door{ + id = "station_power_grid_shutter"; + pixel_x = 24; + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/engine/upper) "sbf" = ( @@ -123805,7 +123640,9 @@ "sdm" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" + }, /area/ai_monitored/storage/eva) "sdp" = ( /obj/structure/table, @@ -126216,7 +126053,12 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "sud" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/engine, /area/ai_monitored/storage/eva) "sul" = ( @@ -126809,7 +126651,6 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/effect/turf_decal/stripes/line{ @@ -127241,7 +127082,6 @@ pixel_y = 19 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ @@ -129162,7 +129002,6 @@ /area/chapel/main) "sPm" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/cafeteria, @@ -131052,7 +130891,7 @@ /area/medical/sleeper) "tcM" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 1 }, /turf/open/floor/plating, /area/ai_monitored/storage/eva) @@ -131579,7 +131418,6 @@ /area/security/prison) "tfV" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = 7 }, /turf/open/floor/grass/layenia, @@ -132212,9 +132050,6 @@ }, /area/medical/genetics/cloning) "tlc" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/ai_monitored/storage/eva) @@ -133086,20 +132921,12 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "trz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - dir = 8; - name = "air supply pipe" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - dir = 8; - name = "scrubbers pipe" +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/dark{ + icon_state = "darkfull_whole_alt" }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/dark, -/area/bridge) +/area/ai_monitored/storage/eva) "trD" = ( /obj/effect/turf_decal/weather/grass/line{ dir = 4 @@ -134046,12 +133873,6 @@ icon_state = "darkfull_whole_alt" }, /area/security/prison) -"tya" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "tyg" = ( /obj/structure/closet/crate, /turf/open/floor/plating, @@ -134496,14 +134317,6 @@ name = "Command Cloudskipper"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - dir = 8; - name = "air supply pipe" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 4; - name = "scrubbers pipe" - }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -135818,8 +135631,8 @@ "tJo" = ( /obj/machinery/door/airlock/command/glass{ dir = 8; - name = "EVA Storage"; - req_access_txt = "18" + name = "Command Cloudskipper"; + req_access_txt = "19" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 4; @@ -138101,7 +137914,6 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 28 }, /turf/open/floor/plasteel{ @@ -139950,7 +139762,6 @@ name = "steps" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ @@ -141685,7 +141496,6 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -141795,7 +141605,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -141972,7 +141781,6 @@ /area/quartermaster/storage) "uzW" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/white/side{ @@ -142138,11 +141946,9 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "uBs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 +/obj/machinery/light{ + dir = 1; + pixel_y = 16 }, /turf/open/floor/engine, /area/ai_monitored/storage/eva) @@ -142776,7 +142582,6 @@ /area/engine/engineering) "uGO" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/camera{ @@ -142839,7 +142644,6 @@ /area/maintenance/port/aft) "uHp" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -142906,15 +142710,10 @@ }, /area/medical/morgue) "uIg" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "evashutter"; - name = "EVA Storage Shutters" - }, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/structure/medkit_cabinet{ + pixel_y = 28 }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "uIt" = ( /obj/effect/spawner/structure/window/reinforced, @@ -143706,7 +143505,6 @@ /area/hallway/primary/port) "uPc" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/tile/green{ @@ -145300,7 +145098,6 @@ /area/hydroponics/garden) "vae" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /obj/machinery/light{ @@ -146357,12 +146154,6 @@ /obj/structure/chair/office/dark, /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) -"vhq" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, -/turf/open/floor/plating/layenia, -/area/layenia/cloudlayer) "vhs" = ( /obj/effect/turf_decal/loading_area{ dir = 4; @@ -146564,10 +146355,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft/upper) "viQ" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 7 - }, /turf/open/floor/plasteel/dark{ dir = 4; icon_state = "darkfull_plate" @@ -147847,12 +147634,6 @@ }, /turf/open/floor/grass/layenia, /area/layenia/cloudlayer) -"vqJ" = ( -/obj/structure/flora/junglebush/large{ - icon_state = "bush" - }, -/turf/open/floor/grass/layenia, -/area/layenia) "vqP" = ( /obj/effect/turf_decal/tile/red{ dir = 6 @@ -148347,14 +148128,6 @@ }, /area/medical/medbay/upper) "vuV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - dir = 8; - name = "air supply pipe" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 4; - name = "scrubbers pipe" - }, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -150023,7 +149796,6 @@ "vGx" = ( /obj/effect/landmark/secequipment, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/bot, @@ -152899,7 +152671,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -155427,7 +155198,6 @@ name = "air vent" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -157540,7 +157310,6 @@ /area/maintenance/port/fore) "wHq" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -157676,7 +157445,6 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_y = -24 }, /obj/effect/turf_decal/loading_area{ @@ -158137,7 +157905,6 @@ /area/medical/chemistry) "wLm" = ( /obj/structure/flora/junglebush/large{ - icon_state = "bush"; pixel_x = -25; pixel_y = -4 }, @@ -158988,7 +158755,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -159054,10 +158820,6 @@ name = "large" }, /area/crew_quarters/fitness) -"wQr" = ( -/obj/structure/grille, -/turf/closed/wall/r_wall, -/area/engine/atmos) "wQy" = ( /obj/effect/turf_decal/loading_area{ icon_state = "drain"; @@ -159246,8 +159008,7 @@ /area/engine/engineering) "wRM" = ( /obj/structure/disposalpipe/trunk/multiz/down{ - dir = 1; - icon_state = "pipe-down" + dir = 1 }, /turf/open/floor/plating, /area/hallway/primary/aft/upper) @@ -159758,7 +159519,6 @@ /area/ai_monitored/storage/eva) "wVi" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/effect/turf_decal/tile/purple{ @@ -161014,12 +160774,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/central/upper) "xhd" = ( -/obj/structure/trash_pile, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" +/obj/effect/turf_decal/tile/green{ + dir = 6 }, -/turf/open/floor/plating, -/area/ai_monitored/storage/eva) +/obj/structure/sign/warning/gasmask{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white{ + icon_state = "plaswhite_plate" + }, +/area/medical/medbay/upper) "xhi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 9 @@ -161580,17 +161344,12 @@ }, /area/maintenance/port/aft/upper) "xmG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - dir = 8; - name = "air scrubber" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - dir = 8; - name = "air supply pipe" - }, -/turf/open/floor/plasteel/dark{ - icon_state = "darkfull_whole_alt" +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "half_stairs_darkfull"; + name = "dark steps" }, +/turf/open/floor/plating, /area/ai_monitored/storage/eva) "xmN" = ( /obj/structure/reagent_dispensers/watertank, @@ -162357,7 +162116,6 @@ pixel_y = 30 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = 24 }, /turf/open/floor/plasteel/dark{ @@ -162531,7 +162289,6 @@ name = "drain" }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /turf/open/floor/plasteel/white/corner{ @@ -163373,7 +163130,6 @@ pixel_y = 16 }, /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/structure/sign/directions/security{ @@ -163858,7 +163614,6 @@ /area/security/brig/upper) "xDz" = ( /obj/machinery/firealarm{ - dir = 2; pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ @@ -163888,9 +163643,7 @@ }, /area/engine/custom) "xDC" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree" - }, +/obj/structure/flora/tree/jungle, /turf/open/floor/grass/layenia, /area/layenia) "xDD" = ( @@ -180441,7 +180194,7 @@ xMC xMC xMC xMC -tya +taf xMC xMC xMC @@ -181197,7 +180950,7 @@ gTW gTW tBc jiW -tya +taf xMC tqX aiU @@ -183789,7 +183542,7 @@ prt prt tVV xMC -tya +taf lFZ tBc gTW @@ -184045,7 +183798,7 @@ pEE prt prt tVV -vqJ +tad wAe tBc tBc @@ -185581,7 +185334,7 @@ wjg uOy kzO xMC -tya +taf xMC xMC vIA @@ -185841,7 +185594,7 @@ uOy wjg kzO xMC -vqJ +tad xMC taj lFZ @@ -206858,7 +206611,7 @@ cOF cOF cOF cYt -pVk +aOn llH qWI fBG @@ -207115,7 +206868,7 @@ cOF cOF cOF cYt -pVk +aOn llH dBi aKa @@ -217582,9 +217335,9 @@ brE brE brE bHG -bNG +cHi bVW -bNG +cHi bHG csO bHG @@ -217592,10 +217345,10 @@ cHi cOV cHi bHG -bNG +cHi dvP doy -wQr +bkQ doy bWp doy @@ -217838,21 +217591,21 @@ tBc tBc tBc tBc -wQr +bkQ bNM bVZ ceS -wQr +bkQ tBc -wQr +bkQ cHn cPg cXG -wQr +bkQ dnT dwj dJB -wQr +bkQ dWX egv emY @@ -218095,25 +217848,25 @@ tBc tBc tBc tBc -wQr +bkQ bOD bOR bOR -wQr +bkQ tBc -wQr +bkQ cHr cPH cHA -wQr +bkQ dnV dwK dob -wQr +bkQ dXo egw dXE -wQr +bkQ ewl eCe tBc @@ -218352,25 +218105,25 @@ tBc tBc tBc tBc -wQr +bkQ bOR bOR bOR -wQr +bkQ tBc -wQr +bkQ cHA cHA cHA -wQr +bkQ dob dob dob -wQr +bkQ dXE dXE dXE -wQr +bkQ tBc tBc tBc @@ -218609,25 +218362,25 @@ tBc tBc tBc tBc -wQr -wQr +bkQ +bkQ bWp -wQr -wQr +bkQ +bkQ xaP -wQr -wQr +bkQ +bkQ bWp -wQr -wQr -wQr +bkQ +bkQ +bkQ bWp -wQr -wQr -wQr +bkQ +bkQ +bkQ bWp -wQr -wQr +bkQ +bkQ tBc fxA fxA @@ -219900,19 +219653,19 @@ bha blg acI wOp -wQr -cJq +bkQ +doy bWp -cJq -wQr +doy +bkQ doy bWp doy -wQr +bkQ doy bWp doy -wQr +bkQ xaP woj ewP @@ -220157,19 +219910,19 @@ gTW gTW gPq foH -wQr +bkQ cJt cPX cYJ -wQr +bkQ doD dyo dKp -wQr +bkQ dZx egI eoB -wQr +bkQ xej gPq gTW @@ -220414,19 +220167,19 @@ gTW gTW gPq foH -wQr +bkQ cJx cQH cJD -wQr +bkQ doH dyy tfk -wQr +bkQ eak ehV eaq -wQr +bkQ xej gPq gTW @@ -220671,19 +220424,19 @@ gPq gPq gPq foH -wQr +bkQ cJD cJD cJD -wQr +bkQ tfk tfk tfk -wQr +bkQ eaq eaq eaq -wQr +bkQ xej gPq gTW @@ -220928,19 +220681,19 @@ gTW gTW gPq foH -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr -wQr +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ +bkQ xej gPq gTW @@ -267072,7 +266825,7 @@ xAr qTp wIl lIQ -vhq +fPn pJd esY ePF @@ -267815,7 +267568,7 @@ azW azW vyI bsR -tIg +xhd wsF rMQ eux @@ -272394,7 +272147,7 @@ rKJ rKJ rKJ rKJ -qyT +chR hcx xMt pef @@ -272651,7 +272404,7 @@ rKJ rKJ rKJ rKJ -qyT +chR hcx rXq pef @@ -274461,7 +274214,7 @@ kZy kZy qSf kZy -trz +fOZ kZy kZy xQw @@ -274718,7 +274471,7 @@ oDt pUH qWc wlp -bvv +vor tYD imW qXs @@ -275486,9 +275239,9 @@ wzw lAo vbp rpn -eKV +rpn eHp -jVD +dhi xmG yag koB @@ -275745,7 +275498,7 @@ vbp dvI cdW sud -jVD +mHN rcr yag tat @@ -276258,9 +276011,9 @@ rlv vbp aXz lth -aXz +mkY dhi -pvh +rpn yag cKN axp @@ -276514,10 +276267,10 @@ wzw vbp vbp uIg -uIg -gOZ -vbp -mHN +pdc +pdc +pdc +pdc yag yag yag @@ -276770,17 +276523,17 @@ lRF wzw vbp gDY -mkY -tcM -mkY -tcM -tcM +pdc +pdc +pdc +pdc +pdc tlc aSG ios vbp pzH -ePF +jdh ePF ePF kBG @@ -277027,13 +276780,13 @@ lRF oVj vbp exC -pdc +gOZ pdc hDR -aOn -rpn -eKV -eHp +pdc +pdc +pdc +pdc lsO rvt xnL @@ -277284,15 +277037,15 @@ lRF wzw vbp wAz -pdc +kZw pdc aPE pdc -chR -cdW -sud +pdc +pdc +pdc lsO -rvt +trz xnL ePF ePF @@ -277507,7 +277260,7 @@ tIW sPQ sPQ sPQ -iXy +bvv hWC ejX vhg @@ -277544,12 +277297,12 @@ eGs kZw pdc aPE -aOn -uBs -qAH -ijB +pdc +pdc +pdc +pdc lsO -rvt +trz xnL ePF ePF @@ -277802,13 +277555,13 @@ bRX mRn dTz qMb -qMb -qMb -qMb +qGU +pdc +mHN qZR vbp ssD -ePF +jdh ePF ePF gbD @@ -278054,13 +277807,13 @@ xMt lRF wzw vbp -xhd -ekL +pdc +jVD dlu lWJ hcY -hcY -qGU +tcM +pdc qNr eig vbp diff --git a/code/game/objects/structures/signs/signs_warning.dm b/code/game/objects/structures/signs/signs_warning.dm index f735ed7bc..b47195431 100644 --- a/code/game/objects/structures/signs/signs_warning.dm +++ b/code/game/objects/structures/signs/signs_warning.dm @@ -73,3 +73,44 @@ name = "\improper ENGINEERING SAFETY" desc = "A sign detailing the various safety protocols when working on-site to ensure a safe shift." icon_state = "safety" + +/obj/structure/sign/warning/gasmask + name = "\improper PPE AREA" + desc = "A warning stating that, beyond this point, a closed oxygen circuit is required. Be aware, be safe." + icon_state = "gasmask" + +/obj/structure/sign/warning/cold + name = "\improper AMBIENT TEMPERATURE WARNING: FROST" + desc = "A sign warning of an incredibly cold area ahead." + icon_state = "cold" + +/obj/structure/sign/warning/heat + name = "\improper AMBIENT TEMPERATURE WARNING: FIRE" + desc = "A sign warning of an incredibly warm area ahead." + icon_state = "heat" + +/obj/structure/sign/warning/nanites + name = "\improper NANITE LAB" + desc = "A sign designating this specific area as a nanite laboratory." + icon_state = "nanites" + +/obj/structure/sign/warning/explosives + name = "\improper DANGER: EXPLOSIVES" + desc = "A sign noting planned explosions in the area. Probably not a safe location." + icon_state = "explosives" + +/obj/structure/sign/warning/explosives/alt + icon_state = "explosives2" + +/obj/structure/sign/warning/testchamber + name = "\improper DANGER: ACTIVE TESTING" + desc = "A warning informing crew that they're about to enter an active testing environment." + icon_state = "testchamber" + +/obj/structure/sign/warning/maint + name = "\improper DANGER: MAINTENANCE ACCESS" + desc = "The tunnels call out for you. Will you respond?" + icon_state = "mait1" + +/obj/structure/sign/warning/maint/alt + icon_state = "mait2" diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 7be0bd79d5476574738ad3310177bae1872a943f..3d99e23dbd3803586ea10a1c2f7347dd1142fad7 100644 GIT binary patch delta 11806 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 delta 11872 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 From 52c344cfab2cb96db647ab9c5284311be822bfb3 Mon Sep 17 00:00:00 2001 From: Carl? Date: Sat, 25 May 2024 17:32:12 -0400 Subject: [PATCH 2/2] - - - Map: - Removes erroneous, or otherwise redundant variables from a few objects. - Void doors near the shift-change shuttle pad have been corrected. Someone double quoted 'em. - - - Bugs: - Lead walls should now fully smooth with windows. I don't know how I missed this a long while back. - - - --- .../LayeniaStation/LayeniaStation.dmm | 160 ++++++++++++++---- code/game/objects/structures/window.dm | 3 + 2 files changed, 130 insertions(+), 33 deletions(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 918dde230..eead1551e 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -17486,6 +17486,9 @@ "cFt" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "cFx" = ( @@ -17676,6 +17679,16 @@ icon_state = "floor_plate" }, /area/hallway/primary/port/upper) +"cHD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark/layenia{ + dir = 1; + icon_state = "darkfull_plate" + }, +/area/layenia/cloudlayer) "cHH" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/brflowers, @@ -18842,7 +18855,6 @@ /area/maintenance/port/aft/upper) "cSg" = ( /obj/effect/turf_decal/loading_area{ - color = null; dir = 8; icon_state = "half_stairs_wood"; name = "wood steps" @@ -37432,6 +37444,9 @@ }, /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/plating, /area/engine/engineering/reactor_control) "fRC" = ( @@ -37495,6 +37510,9 @@ }, /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/plating, /area/engine/engineering/reactor_control) "fSu" = ( @@ -41003,6 +41021,13 @@ name = "Reactor Control Room APC"; pixel_x = 24 }, +/obj/machinery/button/door{ + id = "nuke_reactor_ext_windows"; + name = "Exterior Viewing Shutters Control"; + pixel_x = 23; + pixel_y = -23; + req_access_txt = "10;24" + }, /turf/open/floor/plasteel/dark, /area/engine/engineering/reactor_control) "gtv" = ( @@ -41243,7 +41268,6 @@ "gve" = ( /obj/structure/railing, /obj/effect/turf_decal/loading_area{ - color = null; dir = 8; icon_state = "half_stairs_wood"; name = "wood steps" @@ -41278,7 +41302,6 @@ "gvD" = ( /obj/structure/railing, /obj/effect/turf_decal/loading_area{ - color = null; dir = 4; icon_state = "half_stairs_wood"; name = "wood steps" @@ -45411,6 +45434,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "hcU" = ( @@ -47378,6 +47404,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "hqQ" = ( @@ -47653,7 +47682,6 @@ }, /obj/machinery/door/airlock/security/glass{ dir = 8; - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -52590,6 +52618,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/upper) +"icj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/layenia{ + icon_state = "darkfull_whole_alt" + }, +/area/layenia/cloudlayer) "ico" = ( /obj/effect/turf_decal/loading_area{ dir = 4; @@ -53498,6 +53534,9 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/radiation{ + id = "nuke_reactor_ext_windows" + }, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "ikZ" = ( @@ -53505,10 +53544,15 @@ /area/ai_monitored/storage/satellite) "ila" = ( /obj/machinery/door/airlock/external{ - name = ""MiniSat Catwalk Access""; + name = "Catwalk Access"; req_access_txt = "65" }, -/turf/open/floor/plating/layenia, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, /area/ai_monitored/storage/satellite) "ilq" = ( /obj/structure/table/wood, @@ -54674,7 +54718,7 @@ }, /area/medical/psych/lobby) "itf" = ( -/turf/open/floor/plating/layenia, +/turf/open/floor/plating, /area/ai_monitored/storage/satellite) "itl" = ( /obj/effect/turf_decal/tile/neutral{ @@ -55845,7 +55889,8 @@ /obj/machinery/light{ pixel_y = -1 }, -/turf/open/floor/plating/layenia, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, /area/ai_monitored/storage/satellite) "iBi" = ( /obj/effect/turf_decal/tile/blue{ @@ -68429,7 +68474,6 @@ "ktu" = ( /obj/machinery/door/airlock{ dir = 8; - id_tag = null; name = "Unit X" }, /obj/effect/decal/cleanable/dirt, @@ -72547,6 +72591,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark/layenia{ icon_state = "darkfull_plate" }, @@ -79428,7 +79475,6 @@ /area/crew_quarters/bar) "meM" = ( /obj/effect/turf_decal/loading_area{ - color = null; dir = 4; icon_state = "half_stairs_wood"; name = "wood steps" @@ -84049,7 +84095,6 @@ }, /obj/machinery/door/airlock/security/glass{ dir = 8; - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -94414,6 +94459,12 @@ }, /turf/open/floor/plasteel/dark, /area/quartermaster/storage) +"olb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/layenia, +/area/layenia/cloudlayer) "olc" = ( /obj/structure/window/reinforced{ dir = 8 @@ -99019,7 +99070,6 @@ /area/crew_quarters/fitness/pool) "oOt" = ( /obj/effect/turf_decal/loading_area{ - color = null; dir = 1; icon_state = "half_stairs_wood"; name = "wood steps" @@ -101026,7 +101076,11 @@ dir = 1; pixel_y = 16 }, -/turf/open/floor/plating/layenia, +/obj/item/chair{ + dir = 1 + }, +/obj/item/restraints/handcuffs/cable/zipties/used, +/turf/open/floor/plating, /area/ai_monitored/storage/satellite) "pal" = ( /obj/effect/turf_decal/delivery, @@ -102737,7 +102791,7 @@ /obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen/alt{ dir = 8; - id = "robotics2" ; + id = "robotics2"; name = "robotics lab shutters" }, /turf/open/floor/plating, @@ -109763,6 +109817,15 @@ name = "tile" }, /area/hallway/primary/aft) +"qmW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/layenia{ + icon_state = "darkfull_plate" + }, +/area/layenia/cloudlayer) "qmX" = ( /obj/machinery/light{ dir = 8; @@ -109882,7 +109945,7 @@ }, /obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen/alt{ - id = "robotics" ; + id = "robotics"; name = "robotics lab shutters" }, /obj/machinery/door/firedoor, @@ -111333,7 +111396,6 @@ /area/hallway/primary/aft) "qxw" = ( /obj/effect/turf_decal/loading_area{ - color = null; dir = 1; icon_state = "half_stairs_wood"; name = "wood steps" @@ -115899,7 +115961,6 @@ /area/layenia) "rbN" = ( /obj/effect/turf_decal/loading_area{ - color = null; dir = 4; icon_state = "half_stairs_wood"; name = "wood steps" @@ -132880,7 +132941,6 @@ /area/hallway/secondary/exit/upper) "trj" = ( /obj/effect/turf_decal/loading_area{ - color = null; icon_state = "half_stairs_wood"; name = "wood steps" }, @@ -157197,6 +157257,19 @@ name = "parquet" }, /area/crew_quarters/lounge) +"wGx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/dark/layenia{ + dir = 1; + icon_state = "darkfull_plate" + }, +/area/layenia/cloudlayer) "wGE" = ( /obj/machinery/light{ pixel_y = -1 @@ -162803,6 +162876,15 @@ icon_state = "plaswhite_trim" }, /area/medical/medbay/upper) +"xxD" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/layenia{ + icon_state = "darkfull_plate" + }, +/area/layenia/cloudlayer) "xxO" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -166964,6 +167046,18 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"ycx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/layenia{ + dir = 8; + icon_state = "darkfull_plate" + }, +/area/layenia/cloudlayer) "ycC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ name = "scrubbers pipe" @@ -283943,9 +284037,9 @@ ePF ePF ePF ePF -xxP -bbt -bbt +wGx +ycx +ycx kZL ePF ePF @@ -284200,10 +284294,10 @@ ePF ePF ePF ePF -tfs -lMY -xAr -lxX +cHD +xCw +xCw +qmW ePF ePF ePF @@ -284457,10 +284551,10 @@ ePF ePF ePF ePF -tfs -xAr -xAr -lxX +cHD +xCw +xCw +qmW ePF ePF ePF @@ -284714,10 +284808,10 @@ ePF ePF ePF ePF -tfs -xAr -cda -lxX +xxP +olb +icj +xxD ePF ePF ePF diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index afb21b10a..198e606a9 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -610,6 +610,7 @@ canSmoothWith = list( /turf/closed/wall, /turf/closed/wall/r_wall, + /turf/closed/wall/mineral/lead, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile, /obj/machinery/door, @@ -661,6 +662,7 @@ canSmoothWith = list( /turf/closed/wall, /turf/closed/wall/r_wall, + /turf/closed/wall/mineral/lead, /obj/structure/falsewall, /obj/structure/falsewall/brass, /obj/structure/falsewall/reinforced, @@ -722,6 +724,7 @@ canSmoothWith = list( /turf/closed/wall, /turf/closed/wall/r_wall, + /turf/closed/wall/mineral/lead, /obj/structure/falsewall, /obj/structure/falsewall/brass, /obj/structure/falsewall/reinforced,