shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update living.dm

Browse Source
This commit is contained in:
deathride58
2018-04-15 22:46:55 -04:00
committed by GitHub
parent bc8c97d6c4
commit 8110227bc3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
-5
View File
@@ -339,13 +339,8 @@
death()
/mob/living/incapacitated(ignore_restraints, ignore_grab)
<<<<<<< HEAD
if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
return 1
=======
if(stat || IsUnconscious() || IsStun() || IsKnockdown() || (!ignore_restraints && restrained(ignore_grab)))
return TRUE
>>>>>>> fbdbd51... Adds an period to point messages (#37113)
/mob/living/proc/InCritical()
return (health <= HEALTH_THRESHOLD_CRIT && (stat == SOFT_CRIT || stat == UNCONSCIOUS))