Merge pull request #6721 from Citadel-Station-13/upstream-merge-37752

[MIRROR] (NOT TESTED YET) Fixes Bedbuckling to avoid Floor is Lava
2018-05-13 03:30:15 -05:00
parent 65fd97000c 260958e7ae
commit c1bbdd2f65
1 changed files with 3 additions and 1 deletions
--- 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