From 042ea5ea63d3dee0ebb625b8df599450088351da Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sat, 14 Jul 2018 23:20:50 +0300 Subject: [PATCH] Fixes emote runtimes (#39115) Fixed some missing args in emote procs called with named args, leading to runtimes. --- code/datums/brain_damage/split_personality.dm | 2 +- code/modules/mob/camera/camera.dm | 2 +- code/modules/mob/living/simple_animal/simple_animal.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index a1f6ff15fb1..337926ce6b3 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -142,7 +142,7 @@ to_chat(src, "You cannot speak, your other self is controlling your body!") return FALSE -/mob/living/split_personality/emote(message) +/mob/living/split_personality/emote(act, m_type = null, message = null, intentional = FALSE) return ///////////////BRAINWASHING//////////////////// diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm index 5f99cd8aa26..883f5a034f1 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -28,5 +28,5 @@ /mob/camera/forceMove(atom/destination) loc = destination -/mob/camera/emote(act, m_type=1, message = null) +/mob/camera/emote(act, m_type=1, message = null, intentional = FALSE) return diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index fcc506375a3..4a2fda17043 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -268,7 +268,7 @@ verb_say = pick(speak_emote) . = ..() -/mob/living/simple_animal/emote(act, m_type=1, message = null) +/mob/living/simple_animal/emote(act, m_type=1, message = null, intentional = FALSE) if(stat) return if(act == "scream")