From 594ff5754900a0641242b80b263eb9951f8977d0 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:50:24 -0400
Subject: [PATCH] Non fulltile windows don't get blood on them, spacecleaner
 cleans blood more reliably (#26886)

---
 code/game/objects/effects/decals/Cleanable/humans.dm | 2 +-
 code/modules/reagents/chemistry/reagents/water.dm    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 1e93d42a104..152ce009b9e 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -55,7 +55,7 @@
 	var/turf/T = get_turf(src)
 	check_gravity(T)
 
-	if((T && (T.density)) || !gravity_check || locate(/obj/structure/window/) in T || locate(/obj/structure/grille/) in T)
+	if(!istype(src, /obj/effect/decal/cleanable/blood/footprints) && ((T && (T.density)) || !gravity_check || locate(/obj/structure/window/full) in T || locate(/obj/structure/grille/) in T))
 		off_floor = TRUE
 		layer = ABOVE_MOB_LAYER
 		plane = GAME_PLANE
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 9c5388ac929..83956eb56c9 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -61,9 +61,7 @@
 	if(iseffect(O))
 		var/obj/effect/E = O
 		if(E.is_cleanable())
-			var/obj/effect/decal/cleanable/blood/B = E
-			if(!(istype(B) && B.off_floor))
-				qdel(E)
+			qdel(E)
 	else
 		if(O.simulated)
 			O.color = initial(O.color)