From 0df9db51f34514569c811209c3ffc3585db75b00 Mon Sep 17 00:00:00 2001
From: ExcessiveUseOfCobblestone
 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Date: Sun, 3 Dec 2017 14:16:34 -0500
Subject: [PATCH] Being buckled to a bed now saves you from "the floor is lava"
 (#33204)

* Update floor_is_lava.dm

* Switcheroo

* )))))))))))))
---
 code/datums/weather/weather_types/floor_is_lava.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
index 52f82abec9..cf9fa0da86 100644
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -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