From aa0481ff3460247f32f35787fcdef6a256f7141e Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 4 Apr 2019 22:04:47 +0200 Subject: [PATCH 1/2] Mobs now stand up if pinned new simple_animal variable "norest" If set to 1 the mob will automatically stop resting at the start of the life cycle. For any mob that should be allowed to rest simply add a `norest = 0` into their files, this fixes retaliate mob combat. --- code/modules/mob/living/simple_animal/simple_animal.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 63592759d6..6f223bffa6 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -75,6 +75,8 @@ var/recruit_cmd_str = "Hey," // The thing you prefix commands with when bossing them around var/intelligence_level = SA_ANIMAL// How 'smart' the mob is ICly, used to deliniate between animal, robot, and humanoid SAs. + var/norest = 1 //mob will automatically unrest if not player controlled. + //Mob environment settings var/minbodytemp = 250 // Minimum "okay" temperature in kelvin var/maxbodytemp = 350 // Maximum of above @@ -359,7 +361,13 @@ if(life_disabled) return 0 //VOREStation Edit End - + + //CHOMPSTATION edit + if(resting && !client && norest) + resting = !resting + update_icon() + //CHOMPSTATION EDIT END + ..() //Health From 38341510f939081ae55027c81b2cf02638cd6649 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 4 Apr 2019 22:33:06 +0200 Subject: [PATCH 2/2] Update simple_animal.dm --- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 6f223bffa6..a5ca54d002 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -75,7 +75,7 @@ var/recruit_cmd_str = "Hey," // The thing you prefix commands with when bossing them around var/intelligence_level = SA_ANIMAL// How 'smart' the mob is ICly, used to deliniate between animal, robot, and humanoid SAs. - var/norest = 1 //mob will automatically unrest if not player controlled. + var/noresting = 1 //mob will automatically unrest if not player controlled. //Mob environment settings var/minbodytemp = 250 // Minimum "okay" temperature in kelvin @@ -363,7 +363,7 @@ //VOREStation Edit End //CHOMPSTATION edit - if(resting && !client && norest) + if(resting && !client && noresting) resting = !resting update_icon() //CHOMPSTATION EDIT END