Merge pull request #589 from Citadel-Station-13/upstream-merge-26582

[MIRROR] Keeps SSnpc from sleeping
This commit is contained in:
LetterJay
2017-04-27 12:51:20 -05:00
committed by GitHub
@@ -127,9 +127,11 @@
stuttering = 0
/mob/living/simple_animal/proc/handle_automated_action()
set waitfor = FALSE
return
/mob/living/simple_animal/proc/handle_automated_movement()
set waitfor = FALSE
if(!stop_automated_movement && wander)
if((isturf(src.loc) || allow_movement_on_non_turfs) && !resting && !buckled && canmove) //This is so it only moves if it's not inside a closet, gentics machine, etc.
turns_since_move++
@@ -142,6 +144,7 @@
return 1
/mob/living/simple_animal/proc/handle_automated_speech(var/override)
set waitfor = FALSE
if(speak_chance)
if(prob(speak_chance) || override)
if(speak && speak.len)