From 5eb77f25ee8f8ae2dfb46b67907e7f1a921616e8 Mon Sep 17 00:00:00 2001 From: Koi <168238458+GremlinSeeker@users.noreply.github.com> Date: Sun, 20 Oct 2024 09:34:04 -0500 Subject: [PATCH] [NO GBP] Icebox Ruin Fixes (#87308) ## About The Pull Request Fixes active turfs on two of my icebox ruin maps by creating a stonefloor icemoon subtype. ## Why It's Good For The Game it fixes ## Changelog :cl: fix: fixed active turfs on two icemoon ruins. /:cl: --- .../IceRuins/icemoon_surface_lodge.dmm | 86 +++++++++---------- .../icemoon_underground_syndidome.dmm | 42 ++++----- code/game/turfs/open/floor/misc_floor.dm | 11 +++ 3 files changed, 75 insertions(+), 64 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_lodge.dmm index d35fc52db02..3cc4189273f 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_lodge.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_lodge.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "aw" = ( /obj/effect/turf_decal/siding/wood{ @@ -36,7 +36,7 @@ pixel_x = -5; pixel_y = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "aU" = ( /obj/effect/decal/cleanable/blood/footprints{ @@ -48,7 +48,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "bs" = ( /obj/machinery/door/airlock/wood{ @@ -84,7 +84,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "bX" = ( /obj/structure/table, @@ -134,7 +134,7 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "cQ" = ( /obj/effect/turf_decal/siding/wood{ @@ -189,7 +189,7 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "dC" = ( /obj/machinery/door/airlock/wood{ @@ -213,7 +213,7 @@ /obj/structure/railing/corner{ color = "#beada5" }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/ruin/huntinglodge) "dQ" = ( /obj/effect/decal/cleanable/wrapping, @@ -305,13 +305,13 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "fi" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "fB" = ( /obj/effect/turf_decal/siding/wood{ @@ -337,7 +337,7 @@ dir = 9 }, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "gu" = ( /obj/structure/table/wood, @@ -401,7 +401,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "gY" = ( /turf/open/floor/light/colour_cycle/dancefloor_b, @@ -410,7 +410,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "hb" = ( /obj/structure/railing{ @@ -541,7 +541,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "jp" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -868,7 +868,7 @@ dir = 6 }, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "oY" = ( /obj/structure/railing{ @@ -881,7 +881,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "pl" = ( /obj/effect/turf_decal/siding/wood{ @@ -983,7 +983,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "qL" = ( /obj/structure/table/wood/fancy/orange, @@ -1038,7 +1038,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "rI" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -1048,7 +1048,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "rS" = ( /obj/effect/turf_decal/siding/wood{ @@ -1061,7 +1061,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "sX" = ( /obj/structure/table/wood/fancy/royalblack, @@ -1217,7 +1217,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "vO" = ( /obj/effect/turf_decal/siding/wood{ @@ -1304,7 +1304,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "wP" = ( /obj/effect/decal/cleanable/blood/gibs/up, @@ -1481,7 +1481,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "yO" = ( /obj/effect/decal/cleanable/garbage, @@ -1595,7 +1595,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "AF" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -1789,7 +1789,7 @@ /obj/effect/decal/cleanable/blood/trails{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Ds" = ( /obj/effect/turf_decal/siding/wood, @@ -1962,7 +1962,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Fw" = ( /obj/structure/railing{ @@ -2037,7 +2037,7 @@ dir = 4; color = "#beada5" }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Gn" = ( /obj/effect/turf_decal/siding/wood{ @@ -2112,7 +2112,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Hi" = ( /obj/structure/table/wood/fancy, @@ -2177,7 +2177,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Hw" = ( /obj/effect/turf_decal/siding/wood{ @@ -2208,7 +2208,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "HL" = ( /obj/structure/table/wood, @@ -2375,7 +2375,7 @@ dir = 8; color = "#beada5" }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "KB" = ( /obj/effect/turf_decal/siding/wood{ @@ -2536,14 +2536,14 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "NW" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Oa" = ( /obj/effect/turf_decal/siding/wood, @@ -2646,7 +2646,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Pa" = ( /obj/effect/decal/cleanable/blood/gibs/up, @@ -2685,7 +2685,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "PS" = ( /obj/effect/spawner/structure/window/reinforced{ @@ -2837,7 +2837,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Sp" = ( /obj/effect/decal/cleanable/blood/trails{ @@ -2911,7 +2911,7 @@ /obj/effect/decal/cleanable/blood/trails{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "TC" = ( /obj/effect/decal/cleanable/blood, @@ -3043,7 +3043,7 @@ dir = 8 }, /obj/machinery/light/small/dim/directional/west, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/ruin/huntinglodge) "VW" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -3053,7 +3053,7 @@ pixel_x = -4; pixel_y = -15 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Wn" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -3109,7 +3109,7 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "Xk" = ( /obj/effect/turf_decal/siding/wood{ @@ -3150,7 +3150,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "XF" = ( /obj/effect/decal/cleanable/dirt, @@ -3207,7 +3207,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "YD" = ( /obj/effect/spawner/structure/window/reinforced{ @@ -3266,14 +3266,14 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/nospawn) "ZA" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, /obj/machinery/light/small/dim/directional/east, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/ruin/huntinglodge) "ZB" = ( /obj/structure/table/wood/fancy, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm index 971b9582568..a3c10d3b508 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm @@ -177,7 +177,7 @@ /obj/structure/railing/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "cb" = ( /obj/effect/turf_decal/weather/dirt{ @@ -366,7 +366,7 @@ /obj/structure/railing{ dir = 9 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "eO" = ( /obj/effect/decal/cleanable/dirt, @@ -1500,7 +1500,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "ue" = ( /obj/effect/turf_decal/trimline/dark_red/line{ @@ -1524,7 +1524,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "uq" = ( /obj/effect/turf_decal/trimline/dark_blue/line{ @@ -1589,7 +1589,7 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "uH" = ( /obj/effect/decal/cleanable/blood/footprints, @@ -1749,7 +1749,7 @@ /obj/structure/railing{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "wd" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -1927,7 +1927,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "xz" = ( /obj/effect/turf_decal/weather/dirt{ @@ -2154,7 +2154,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "zF" = ( /obj/effect/turf_decal/trimline/green/corner, @@ -2217,7 +2217,7 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Ax" = ( /obj/effect/decal/cleanable/blood/old, @@ -2298,7 +2298,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Br" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -2419,13 +2419,13 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Dl" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Do" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, @@ -2825,7 +2825,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "IR" = ( /obj/effect/turf_decal/trimline/purple/line{ @@ -2848,7 +2848,7 @@ dir = 1 }, /obj/structure/railing/corner, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Jk" = ( /obj/machinery/door/firedoor, @@ -2922,7 +2922,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "JZ" = ( /obj/effect/decal/cleanable/blood/trails{ @@ -2971,7 +2971,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "KE" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -3076,7 +3076,7 @@ }, /obj/effect/turf_decal/weather/snow/corner, /obj/machinery/light/warm/dim/directional/north, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/ruin/syndibiodome) "Ly" = ( /obj/structure/aquarium/prefilled, @@ -3315,7 +3315,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Nt" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3922,7 +3922,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "Uc" = ( /obj/effect/turf_decal/siding/wood{ @@ -4015,7 +4015,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "UI" = ( /obj/item/flashlight/lantern/on, @@ -4416,7 +4416,7 @@ /obj/structure/railing{ dir = 6 }, -/turf/open/floor/stone, +/turf/open/floor/stone/icemoon, /area/icemoon/surface/outdoors/noteleport) "ZT" = ( /obj/machinery/light/warm/directional/south, diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index 8f8d5fbf1b0..4f248fba836 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -285,6 +285,17 @@ The idea of a \"rudimentary\" iron wall makes no sense at all! Is anything i'm even saying here true? Someone's gotta fact check this!" icon_state = "stone_floor" +/turf/open/floor/stone/icemoon + initial_gas_mix = ICEMOON_DEFAULT_ATMOS + name = "stone brick floor" + desc = "Odd, really, how it looks exactly like the iron walls yet is stone instead of iron. Now, if that's really more of a complaint about\ + the ironness of walls or the stoneness of the floors, that's really up to you. But have you really ever seen iron that dull? I mean, it\ + makes sense for the station to have dull metal walls but we're talking how a rudimentary iron wall would be. Medieval ages didn't even\ + use iron walls, iron walls are actually not even something that exists because iron is an expensive and not-so-great thing to build walls\ + out of. It only makes sense in the context of space because you're trying to keep a freezing vacuum out. Is anyone following me on this? \ + The idea of a \"rudimentary\" iron wall makes no sense at all! Is anything i'm even saying here true? Someone's gotta fact check this!" + icon_state = "stone_floor" + /turf/open/floor/vault name = "strange floor" desc = "You feel a strange nostalgia from looking at this..."