Merge pull request #9418 from Ghommie/Ghommie-cit216

Porting a load of viro, (sentient) disease, symptoms code updates from tg.
This commit is contained in:
kevinz000
2020-11-03 01:51:18 -03:00
committed by Dip
parent c7bc366210
commit 752a3d9bcc
26 changed files with 357 additions and 146 deletions
+5
View File
@@ -373,6 +373,11 @@
if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
return TRUE
/mob/living/canUseStorage()
if (get_num_arms() <= 0)
return FALSE
return TRUE
/mob/living/proc/InCritical()
return (health <= crit_threshold && (stat == SOFT_CRIT || stat == UNCONSCIOUS))