Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498

[MIRROR] Fixes emote runtimes
This commit is contained in:
LetterJay
2017-10-10 22:28:14 -04:00
committed by GitHub
3 changed files with 4 additions and 4 deletions

View File

@@ -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))))

View File

@@ -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

View File

@@ -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