Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into the-fuck-am-i-doing

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -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"

code/modules/mob/living/silicon/ai/ai.dm

@@ -200,7 +200,7 @@
 		if(option == "Random")
 			iconstates[option] = image(icon = src.icon, icon_state = "ai-random")
 			continue
-		iconstates[option] = image(icon = src.icon, icon_state = resolve_ai_icon(option))
+		iconstates[option] = image(icon = src.icon, icon_state = resolve_ai_icon(option, radial_preview = TRUE))
 
 	view_core()
 	var/ai_core_icon = show_radial_menu(src, src , iconstates, radius = 42)

code/modules/mob/living/silicon/robot/update_icons.dm

@@ -23,13 +23,17 @@
 	if(module.cyborg_base_icon == "robot")
 		icon = 'icons/mob/robots.dmi'
 		pixel_x = initial(pixel_x)
-	if(stat != DEAD && !(IsUnconscious() ||IsStun() || IsKnockdown() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
+	if(stat != DEAD && !(IsUnconscious() || IsStun() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()
-		if(lamp_intensity > 2)
+		if(lamp_enabled || lamp_doom)
 			eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_l"
+			eye_lights.color = lamp_doom? COLOR_RED : lamp_color
+			eye_lights.plane = 19 //glowy eyes
 		else
 			eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_e[is_servant_of_ratvar(src) ? "_r" : ""]"
+			eye_lights.color = COLOR_WHITE
+			eye_lights.plane = -1
 		eye_lights.icon = icon
 		add_overlay(eye_lights)
 

code/modules/mob/living/simple_animal/hostile/bosses/boss.dm

@@ -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()
 	. = ..()