From 0ba5e1a3dcbf1c476f06599e1e64c1beb37ae694 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 6 Jul 2014 02:34:49 -0400 Subject: [PATCH] Fixes dionaea getting infections --- code/modules/organs/organ_external.dm | 2 +- code/modules/organs/organ_internal.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index d460cfe642d..b2090af49b8 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -359,7 +359,7 @@ player's body, though, antitox and spaceacillin are easy enough to get I doubt i */ /datum/organ/external/proc/update_germs() - if(status & (ORGAN_ROBOT|ORGAN_DESTROYED)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. + if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. germ_level = 0 return diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 6269d4471b4..7e8e58932c1 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -38,7 +38,7 @@ if (!germ_level) return - if (robotic >= 2) //TODO make robotic internal and external organs separate types of organ instead of a flag + if (robotic >= 2 || (owner.species && owner.species.flags & IS_PLANT)) //TODO make robotic internal and external organs separate types of organ instead of a flag germ_level = 0 return