Merge pull request #489 from Citadel-Station-13/upstream-merge-26319

[MIRROR] Moves simple animal automation from SSmob to SSnpc
This commit is contained in:
LetterJay
2017-04-19 18:33:18 -05:00
committed by GitHub
3 changed files with 29 additions and 18 deletions
@@ -87,6 +87,7 @@
/mob/living/simple_animal/Initialize()
..()
GLOB.simple_animals += src
handcrafting = new()
if(gender == PLURAL)
gender = pick(MALE,FEMALE)
@@ -104,18 +105,6 @@
client.screen += client.void
..()
/mob/living/simple_animal/Life()
if(..()) //alive
if(!ckey)
if(stat != DEAD)
handle_automated_movement()
if(stat != DEAD)
handle_automated_action()
if(stat != DEAD)
handle_automated_speech()
if(stat != DEAD)
return 1
/mob/living/simple_animal/updatehealth()
..()
health = Clamp(health, 0, maxHealth)
@@ -426,6 +415,7 @@
if(nest)
nest.spawned_mobs -= src
nest = null
GLOB.simple_animals -= src
return ..()