Merge pull request #11844 from JKnutson101/cyborgSuccumbBranch

Gave Cyborgs with 0 battery left the ability to succumb.
This commit is contained in:
variableundefined
2019-08-14 23:25:16 +08:00
committed by GitHub
3 changed files with 6 additions and 1 deletions
+2
View File
@@ -256,8 +256,10 @@
death()
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
/mob/living/proc/InCritical()
return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS)
/mob/living/ex_act(severity)
..()
@@ -576,6 +576,8 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/restrained()
return 0
/mob/living/silicon/robot/InCritical()
return low_power_mode
/mob/living/silicon/robot/ex_act(severity)
switch(severity)
+2 -1
View File
@@ -337,4 +337,5 @@
/////////////////////////////////// EAR DAMAGE ////////////////////////////////////
/mob/living/silicon/can_hear()
. = TRUE
. = TRUE