From 91bbdfee5633ebe6e237ac48493697312365f37b Mon Sep 17 00:00:00 2001 From: A-t48 Date: Fri, 2 Sep 2016 01:14:15 -0700 Subject: [PATCH] Fixed cyborgs being able to use Power Warning emote when broken. (#20249) * Fix #19905 * Slight cleanup --- code/modules/mob/living/silicon/robot/emote.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index de797f9fe9a..bbb524a7dc7 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -236,7 +236,7 @@ else src << "Unusable emote '[act]'. Say *help for a list." - if (message && src.stat == CONSCIOUS) + if (message && stat == CONSCIOUS) log_emote("[name]/[key] : [message]") if (m_type & 1) visible_message(message) @@ -248,9 +248,10 @@ set category = "Robot Commands" set name = "Power Warning" - if(!cell || !cell.charge) - visible_message("The power warning light on [src] flashes urgently.",\ - "You announce you are operating in low power mode.") - playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) - else - src << "You can only use this emote when you're out of charge." \ No newline at end of file + if(stat == CONSCIOUS) + if(!cell || !cell.charge) + visible_message("The power warning light on [src] flashes urgently.",\ + "You announce you are operating in low power mode.") + playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) + else + src << "You can only use this emote when you're out of charge." \ No newline at end of file