From 29d7ced2626b129e4b7843aca8ca5cc2bcf9f913 Mon Sep 17 00:00:00 2001
From: Guti <32563288+TheCaramelion@users.noreply.github.com>
Date: Sat, 28 Dec 2024 00:40:11 +0100
Subject: [PATCH] fix (#16767)

---
 code/game/objects/effects/decals/Cleanable/humans.dm | 12 ++++--------
 code/modules/mob/living/living.dm                    |  4 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 41f075817b3..2a99e8c2bca 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -275,25 +275,21 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/mucus/Crossed(mob/living/carbon/human/perp)
 	if(viruses)
 		for(var/datum/disease/D in viruses)
-			if(D.IsSpreadByTouch())
-				perp.ContractDisease(D)
+			perp.ContractDisease(D)
 
 /obj/effect/decal/cleanable/mucus/attack_hand(mob/living/carbon/human/perp)
 	if(viruses)
 		for(var/datum/disease/D in viruses)
-			if(D.IsSpreadByTouch())
-				perp.ContractDisease(D)
+			perp.ContractDisease(D)
 
 /obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
 	if(viruses)
 		for(var/datum/disease/D in viruses)
-			if(D.IsSpreadByTouch())
-				perp.ContractDisease(D)
+			perp.ContractDisease(D)
 
 /obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
 	if(viruses)
 		for(var/datum/disease/D in viruses)
-			if(D.IsSpreadByTouch())
-				perp.ContractDisease(D)
+			perp.ContractDisease(D)
 
 #undef DRYING_TIME
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7dd65aca0ec..e2e3b10d2f0 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -675,7 +675,9 @@
 	sdisabilities = 0
 	disabilities = 0
 	resting = FALSE
-	viruses.Cut()
+
+	if(viruses)
+		viruses.Cut()
 
 	// fix blindness and deafness
 	blinded = 0