From a3bd896c8d6662483b61d5fb1761932a71b3cef8 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Wed, 7 Jul 2021 13:40:31 -0700 Subject: [PATCH] Replaces Hardstuns with knockdown, removes Vomit stunning from Voice of God. (#60002) * Removes stuns from Voice of God. * Update voice_of_god_command.dm --- code/datums/voice_of_god_command.dm | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index 3a5b3ea9dc4..b8a3d99e41f 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -130,33 +130,14 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /datum/voice_of_god_command/proc/execute(list/listeners, mob/living/user, power_multiplier = 1, message) return -/// This command stuns the listeners. -/datum/voice_of_god_command/stun - trigger = "stop|wait|stand\\s*still|hold\\s*on|halt" - cooldown = COOLDOWN_STUN - -/datum/voice_of_god_command/stun/execute(list/listeners, mob/living/user, power_multiplier = 1, message) - // Ensure 'as anything' is not used for loops that don't target all living mob types. - for(var/mob/living/target as anything in listeners) - target.Stun(4 SECONDS * power_multiplier) - /// This command knocks the listeners down. /datum/voice_of_god_command/paralyze - trigger = "drop|fall|trip|knockdown" + trigger = "drop|fall|trip|knockdown|stop|wait|stand\\s*still|hold\\s*on|halt" cooldown = COOLDOWN_STUN /datum/voice_of_god_command/paralyze/execute(list/listeners, mob/living/user, power_multiplier = 1, message) for(var/mob/living/target as anything in listeners) - target.Paralyze(4 SECONDS * power_multiplier) - -/// This command puts carbon listeners to sleep. -/datum/voice_of_god_command/sleeping - trigger = "sleep|slumber|rest" - cooldown = COOLDOWN_STUN - -/datum/voice_of_god_command/sleeping/execute(list/listeners, mob/living/user, power_multiplier = 1, message) - for(var/mob/living/carbon/target as anything in listeners) - target.Sleeping(2 SECONDS * power_multiplier) + target.Knockdown(4 SECONDS * power_multiplier) /// This command makes carbon listeners throw up like Mr. Creosote. /datum/voice_of_god_command/vomit @@ -165,7 +146,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /datum/voice_of_god_command/vomit/execute(list/listeners, mob/living/user, power_multiplier = 1, message) for(var/mob/living/carbon/target in listeners) - target.vomit(10 * power_multiplier, distance = power_multiplier) + target.vomit(10 * power_multiplier, distance = power_multiplier, stun = FALSE) /// This command silences the listeners. Thrice as effective is the user is a mime or curator. /datum/voice_of_god_command/silence