From 1e12cae6a574e7e2defb364b013a3cb841b8d1b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 11 Aug 2019 23:45:49 -0400 Subject: [PATCH] Per Couls advice, removed the CanSuccumb verb and now borgs are considered InCritical when in low power mode --- code/modules/mob/living/living.dm | 4 +--- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9875e254a6a..57c67f5fd61 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -244,7 +244,7 @@ /mob/living/verb/succumb() set hidden = 1 - if(CanSuccumb()) + if(InCritical()) create_attack_log("[src] has ["succumbed to death"] with [round(health, 0.1)] points of health!") adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD) // super check for weird mobs, including ones that adjust hp @@ -256,8 +256,6 @@ death() to_chat(src, "You have given up life and succumbed to death.") -/mob/living/proc/CanSuccumb() - return InCritical() /mob/living/proc/InCritical() return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 621824dac98..ef35ad58954 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -576,7 +576,7 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/restrained() return 0 -/mob/living/silicon/robot/CanSuccumb() +/mob/living/silicon/robot/InCritical() return low_power_mode /mob/living/silicon/robot/ex_act(severity)