Merge pull request #4200 from Citadel-Station-13/upstream-merge-33204

[MIRROR] Being buckled to a bed now saves you from "the floor is lava"
2017-12-03 23:29:42 +00:00
parent fc132ff72a a19fea11bd
commit e42fa29e96
1 changed files with 3 additions and 2 deletions
@@ -20,10 +20,11 @@

 	overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
 	immunity_type = "lava"
+	

 /datum/weather/floor_is_lava/weather_act(mob/living/L)
-	for(var/obj/structure/O in L.loc)
-		if(O.density)
+	for(var/obj/structure/O in L.loc)			
+		if(O.density || (L in O.buckled_mobs && istype(O, /obj/structure/bed)))
 			return
 	if(L.loc.density)
 		return