From ff21e5d786fd6e92da8fbd51b91c4c18a67ba742 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 27 Mar 2017 17:50:42 -0500 Subject: [PATCH] FBPs should no longer scream when they collapse --- code/modules/organs/organ.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 30a80b6599..6250bcae6c 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -373,4 +373,10 @@ var/list/organ_cache = list() return /obj/item/organ/proc/can_feel_pain() - return !(robotic >= (ORGAN_ROBOT|ORGAN_DESTROYED)) && !(species.flags & NO_PAIN) + if(species.flags & NO_PAIN) + return 0 + if(status & ORGAN_DESTROYED) + return 0 + if(robotic && robotic < ORGAN_LIFELIKE) //Super fancy humanlike robotics probably have sensors, or something? + return 0 + return 1 \ No newline at end of file