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

2021-03-12 23:58:49 -08:00
parent 69d927e756 aaf9ebd85a
commit 8f1715704d
18 changed files with 138 additions and 34 deletions
@@ -477,6 +477,10 @@
 	name = "Messy"
 	icon_state = "hair_messy"

+/datum/sprite_accessory/hair/messy2
+	name = "Messy2"
+	icon_state = "hair_messy2"
+
 /datum/sprite_accessory/hair/modern
 	name = "Modern"
 	icon_state = "hair_modern"
@@ -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()
 	. = ..()