From e8805454256ed95c77068c6054b1e6dae978fe45 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 10 Oct 2017 15:41:33 +0200 Subject: [PATCH 1/2] Fixes emote runtimes (#31498) * Emote runtime * Bleh didn't add all --- code/modules/mob/living/brain/emote.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 4 ++-- code/modules/mob/living/emote.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/brain/emote.dm b/code/modules/mob/living/brain/emote.dm index aaee807402..a2182c605a 100644 --- a/code/modules/mob/living/brain/emote.dm +++ b/code/modules/mob/living/brain/emote.dm @@ -2,7 +2,7 @@ mob_type_allowed_typecache = list(/mob/living/brain) mob_type_blacklist_typecache = list() -/datum/emote/brain/can_run_emote(mob/user) +/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE) . = ..() var/mob/living/brain/B = user if(!istype(B) || (!(B.container && istype(B.container, /obj/item/device/mmi)))) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 6fb2ab25f5..89a30f0733 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -80,7 +80,7 @@ else H.endTailWag() -/datum/emote/living/carbon/human/wag/can_run_emote(mob/user) +/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE) if(!..()) return FALSE var/mob/living/carbon/human/H = user @@ -115,7 +115,7 @@ else . = "closes " + message -/datum/emote/living/carbon/human/wing/can_run_emote(mob/user) +/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE) if(!..()) return FALSE var/mob/living/carbon/human/H = user diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index bbe02a3f8e..7cb283bd17 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -220,7 +220,7 @@ message = "laughs." emote_type = EMOTE_AUDIBLE -/datum/emote/living/laugh/can_run_emote(mob/living/user) +/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE) . = ..() if(. && iscarbon(user)) var/mob/living/carbon/C = user