From 4d953ab00df50723fc09cf53cb18ee7a75178e13 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 13 Aug 2020 00:19:48 +0200 Subject: [PATCH] [MIRROR] Fixes missing icon in clown biodome (#320) * Fixes missing icon in clown biodome (#52837) * Fixes missing icon in clown biodome * Moves biodome icon_state edits to new types * Fixes missing icon in clown biodome Co-authored-by: YPOQ <30683121+YPOQ@users.noreply.github.com> --- .../lavaland_biodome_clown_planet.dmm | 338 ++++-------------- code/game/turfs/open/_open.dm | 32 +- 2 files changed, 89 insertions(+), 281 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 3f6151d72f8..a80221928c5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -47,10 +47,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "as" = ( /obj/effect/mob_spawn/human/corpse/damaged, @@ -68,10 +65,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "at" = ( /obj/structure/disposalpipe/segment{ @@ -87,10 +81,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "au" = ( /obj/structure/disposalpipe/segment{ @@ -127,10 +118,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "ay" = ( /obj/structure/disposalpipe/segment{ @@ -147,10 +135,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "az" = ( /obj/structure/disposalpipe/segment{ @@ -168,10 +153,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aA" = ( /obj/structure/disposalpipe/segment{ @@ -188,10 +170,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aB" = ( /obj/structure/disposalpipe/segment{ @@ -207,10 +186,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aC" = ( /obj/effect/turf_decal/tile/yellow, @@ -223,10 +199,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aD" = ( /obj/effect/decal/cleanable/dirt, @@ -240,10 +213,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aE" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -257,10 +227,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aF" = ( /obj/structure/disposalpipe/segment{ @@ -278,10 +245,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aG" = ( /obj/structure/disposalpipe/segment{ @@ -297,10 +261,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aH" = ( /obj/structure/disposalpipe/segment{ @@ -317,10 +278,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aI" = ( /obj/structure/disposalpipe/segment{ @@ -337,10 +295,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aJ" = ( /obj/structure/disposalpipe/segment{ @@ -364,10 +319,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aL" = ( /obj/structure/disposalpipe/segment{ @@ -390,10 +342,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aO" = ( /obj/item/bikehorn, @@ -411,10 +360,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aP" = ( /obj/structure/disposalpipe/segment{ @@ -444,10 +390,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aU" = ( /obj/effect/spawner/structure/window/reinforced, @@ -468,10 +411,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aW" = ( /obj/item/bikehorn, @@ -489,10 +429,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aX" = ( /obj/structure/disposalpipe/trunk{ @@ -518,10 +455,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "aZ" = ( /obj/structure/disposalpipe/segment{ @@ -538,10 +472,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "ba" = ( /obj/effect/decal/cleanable/food/pie_smudge, @@ -555,19 +486,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bb" = ( /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bc" = ( /obj/structure/disposalpipe/segment{ @@ -584,10 +510,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bd" = ( /obj/structure/disposalpipe/segment{ @@ -597,9 +520,7 @@ /obj/structure/table, /obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape, /obj/item/pen/fourcolor, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "be" = ( /obj/structure/disposalpipe/segment{ @@ -608,9 +529,7 @@ }, /obj/structure/table, /obj/item/flashlight/lamp/bananalamp, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bf" = ( /obj/structure/disposalpipe/segment{ @@ -627,10 +546,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bg" = ( /obj/structure/disposalpipe/segment{ @@ -638,34 +554,26 @@ invisibility = 101 }, /obj/item/pickaxe, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bh" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bi" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bj" = ( /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 }, -/turf/open/indestructible{ - icon_state = "light_on" - }, +/turf/open/indestructible/light, /area/ruin/powered/clownplanet) "bk" = ( /obj/structure/disposalpipe/segment{ @@ -675,44 +583,32 @@ brightness = 3; dir = 8 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bl" = ( -/turf/open/indestructible{ - icon_state = "light_on" - }, +/turf/open/indestructible/light, /area/ruin/powered/clownplanet) "bm" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bn" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bp" = ( /turf/closed/mineral/bananium, /area/ruin/powered/clownplanet) "bq" = ( /obj/item/pickaxe, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "br" = ( -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bs" = ( /obj/structure/disposalpipe/segment{ @@ -728,10 +624,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bt" = ( /obj/structure/disposalpipe/segment{ @@ -754,10 +647,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bx" = ( /obj/effect/decal/cleanable/cobweb, @@ -771,10 +661,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "by" = ( /obj/structure/disposalpipe/segment, @@ -788,19 +675,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bz" = ( /obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "bA" = ( /obj/effect/turf_decal/tile/red, @@ -813,18 +695,10 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bB" = ( -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bC" = ( /obj/structure/disposalpipe/junction/yjunction{ @@ -842,10 +716,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bD" = ( /obj/structure/mecha_wreckage/honker, @@ -864,21 +735,11 @@ /area/ruin/powered/clownplanet) "bF" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bH" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bI" = ( /obj/effect/mob_spawn/human/corpse/damaged, @@ -893,10 +754,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bK" = ( /obj/structure/disposalpipe/segment{ @@ -912,10 +770,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "bL" = ( /obj/item/reagent_containers/food/drinks/trophy/gold_cup, @@ -934,12 +789,7 @@ /area/ruin/powered/clownplanet) "bO" = ( /obj/effect/decal/cleanable/cobweb, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bP" = ( /obj/structure/statue/bananium/clown, @@ -981,41 +831,21 @@ /area/ruin/powered/clownplanet) "bW" = ( /obj/item/bikehorn, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bY" = ( /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood/old, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "bZ" = ( /obj/machinery/door/airlock/bananium, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "ca" = ( /obj/item/bikehorn, /obj/effect/decal/cleanable/dirt, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "cc" = ( /turf/closed/wall/r_wall, @@ -1046,10 +876,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "dC" = ( /obj/structure/disposalpipe/segment{ @@ -1069,10 +896,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "dD" = ( /obj/structure/disposalpipe/segment{ @@ -1091,10 +915,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "dE" = ( /obj/structure/disposalpipe/segment{ @@ -1114,10 +935,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "dF" = ( /obj/structure/disposalpipe/segment{ @@ -1128,9 +946,7 @@ brightness = 3; dir = 8 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "dG" = ( /obj/structure/disposalpipe/segment{ @@ -1140,9 +956,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "dH" = ( /obj/structure/disposalpipe/segment{ @@ -1151,9 +965,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/indestructible{ - icon_state = "white" - }, +/turf/open/indestructible/white, /area/ruin/powered/clownplanet) "dI" = ( /obj/machinery/light{ @@ -1169,10 +981,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "dK" = ( /obj/machinery/light/small{ @@ -1194,21 +1003,11 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "dO" = ( /obj/machinery/light, -/turf/open/indestructible/sound{ - icon_state = "bananium"; - name = "bananium floor"; - sound = 'sound/effects/clownstep1.ogg'; - wet = 16 - }, +/turf/open/indestructible/honk, /area/ruin/powered/clownplanet) "eE" = ( /obj/effect/mapping_helpers/no_lava, @@ -1258,10 +1057,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, -/turf/open/indestructible{ - icon_state = "darkfull"; - wet = 8 - }, +/turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) "KX" = ( /obj/item/grown/bananapeel{ diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 5d71aae6741..e878fe32c1e 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -4,18 +4,12 @@ var/postdig_icon_change = FALSE var/postdig_icon - var/wet var/footstep = null var/barefootstep = null var/clawfootstep = null var/heavyfootstep = null -/turf/open/ComponentInitialize() - . = ..() - if(wet) - AddComponent(/datum/component/wet_floor, wet, INFINITY, 0, INFINITY, TRUE) - //direction is direction of travel of A /turf/open/zPassIn(atom/movable/A, direction, turf/source) if(direction == DOWN) @@ -62,15 +56,33 @@ /turf/open/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE) return -/turf/open/indestructible/sound - name = "squeaky floor" +/turf/open/indestructible/white + icon_state = "white" + +/turf/open/indestructible/light + icon_state = "light_on-1" + +/turf/open/indestructible/permalube + icon_state = "darkfull" + +/turf/open/indestructible/permalube/ComponentInitialize() + . = ..() + AddComponent(/datum/component/wet_floor, TURF_WET_LUBE, INFINITY, 0, INFINITY, TRUE) + +/turf/open/indestructible/honk + name = "bananium floor" + icon_state = "bananium" footstep = null barefootstep = null clawfootstep = null heavyfootstep = null - var/sound + var/sound = 'sound/effects/clownstep1.ogg' -/turf/open/indestructible/sound/Entered(atom/movable/AM) +/turf/open/indestructible/honk/ComponentInitialize() + . = ..() + AddComponent(/datum/component/wet_floor, TURF_WET_SUPERLUBE, INFINITY, 0, INFINITY, TRUE) + +/turf/open/indestructible/honk/Entered(atom/movable/AM) ..() if(ismob(AM)) playsound(src,sound,50,TRUE)