From 0afe576633db5963dee3fe6a7b747f3ef13cef6c Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 14 Feb 2018 22:30:02 -0600 Subject: [PATCH] POLARIS: Don't require hostile=1 on silly things Like cats, just to get them to hunt mice. --- code/modules/mob/living/simple_animal/animals/cat.dm | 1 - code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/cat.dm b/code/modules/mob/living/simple_animal/animals/cat.dm index fa5915c33d8..1f0c9c6d26b 100644 --- a/code/modules/mob/living/simple_animal/animals/cat.dm +++ b/code/modules/mob/living/simple_animal/animals/cat.dm @@ -9,7 +9,6 @@ icon_dead = "cat2_dead" icon_rest = "cat2_rest" - hostile = 1 //To mice, anyway. investigates = 1 specific_targets = 1 //Only targets with Found() run_at_them = 0 //DOMESTICATED diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 42f5f4b5352..2ab844203cf 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -545,7 +545,7 @@ stop_automated_movement = 0 //Search for targets while idle - if(hostile) + if(hostile || specific_targets) FindTarget() if(STANCE_FOLLOW) annoyed = 15 @@ -553,7 +553,7 @@ if(follow_until_time && world.time > follow_until_time) LoseFollow() return - if(hostile) + if(hostile || specific_targets) FindTarget() if(STANCE_ATTACK) annoyed = 50