cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3158 from Anewbe/fbp_screams

Browse Source 
FBPs should no longer scream when they collapse
This commit is contained in:
MagmaRam
2017-03-28 20:03:01 -05:00
committed by GitHub
parent 9ff0180315 73ab115295
commit 2f976a22f8
9 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/organs/organ.dm
View File

@@ -372,5 +372,11 @@ var/list/organ_cache = list()
bitten(user)
return
/obj/item/organ/proc/can_feel_pain()
return !(robotic >= (ORGAN_ROBOT|ORGAN_DESTROYED)) && !(species.flags & NO_PAIN)
/obj/item/organ/proc/organ_can_feel_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