Merge branch 'master' into void-but-for-real

This commit is contained in:
kiwedespars
2021-03-12 23:58:49 -08:00
18 changed files with 138 additions and 34 deletions
@@ -11,7 +11,7 @@
var/datum/boss_active_timed_battle/atb
var/point_regen_delay = 20
var/point_regen_amount = 1
sentience_type = SENTIENCE_BOSS
/mob/living/simple_animal/hostile/boss/Initialize()
. = ..()