cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes emote runtimes (#39115)

Browse Source 
Fixed some missing args in emote procs called with named args, leading to
runtimes.
This commit is contained in:
vuonojenmustaturska
2018-07-14 23:20:50 +03:00
committed by Ling
parent d4787f9df8
commit 18dddfbaae
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/brain_damage/split_personality.dm
View File

@@ -142,7 +142,7 @@
to_chat(src, "<span class='warning'>You cannot speak, your other self is controlling your body!</span>") to_chat(src, "<span class='warning'>You cannot speak, your other self is controlling your body!</span>")
return FALSE return FALSE
/mob/living/split_personality/emote(message) /mob/living/split_personality/emote(act, m_type = null, message = null, intentional = FALSE)
return return
///////////////BRAINWASHING//////////////////// ///////////////BRAINWASHING////////////////////

2
code/modules/mob/camera/camera.dm
View File

@@ -28,5 +28,5 @@
/mob/camera/forceMove(atom/destination) /mob/camera/forceMove(atom/destination)
loc = destination loc = destination
/mob/camera/emote(act, m_type=1, message = null) /mob/camera/emote(act, m_type=1, message = null, intentional = FALSE)
return return

2
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -268,7 +268,7 @@
verb_say = pick(speak_emote) 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) if(stat)
return return
if(act == "scream") if(act == "scream")