From 66440b41393b686f3fca70b31a62a6f52caf78d0 Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Fri, 7 Jul 2023 08:35:05 -0400
Subject: [PATCH] Glass floor interactions properly check if objects are above
 them for fire and blobs (#21490)

* It's used elsewhere already

* Update obj_defense.dm
---
 code/game/objects/obj_defense.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e8e38470062..0208d9b2750 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -90,7 +90,7 @@
 /obj/blob_act(obj/structure/blob/B)
 	if(isturf(loc))
 		var/turf/T = loc
-		if((T.intact && level == 1) || T.transparent_floor) //the blob doesn't destroy thing below the floor
+		if(level == 1 && (T.intact||T.transparent_floor)) //the blob doesn't destroy thing below the floor
 			return
 	take_damage(400, BRUTE, MELEE, 0, get_dir(src, B))
 
@@ -200,7 +200,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 /obj/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
 	if(isturf(loc))
 		var/turf/T = loc
-		if((T.intact && level == 1) || T.transparent_floor) //fire can't damage things hidden below the floor.
+		if(level == 1 && (T.intact||T.transparent_floor)) //fire can't damage things hidden below the floor.
 			return
 	..()
 	if(QDELETED(src))  // Some items, like patches, might get qdeled in the parent call