Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498
[MIRROR] Fixes emote runtimes
This commit is contained in:
@@ -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))))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user