diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 1a8da5b6444..eb823f0e7f0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -5899,8 +5899,7 @@ /area/ruin/space/derelict/arrival) "pU" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -5912,8 +5911,7 @@ /area/ruin/space/derelict/crew_quarters) "pV" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/closet/crate/freezer, /obj/item/food/grown/potato, @@ -5927,8 +5925,7 @@ /area/ruin/space/derelict/crew_quarters) "pW" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/fermenting_barrel, /turf/simulated/floor/plasteel{ @@ -5940,8 +5937,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/fermenting_barrel, /turf/simulated/floor/plasteel{ @@ -6449,8 +6445,7 @@ }, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -6463,8 +6458,7 @@ }, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/grass, /area/ruin/space/derelict/arrival) @@ -6475,8 +6469,7 @@ }, /obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -6631,8 +6624,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, @@ -6640,16 +6632,14 @@ /area/ruin/space/derelict/arrival) "rL" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/ruin/space/derelict/arrival) "rM" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -6747,8 +6737,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/leafybush, @@ -6756,8 +6745,7 @@ /area/ruin/space/derelict/arrival) "rV" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, @@ -6767,8 +6755,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index eda3acc0483..a5c17e53cd5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -439,8 +439,7 @@ "bF" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating/airless, /area/ruin/space/powered) diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index d5147c6e11a..efd0c12a3e8 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -8967,8 +8967,7 @@ /area/tdome/tdomeobserve) "GL" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/admin) diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index db9653080cc..8d75d995428 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -160,8 +160,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -325,8 +324,7 @@ "wG" = ( /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/head/helmet/alt, @@ -428,8 +426,7 @@ installation = /obj/item/gun/energy/gun }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -439,8 +436,7 @@ "Bc" = ( /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -488,8 +484,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -574,8 +569,7 @@ /area/shuttle/administration) "Gn" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/rack, /obj/item/gun/projectile/shotgun/riot{ @@ -618,8 +612,7 @@ installation = /obj/item/gun/energy/gun }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -659,8 +652,7 @@ /area/shuttle/administration) "Ki" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -704,8 +696,7 @@ "Mo" = ( /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -721,8 +712,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/rack, /obj/item/gun/projectile/shotgun/riot{ @@ -768,8 +758,7 @@ "Pn" = ( /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -820,8 +809,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -871,8 +859,7 @@ installation = /obj/item/gun/energy/gun }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -929,8 +916,7 @@ /area/shuttle/administration) "XL" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/rack, /obj/structure/window/reinforced{ diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 45a72ba289f..48e794dd424 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -658,8 +658,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/floor/mineral/titanium, diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm index 1f1b21fde37..f05a3df9bc5 100644 --- a/_maps/map_files/shuttles/emergency_cramped.dmm +++ b/_maps/map_files/shuttles/emergency_cramped.dmm @@ -43,8 +43,7 @@ /area/shuttle/escape) "n" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -58,8 +57,7 @@ /area/shuttle/escape) "p" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -111,8 +109,7 @@ /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/escape) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 8a10fbc35c9..68fee0c66ba 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -102,8 +102,7 @@ "abP" = ( /obj/machinery/suit_storage_unit/security/secure, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -312,8 +311,7 @@ pixel_x = -32 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/security/range) @@ -325,8 +323,7 @@ }, /obj/item/clothing/ears/earmuffs, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/security/range) @@ -342,8 +339,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/flashbangs, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/security/range) @@ -404,8 +400,7 @@ "adg" = ( /obj/structure/dispenser/oxygen, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -414,8 +409,7 @@ "adh" = ( /obj/machinery/suit_storage_unit/security/secure, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -625,8 +619,7 @@ pixel_y = 3 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -2168,8 +2161,7 @@ /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -12934,8 +12926,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/wood, /area/station/public/dorms) @@ -12952,8 +12943,7 @@ "aTG" = ( /obj/structure/chair/sofa/left, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/wood, /area/station/public/dorms) @@ -12966,8 +12956,7 @@ "aTI" = ( /obj/structure/chair/sofa, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/landmark/start/assistant, /turf/simulated/floor/wood, @@ -13041,8 +13030,7 @@ /area/station/ai_monitored/storage/eva) "aTR" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/wood, /area/station/public/dorms) @@ -15967,8 +15955,7 @@ "bcR" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating, /area/station/service/chapel) @@ -56359,8 +56346,7 @@ name = "CORPSE disposal unit" }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -69286,8 +69272,7 @@ /area/station/science/robotics) "oAs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index d5ef0a11b81..8bd9883f96a 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -23004,8 +23004,7 @@ name = "N2 to Pure" }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/door/window/classic/reversed{ @@ -23121,8 +23120,7 @@ name = "O2 to Pure" }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/door/window/classic/reversed{ @@ -61172,8 +61170,7 @@ "lTC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; @@ -84662,8 +84659,7 @@ "rGv" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, @@ -85316,8 +85312,7 @@ "rNo" = ( /obj/machinery/cooking/deepfryer, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/wood, @@ -101137,8 +101132,7 @@ name = "cadaver delivery chute" }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/all/science/robotics{ dir = 8 diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 762b7dfbee5..cf473099db2 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -5132,8 +5132,7 @@ /area/station/maintenance/disposal) "axD" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -6650,8 +6649,7 @@ /area/station/supply/storage) "aCK" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/arrows/black{ dir = 4 @@ -13664,8 +13662,7 @@ /area/station/engineering/atmos) "bav" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -13719,8 +13716,7 @@ /area/station/maintenance/fore) "baE" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -17096,8 +17092,7 @@ /area/space/nearstation) "bmp" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -17107,15 +17102,13 @@ /area/station/aisat) "bmq" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/transparent/glass, /area/station/aisat) "bmr" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -17561,8 +17554,7 @@ /area/station/engineering/control) "boe" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -18544,8 +18536,7 @@ "brq" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -18555,15 +18546,13 @@ "brr" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/space, /area/space/nearstation) "brs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/space, /area/space/nearstation) @@ -18596,8 +18585,7 @@ "brw" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -21199,8 +21187,7 @@ /area/station/maintenance/fore) "bAm" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -24509,8 +24496,7 @@ /area/station/security/permabrig) "bJO" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -25214,8 +25200,7 @@ /area/station/security/warden) "bLM" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -25244,8 +25229,7 @@ /area/station/turret_protected/ai) "bLR" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/lattice, /turf/space, @@ -26869,8 +26853,7 @@ "bQO" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/flashlight/lamp/green, /obj/machinery/light{ @@ -26881,8 +26864,7 @@ "bQP" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/paper_bin/nanotrasen, /obj/item/melee/chainofcommand, @@ -26905,8 +26887,7 @@ "bQS" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/storage/secure/briefcase, /obj/item/storage/lockbox/medal, @@ -33684,8 +33665,7 @@ /area/station/aisat) "cpd" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -34247,8 +34227,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -37178,8 +37157,7 @@ /area/station/public/fitness) "czf" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -38802,22 +38780,19 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cEx" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cEy" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/door/window{ dir = 4 @@ -43612,8 +43587,7 @@ /area/station/science/xenobiology) "cUV" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -45948,8 +45922,7 @@ "deA" = ( /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -45977,8 +45950,7 @@ "deC" = ( /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -45994,8 +45966,7 @@ "deD" = ( /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -46011,8 +45982,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/cable{ icon_state = "1-2" @@ -47913,8 +47883,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/cable, /obj/structure/cable{ @@ -51354,8 +51323,7 @@ "dFf" = ( /obj/item/target, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) @@ -53772,8 +53740,7 @@ /area/station/hallway/secondary/exit) "dSz" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -55728,8 +55695,7 @@ /area/station/service/kitchen) "ema" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /mob/living/simple_animal/crab/coffee, /turf/simulated/floor/beach/water{ @@ -57680,8 +57646,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/aisat) @@ -62323,8 +62288,7 @@ /area/station/hallway/primary/central) "hQq" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/beach/water{ icon_state = "seadeep" @@ -67463,8 +67427,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/transparent/glass, /area/station/aisat) @@ -67902,8 +67865,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/transparent/glass, /area/station/aisat) @@ -69318,12 +69280,10 @@ /area/station/supply/break_room) "lCU" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/space, /area/space/nearstation) @@ -74419,8 +74379,7 @@ /area/space/nearstation) "opS" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/rack, /obj/item/clothing/shoes/magboots{ @@ -74507,8 +74466,7 @@ /area/station/medical/surgery/secondary) "orz" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -75681,8 +75639,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/space, /area/space/nearstation) @@ -80194,8 +80151,7 @@ /area/station/maintenance/starboard2) "rly" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -82489,8 +82445,7 @@ "sot" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/closet/crate/rcd, /obj/machinery/door/window/classic/normal{ @@ -87158,8 +87113,7 @@ "uxq" = ( /mob/living/carbon/human/monkey, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/grass, /area/station/science/genetics) @@ -87403,8 +87357,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /mob/living/carbon/human/monkey, /turf/simulated/floor/grass, @@ -92433,8 +92386,7 @@ /area/station/hallway/primary/starboard/east) "xfs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/door/window/reinforced/normal{ name = "Accused"; diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index cd9db259543..423604cfc03 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -208,8 +208,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1528,8 +1527,7 @@ "aqF" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating, /area/station/service/chapel/funeral) @@ -1550,8 +1548,7 @@ pixel_x = -3 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/storage/fancy/shell/tranquilizer, /obj/structure/shelf/security, @@ -7380,8 +7377,7 @@ "bye" = ( /obj/structure/closet/coffin, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -8976,8 +8972,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -12657,8 +12652,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/camera/motion{ c_tag = "AI West"; @@ -16014,8 +16008,7 @@ "djB" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs{ @@ -16924,8 +16917,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, @@ -22100,8 +22092,7 @@ /area/station/hallway/primary/central/south) "evv" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/wood, /obj/item/folder/blue, @@ -34145,8 +34136,7 @@ pixel_y = -3 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -37193,8 +37183,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -37364,8 +37353,7 @@ /area/station/maintenance/apmaint2) "huz" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/rack, /obj/item/clothing/neck/scarf/stripedblue, @@ -38027,8 +38015,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/shelf/security, /turf/simulated/floor/plasteel{ @@ -42338,8 +42325,7 @@ /area/station/engineering/equipmentstorage) "iuD" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/engine, /area/station/science/xenobiology) @@ -43360,8 +43346,7 @@ /area/station/maintenance/aft2) "iEB" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/sign/clown{ pixel_x = -32 @@ -44350,8 +44335,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -47778,8 +47762,7 @@ /area/station/security/armory/secure) "jxe" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -49327,8 +49310,7 @@ pixel_x = 5 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/wood, /area/station/legal/courtroom/gallery) @@ -53311,8 +53293,7 @@ "kBT" = ( /obj/structure/closet/coffin, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light{ dir = 4 @@ -60057,8 +60038,7 @@ /area/station/engineering/tech_storage) "lXg" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/glass/reinforced, /obj/item/ai_module/reset, @@ -61353,8 +61333,7 @@ /area/station/engineering/atmos/storage) "mlQ" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/wood, /obj/item/pinpointer, @@ -66614,8 +66593,7 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -71081,8 +71059,7 @@ dir = 2 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -71333,8 +71310,7 @@ }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/chapel_office, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plating, /area/station/service/chapel/funeral) @@ -73296,8 +73272,7 @@ /area/station/maintenance/apmaint2) "oCg" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ @@ -83412,8 +83387,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/landmark/spawner/rev, /turf/simulated/floor/plasteel{ @@ -88714,8 +88688,7 @@ pixel_y = -3 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -105365,8 +105338,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/landmark/spawner/rev, /obj/structure/morgue{ @@ -106402,8 +106374,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -107903,8 +107874,7 @@ /area/station/maintenance/fpmaint) "vsq" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/glass/reinforced, /obj/item/flash, @@ -113385,8 +113355,7 @@ /area/station/public/construction) "wwv" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 diff --git a/_maps/map_files/templates/biodome_beach.dmm b/_maps/map_files/templates/biodome_beach.dmm index c622e6cca4d..66859c86710 100644 --- a/_maps/map_files/templates/biodome_beach.dmm +++ b/_maps/map_files/templates/biodome_beach.dmm @@ -312,8 +312,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/chair/stool, /turf/simulated/floor/wood, diff --git a/tools/UpdatePaths/Scripts/28778_window_layers.txt b/tools/UpdatePaths/Scripts/28778_window_layers.txt new file mode 100644 index 00000000000..153e2e5f32e --- /dev/null +++ b/tools/UpdatePaths/Scripts/28778_window_layers.txt @@ -0,0 +1 @@ +/obj/structure/window/@SUBTYPES : /obj/structure/window/@SUBTYPES{@OLD;layer=@SKIP} diff --git a/tools/maplint/lints/window_layers.yml b/tools/maplint/lints/window_layers.yml new file mode 100644 index 00000000000..3862dd6e547 --- /dev/null +++ b/tools/maplint/lints/window_layers.yml @@ -0,0 +1,3 @@ +/obj/structure/window: + banned_variables: + - layer