diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 408e3bea3c8..eb80a439fd2 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -44,7 +44,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ag" = ( /obj/effect/mob_spawn/human/corpse/damaged, @@ -62,7 +62,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ah" = ( /obj/effect/turf_decal/tile/yellow, @@ -79,7 +79,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ai" = ( /obj/structure/disposalpipe/sortjunction{ @@ -102,7 +102,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ak" = ( /obj/structure/disposalpipe/segment{ @@ -121,7 +121,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "al" = ( /obj/effect/decal/cleanable/dirt, @@ -139,7 +139,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "am" = ( /obj/structure/disposalpipe/segment{ @@ -157,7 +157,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "an" = ( /obj/structure/disposalpipe/segment{ @@ -174,7 +174,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ao" = ( /obj/structure/window/reinforced, @@ -199,7 +199,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aq" = ( /obj/structure/disposalpipe/trunk, @@ -219,7 +219,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "as" = ( /obj/effect/decal/cleanable/dirt, @@ -233,7 +233,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "at" = ( /obj/structure/disposalpipe/segment{ @@ -251,7 +251,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "au" = ( /obj/structure/disposalpipe/segment{ @@ -274,7 +274,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aw" = ( /obj/machinery/light/small{ @@ -290,24 +290,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/ruin/powered/clownplanet) -"ax" = ( -/obj/effect/decal/cleanable/pie_smudge, -/obj/structure/disposalpipe/segment{ - invisibility = 101 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "ay" = ( /obj/effect/decal/cleanable/dirt, @@ -325,7 +308,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "az" = ( /obj/item/bikehorn, @@ -343,7 +326,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aA" = ( /obj/structure/disposalpipe/segment{ @@ -368,7 +351,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aC" = ( /obj/effect/turf_decal/tile/yellow, @@ -385,7 +368,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aD" = ( /obj/item/bikehorn, @@ -403,7 +386,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aE" = ( /obj/structure/disposalpipe/segment{ @@ -427,7 +410,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aG" = ( /obj/machinery/light/small{ @@ -447,7 +430,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aH" = ( /obj/effect/decal/cleanable/dirt, @@ -468,7 +451,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aI" = ( /obj/item/bikehorn, @@ -486,7 +469,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aJ" = ( /obj/item/bikehorn, @@ -503,7 +486,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aK" = ( /obj/structure/disposalpipe/segment{ @@ -541,7 +524,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aN" = ( /obj/structure/disposalpipe/segment{ @@ -569,7 +552,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aP" = ( /obj/structure/disposalpipe/segment{ @@ -619,7 +602,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aT" = ( /obj/structure/disposalpipe/segment{ @@ -785,7 +768,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bk" = ( /obj/structure/disposalpipe/segment{ @@ -810,7 +793,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bm" = ( /obj/structure/disposalpipe/segment{ @@ -848,7 +831,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bp" = ( /obj/effect/decal/cleanable/pie_smudge, @@ -862,7 +845,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bq" = ( /obj/machinery/disposal/deliveryChute{ @@ -919,7 +902,7 @@ dir = 1; icon_state = "pipe-y" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bu" = ( /obj/effect/decal/cleanable/blood/oil, @@ -942,7 +925,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bw" = ( /obj/effect/turf_decal/tile/red, @@ -974,7 +957,7 @@ dir = 4 }, /obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "by" = ( /obj/structure/table/glass, @@ -982,7 +965,7 @@ /turf/simulated/floor/carpet, /area/ruin/powered/clownplanet) "bB" = ( -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bD" = ( /obj/effect/decal/mecha_wreckage/honker, @@ -994,7 +977,7 @@ /area/ruin/powered/clownplanet) "bH" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bL" = ( /obj/item/reagent_containers/food/drinks/trophy/gold_cup, @@ -1013,7 +996,7 @@ /area/ruin/powered/clownplanet) "bO" = ( /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bP" = ( /obj/structure/statue/bananium/clown, @@ -1050,21 +1033,21 @@ /area/ruin/powered/clownplanet) "bW" = ( /obj/item/bikehorn, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bY" = ( /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood/old, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bZ" = ( /obj/machinery/door/airlock/bananium, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "ca" = ( /obj/item/bikehorn, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "cc" = ( /turf/simulated/wall/r_wall, @@ -1098,11 +1081,11 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "dO" = ( /obj/machinery/light, -/turf/simulated/floor/mineral/bananium, +/turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "eX" = ( /obj/effect/mapping_helpers/no_lava, @@ -1680,7 +1663,7 @@ ch af aF ch -ax +aj af ay as diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 439cf9fa36b..d93ae62cfa3 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -195,9 +195,7 @@ /turf/simulated/floor/plating/asteroid/snow/atmosphere, /area/ruin/powered/snow_biodome) "bl" = ( -/turf/simulated/floor/wood/asteroid{ - name = "bridge" - }, +/turf/simulated/floor/wood/cold, /area/ruin/powered/snow_biodome) "bv" = ( /obj/machinery/light{ @@ -209,13 +207,13 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/wood/asteroid, +/turf/simulated/floor/wood, /area/ruin/powered/snow_biodome) "bx" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood/asteroid, +/turf/simulated/floor/wood, /area/ruin/powered/snow_biodome) "by" = ( /obj/machinery/light{ @@ -225,7 +223,7 @@ /area/ruin/powered/snow_biodome) "bz" = ( /obj/machinery/light, -/turf/simulated/floor/wood/asteroid, +/turf/simulated/floor/wood, /area/ruin/powered/snow_biodome) "bB" = ( /obj/machinery/light{ diff --git a/code/game/turfs/simulated/floor/asteroid.dm b/code/game/turfs/simulated/floor/asteroid.dm index eaf150bbbc8..04ac165fc56 100644 --- a/code/game/turfs/simulated/floor/asteroid.dm +++ b/code/game/turfs/simulated/floor/asteroid.dm @@ -327,4 +327,5 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me /turf/simulated/floor/plating/asteroid/snow/atmosphere oxygen = 22 - nitrogen = 82 \ No newline at end of file + nitrogen = 82 + temperature = 180 \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 470dcb16aed..b326f93fe27 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -53,7 +53,7 @@ to_chat(user, "You forcefully pry off the planks, destroying them in the process.") return make_plating() -/turf/simulated/floor/wood/asteroid +/turf/simulated/floor/wood/cold oxygen = 22 nitrogen = 82 temperature = 180 diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index a801fd450c5..2abc0a0c8d5 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -173,6 +173,14 @@ nitrogen = 0.01 temperature = TCMB + +/turf/simulated/floor/mineral/bananium/lubed/Initialize(mapload) + . = ..() + MakeSlippery(TURF_WET_LUBE, TRUE) + +/turf/simulated/floor/mineral/bananium/lubed/pry_tile() //I want to get off Mr Honk's Wild Ride + return + //TRANQUILLITE /turf/simulated/floor/mineral/tranquillite name = "silent floor" diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 1384cb1e4bf..7b6958e81cc 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -112,6 +112,14 @@ nitrogen = 23 temperature = 300 +/turf/simulated/floor/lubed + name = "slippery floor" + icon_state = "floor" + +/turf/simulated/floor/lubed/Initialize(mapload) + . = ..() + MakeSlippery(TURF_WET_LUBE, TRUE) + //Clockwork floor: Slowly heals toxin damage on nearby servants. /turf/simulated/floor/clockwork name = "clockwork floor" diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 3d43b954dac..819f6a07ef3 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -7,7 +7,7 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") burnt_states = list("floorscorched1", "floorscorched2") - var/unfastened = FALSE + var/unfastened = FALSE footstep_sounds = list( "human" = list('sound/effects/footstep/plating_human.ogg'), @@ -349,7 +349,7 @@ smooth = SMOOTH_TRUE canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice) -/turf/simulated/floor/plating/ice/Initialize() +/turf/simulated/floor/plating/ice/Initialize(mapload) . = ..() MakeSlippery(TURF_WET_PERMAFROST, TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index e94d50190f8..011c47b2c24 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -26,6 +26,7 @@ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE faction = list("skeleton") see_in_dark = 8 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE deathmessage = "collapses into a pile of bones!" del_on_death = TRUE loot = list(/obj/effect/decal/remains/human) diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index eacb4367d74..eb80e41a87f 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ