From 4255a22697eb6fea44ae344f156f6bbfa10aee85 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 2 Mar 2019 23:53:05 -0600 Subject: [PATCH 1/3] Removes Mime insulting --- modular_citadel/code/modules/mob/cit_emotes.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 6d6bc77b0b..b68e67f83d 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -15,9 +15,11 @@ /datum/emote/living/insult/run_emote(mob/living/user, params) var/insult_message = "" - if(!user.is_muzzled()) + if(!user.is_muzzled() && !miming) insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen") message = insult_message + if(miming) + message = "creatively gesticulates." else message = "muffles something." . = ..() @@ -224,4 +226,4 @@ return user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/merp.ogg', 50, 1, -1) - . = ..() \ No newline at end of file + . = ..() From 02d7dc4f7f13684b6b0188c89cbedfda4ea82e13 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 3 Mar 2019 00:24:38 -0600 Subject: [PATCH 2/3] oh right that's a snowflake var --- modular_citadel/code/modules/mob/cit_emotes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index b68e67f83d..19a22cae3d 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -15,6 +15,7 @@ /datum/emote/living/insult/run_emote(mob/living/user, params) var/insult_message = "" + var/miming = user.mind ? user.mind.miming : 0 if(!user.is_muzzled() && !miming) insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen") message = insult_message From 943cc7d969b30bb334a4da74b0523c5a1ef3fac8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Mar 2019 00:30:06 -0600 Subject: [PATCH 3/3] Apply suggestions from code review Co-Authored-By: Poojawa --- modular_citadel/code/modules/mob/cit_emotes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 19a22cae3d..a314baa852 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -16,10 +16,10 @@ /datum/emote/living/insult/run_emote(mob/living/user, params) var/insult_message = "" var/miming = user.mind ? user.mind.miming : 0 - if(!user.is_muzzled() && !miming) + if(!user.is_muzzled()) insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen") message = insult_message - if(miming) + else if(miming) message = "creatively gesticulates." else message = "muffles something."