From c5feef02df2d8745f89f48a5d66b6781f52a16bb Mon Sep 17 00:00:00 2001 From: Rohesie Date: Wed, 12 Aug 2020 23:05:13 -0300 Subject: [PATCH] Fixes a slime emote runtime (#52896) It wasn't checking the parent call return value. This is the runtime: --- code/modules/mob/living/simple_animal/slime/emote.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 2e9a1c2b4ae..5bf90156bac 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -28,9 +28,11 @@ /datum/emote/slime/mood/run_emote(mob/user, params, type_override, intentional) . = ..() - var/mob/living/simple_animal/slime/S = user - S.mood = mood - S.regenerate_icons() + if(!.) + return + var/mob/living/simple_animal/slime/slime_user = user + slime_user.mood = mood + slime_user.regenerate_icons() /datum/emote/slime/mood/sneaky key = "moodsneaky"