From bd4458bc86b0786adeb3597449585f9fcb35d878 Mon Sep 17 00:00:00 2001 From: IK3I Date: Thu, 20 Apr 2017 18:04:30 -0500 Subject: [PATCH 1/3] Fixes #7124 and improves on it Adds an emote CD for flipping Adds a new emote for all the flips! --- .../mob/living/carbon/alien/humanoid/emote.dm | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 05eb2c8e226..95729c84625 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -8,8 +8,23 @@ // if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_' // act = copytext(act,1,length(act)) //seriously who the fuck wrote this var/muzzled = is_muzzled() + + var/on_CD = 0 act = lowertext(act) + + //cooldown system handled by /code/modules/mob/emotes.dm switch(act) + if("flip") + on_CD = handle_emote_CD() + + + if(on_CD) + return + + switch(act) + + + if("sign") if(!restrained()) var/num = null @@ -104,8 +119,14 @@ m_type = 1 message = "\The [src] does a flip!" src.SpinAnimation(5,1) + if("superflip") + m_type = 1 + message = "The [src] starts flipping!" + src.reagents.add_reagent("fliptonium", 100) + if("laugh") + return //deals with the fliptonium issue if("help") - to_chat(src, "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper") + to_chat(src, "burp, flip, superflip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper") if(!stat) if(act == "roar") From 9f7245fdf194caaba51c50eecac406468feb5048 Mon Sep 17 00:00:00 2001 From: IK3I Date: Thu, 20 Apr 2017 18:53:55 -0500 Subject: [PATCH 2/3] Fixes an oversight for potential abuse --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 95729c84625..d65578eabfc 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -16,6 +16,8 @@ switch(act) if("flip") on_CD = handle_emote_CD() + if("superflip") + on_CD = handle_emote_CD(100) if(on_CD) @@ -121,8 +123,8 @@ src.SpinAnimation(5,1) if("superflip") m_type = 1 - message = "The [src] starts flipping!" - src.reagents.add_reagent("fliptonium", 100) + message = "The [src] gets ready to flip into oblivion!" + src.reagents.add_reagent("fliptonium", 1) if("laugh") return //deals with the fliptonium issue if("help") From 55e9de4954ff0856e1eeb19419dd47a446b5c049 Mon Sep 17 00:00:00 2001 From: IK3I Date: Thu, 20 Apr 2017 18:53:55 -0500 Subject: [PATCH 3/3] Fixes an oversight for potential abuse --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 95729c84625..112277a89fb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -16,6 +16,8 @@ switch(act) if("flip") on_CD = handle_emote_CD() + if("superflip") + on_CD = handle_emote_CD(100) if(on_CD) @@ -121,8 +123,8 @@ src.SpinAnimation(5,1) if("superflip") m_type = 1 - message = "The [src] starts flipping!" - src.reagents.add_reagent("fliptonium", 100) + message = "The [src] gets ready to flip into oblivion!" + reagents.add_reagent("fliptonium", 1) if("laugh") return //deals with the fliptonium issue if("help")