From d1ae6b275c26113f2f47afca19a4669f5fd68fd9 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Mon, 20 Jul 2015 09:14:06 +0200 Subject: [PATCH 1/2] Fixes #10244. Adds a return statement. --- code/modules/mob/living/silicon/robot/custom_sprites.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/silicon/robot/custom_sprites.dm b/code/modules/mob/living/silicon/robot/custom_sprites.dm index b738787d007..ee4d9905e93 100644 --- a/code/modules/mob/living/silicon/robot/custom_sprites.dm +++ b/code/modules/mob/living/silicon/robot/custom_sprites.dm @@ -19,6 +19,7 @@ var/list/robot_custom_icons var/real_name = copytext(line, split_idx+1) robot_custom_icons[ckey] = real_name + return 1 /mob/living/silicon/robot/proc/set_custom_sprite() var/rname = robot_custom_icons[ckey] From 83cc80b34162dc33da3668589ce856deb24c6bd1 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 20 Jul 2015 17:01:29 +0300 Subject: [PATCH 2/2] Fixes #9719 - dead goats retaliate Goats now only produce a message if they are alive --- code/modules/mob/living/simple_animal/friendly/farm_animals.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 6a9eb67ecaa..289a9fffff5 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -62,7 +62,8 @@ /mob/living/simple_animal/hostile/retaliate/goat/Retaliate() ..() - src.visible_message("\red [src] gets an evil-looking gleam in their eye.") + if(stat == CONSCIOUS) + visible_message("[src] gets an evil-looking gleam in their eye.") /mob/living/simple_animal/hostile/retaliate/goat/Move() ..()