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
2019-10-07 23:36:11 -07:00
committed by GitHub
26 changed files with 356 additions and 152 deletions
+5
View File
@@ -346,6 +346,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))