Commit Graph

6 Commits

Author SHA1 Message Date
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJay
f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
2018-01-02 04:37:36 -06:00
LetterJay
2205500863 Update idlenpcpool.dm 2017-12-18 15:15:21 -06:00
vuonojenmustaturska
8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -06:00
oranges
75753a4dfd Defines all subsystem priority values 2017-12-15 17:00:50 -06:00
vuonojenmustaturska
360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 04:57:49 -05:00