shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14206 from Citadel-Station-13/silicons-patch-10

Browse Source 
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
This commit is contained in:
DeltaFire
2021-02-11 04:32:37 +01:00
committed by GitHub
parent c0c0455a6e b1ce9a9618
commit 7259f53160
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/surgery/organs/vocal_cords.dm
View File

@@ -1,4 +1,5 @@
#define COOLDOWN_STUN 1200
#define COOLDOWN_KNOCKDOWN 600
#define COOLDOWN_DAMAGE 600
#define COOLDOWN_MEME 300
#define COOLDOWN_NONE 100
@@ -213,7 +214,6 @@
var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
var/static/regex/knockdown_words = regex("drop|fall|trip|knockdown")
var/static/regex/sleep_words = regex("sleep|slumber|rest")
var/static/regex/vomit_words = regex("vomit|throw up|sick")
var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush")
var/static/regex/hallucinate_words = regex("see the truth|hallucinate")
@@ -264,26 +264,20 @@
cooldown = COOLDOWN_STUN
for(var/V in listeners)
var/mob/living/L = V
L.Stun(60 * power_multiplier)
L.Stagger(60 * power_multiplier)
//KNOCKDOWN
else if(findtext(message, knockdown_words))
cooldown = COOLDOWN_STUN
cooldown = COOLDOWN_KNOCKDOWN
for(var/V in listeners)
var/mob/living/L = V
L.DefaultCombatKnockdown(60 * power_multiplier)
//SLEEP
else if((findtext(message, sleep_words)))
cooldown = COOLDOWN_STUN
for(var/mob/living/carbon/C in listeners)
C.Sleeping(40 * power_multiplier)
L.DefaultCombatKnockdown()
//VOMIT
else if((findtext(message, vomit_words)))
cooldown = COOLDOWN_STUN
cooldown = COOLDOWN_DAMAGE
for(var/mob/living/carbon/C in listeners)
C.vomit(10 * power_multiplier, distance = power_multiplier)
C.vomit(10 * power_multiplier, distance = power_multiplier, stun = FALSE)
//SILENCE
else if((findtext(message, silence_words)))