From 2338f75116281c4f231249543eed22c535e2eba5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:23:24 -0500 Subject: [PATCH] Removes Rest from Voice of God --- code/modules/surgery/organs/vocal_cords.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 2413a45870..a2048c2b71 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -175,7 +175,7 @@ var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt") var/static/regex/weaken_words = regex("drop|fall|trip|weaken") - var/static/regex/sleep_words = regex("sleep|slumber") + var/static/regex/sleep_words = regex("sleep|slumber|rest") var/static/regex/vomit_words = regex("vomit|throw up") var/static/regex/silence_words = regex("shut up|silence|ssh|quiet|hush") var/static/regex/hallucinate_words = regex("see the truth|hallucinate") @@ -206,7 +206,6 @@ var/static/regex/throwmode_words = regex("throw|catch") var/static/regex/flip_words = regex("flip|rotate|revolve|roll|somersault") var/static/regex/speak_words = regex("speak|say something") - var/static/regex/rest_words = regex("rest") var/static/regex/getup_words = regex("get up") var/static/regex/sit_words = regex("sit") var/static/regex/stand_words = regex("stand") @@ -443,17 +442,9 @@ L.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")) sleep(5) //So the chat flows more naturally - //REST - else if((findtext(message, rest_words))) - cooldown = COOLDOWN_MEME - for(var/V in listeners) - var/mob/living/L = V - if(!L.resting) - L.lay_down() - //GET UP else if((findtext(message, getup_words))) - cooldown = COOLDOWN_DAMAGE + cooldown = COOLDOWN_DAMAGE //because stun removal for(var/V in listeners) var/mob/living/L = V if(L.resting)