From cf0ad05b7aee64896582e8d7cb4fd2be61ef8702 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:52:09 +0200
Subject: [PATCH] [MIRROR] Felinids can no longer contract organ failure by
licking wounds (#1437)
* Felinids can no longer contract organ failure by licking wounds (#54488)
This one's a simple goof on my part. Felinids licking wounds would forcibly contract every disease the patient had, which included things like appendicitis and myocardial infarction. This fixes that by adding the same checks that being exposed to someone's blood directly runs, filtering out diseases marked as DISEASE_SPREAD_SPECIAL or DISEASE_SPREAD_NON_CONTAGIOUS
* Felinids can no longer contract organ failure by licking wounds
Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
---
code/datums/wounds/slash.dm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index 20a3220e42e..6854ae3000b 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -161,8 +161,11 @@
/// if a felinid is licking this cut to reduce bleeding
/datum/wound/slash/proc/lick_wounds(mob/living/carbon/human/user)
// transmission is one way patient -> felinid since google said cat saliva is antiseptic or whatever, and also because felinids are already risking getting beaten for this even without people suspecting they're spreading a deathvirus
- for(var/datum/disease/D in victim.diseases)
- user.ForceContractDisease(D)
+ for(var/i in victim.diseases)
+ var/datum/disease/iter_disease = i
+ if(iter_disease.spread_flags & (DISEASE_SPREAD_SPECIAL | DISEASE_SPREAD_NON_CONTAGIOUS))
+ continue
+ user.ForceContractDisease(iter_disease)
user.visible_message("[user] begins licking the wounds on [victim]'s [limb.name].", "You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim)
to_chat(victim, "[user] begins to lick the wounds on your [limb.name].