From 023f93f734f1acabdfe54e7fea05ea66d3a69ac3 Mon Sep 17 00:00:00 2001 From: Grandmother of 50 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Date: Sat, 12 May 2018 18:43:35 -0400 Subject: [PATCH 1/2] Fixes Bedbuckling to avoid Floor is Lava (#37752) * Update floor_is_lava.dm * Pulls the check out of the loop. --- code/datums/weather/weather_types/floor_is_lava.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm index 5db27b9f6e..00ecfff0b3 100644 --- a/code/datums/weather/weather_types/floor_is_lava.dm +++ b/code/datums/weather/weather_types/floor_is_lava.dm @@ -25,8 +25,10 @@ /datum/weather/floor_is_lava/weather_act(mob/living/L) if(issilicon(L)) return + if(istype(L.buckled, /obj/structure/bed)) + return for(var/obj/structure/O in L.loc) - if(O.density || (L in O.buckled_mobs && istype(O, /obj/structure/bed))) + if(O.density) return if(L.loc.density) return