From 04e9bb6814cd7e8f4f31c3b0c1b1703ff9aaacfd Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 25 Aug 2016 01:41:01 -0400 Subject: [PATCH] Simple Animals Resting Refactor --- code/modules/mob/living/simple_animal/bot/bot.dm | 1 + code/modules/mob/living/simple_animal/simple_animal.dm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 3cc10b39d42..359df7e14b7 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -853,6 +853,7 @@ Pass a positive integer as an argument to override a bot's default speed. update_controls() /mob/living/simple_animal/bot/handle_state_icons() + return /mob/living/simple_animal/bot/proc/update_icon() icon_state = "[initial(icon_state)][on]" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 816ec1979a9..4c36c091e50 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -122,15 +122,15 @@ if(1 to 5) healths.icon_state = "health6" if(0) healths.icon_state = "health7" -/mob/living/simple_animal/Life() - . = ..() - handle_state_icons() - /mob/living/simple_animal/proc/process_ai() handle_automated_movement() handle_automated_action() handle_automated_speech() +/mob/living/simple_animal/lay_down() + ..() + handle_state_icons() + /mob/living/simple_animal/proc/handle_state_icons() if(resting && icon_resting && stat != DEAD) icon_state = icon_resting