Merge remote-tracking branch 'skrat/master' into upstream-nov-19-2023

# Conflicts:
#	_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
#	code/modules/mob/living/simple_animal/guardian/guardian.dm
#	html/changelogs/archive/2023-11.yml
#	modular_skyrat/master_files/code/datums/traits/neutral.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	modular_skyrat/modules/mold/code/mold.dm
#	modular_skyrat/modules/mold/code/mold_mobs.dm

code/modules/mob_spawn/corpses/mob_corpses.dm

@@ -221,6 +221,21 @@
 	facial_haircolor = COLOR_WHITE
 	skin_tone = "caucasian1"
 
+/obj/effect/mob_spawn/corpse/human/wizard/red
+	outfit = /datum/outfit/wizardcorpse/red
+
+/obj/effect/mob_spawn/corpse/human/wizard/yellow
+	outfit = /datum/outfit/wizardcorpse/yellow
+
+/obj/effect/mob_spawn/corpse/human/wizard/black
+	outfit = /datum/outfit/wizardcorpse/black
+
+/obj/effect/mob_spawn/corpse/human/wizard/marisa
+	outfit = /datum/outfit/wizardcorpse/marisa
+
+/obj/effect/mob_spawn/corpse/human/wizard/tape
+	outfit = /datum/outfit/wizardcorpse/tape
+
 /datum/outfit/wizardcorpse
 	name = "Space Wizard Corpse"
 	uniform = /obj/item/clothing/under/color/lightpurple
@@ -228,6 +243,27 @@
 	shoes = /obj/item/clothing/shoes/sandal/magic
 	head = /obj/item/clothing/head/wizard
 
+/datum/outfit/wizardcorpse/red
+	suit = /obj/item/clothing/suit/wizrobe/red
+	head = /obj/item/clothing/head/wizard/red
+
+/datum/outfit/wizardcorpse/yellow
+	suit = /obj/item/clothing/suit/wizrobe/yellow
+	head = /obj/item/clothing/head/wizard/yellow
+
+/datum/outfit/wizardcorpse/black
+	suit = /obj/item/clothing/suit/wizrobe/black
+	head = /obj/item/clothing/head/wizard/black
+
+/datum/outfit/wizardcorpse/marisa
+	suit = /obj/item/clothing/suit/wizrobe/marisa
+	head = /obj/item/clothing/head/wizard/marisa
+	shoes = /obj/item/clothing/shoes/sneakers/marisa
+
+/datum/outfit/wizardcorpse/tape
+	suit = /obj/item/clothing/suit/wizrobe/tape
+	head = /obj/item/clothing/head/wizard/tape
+
 /obj/effect/mob_spawn/corpse/human/wizard/dark
 	name = "Dark Wizard Corpse"
 	outfit = /datum/outfit/wizardcorpse/dark

code/modules/mob_spawn/ghost_roles/golem_roles.dm

@@ -23,7 +23,14 @@
 	. = ..()
 	var/area/init_area = get_area(src)
 	if(!mapload && init_area)
-		notify_ghosts("\A golem shell has been completed in \the [init_area.name].", source = src, action = NOTIFY_PLAY, flashwindow = FALSE, ignore_key = POLL_IGNORE_GOLEM)
+		notify_ghosts(
+			"\A golem shell has been completed in \the [init_area.name].",
+			source = src,
+			header = "Golem Shell",
+			click_interact = TRUE,
+			ignore_key = POLL_IGNORE_GOLEM,
+			notify_flags = NOTIFY_CATEGORY_NOFLASH,
+		)
 
 /obj/effect/mob_spawn/ghost_role/human/golem/name_mob(mob/living/spawned_mob, forced_name)
 	if(forced_name || !iscarbon(spawned_mob))

code/modules/mob_spawn/ghost_roles/mining_roles.dm

@@ -266,7 +266,14 @@
 	eggshell.egg = src
 	src.forceMove(eggshell)
 	if(spawner_area)
-		notify_ghosts("An ash walker egg is ready to hatch in \the [spawner_area.name].", source = src, action = NOTIFY_PLAY, flashwindow = FALSE, ignore_key = POLL_IGNORE_ASHWALKER)
+		notify_ghosts(
+			"An ash walker egg is ready to hatch in \the [spawner_area.name].",
+			source = src,
+			header = "Ash Walker Egg",
+			click_interact = TRUE,
+			ignore_key = POLL_IGNORE_ASHWALKER,
+			notify_flags = NOTIFY_CATEGORY_NOFLASH,
+		)
 
 /datum/outfit/ashwalker
 	name = "Ash Walker"

code/modules/mob_spawn/ghost_roles/spider_roles.dm

@@ -107,7 +107,17 @@
 	amount_grown += rand(5, 15) * seconds_per_tick
 	if(amount_grown >= 100 && !ready)
 		ready = TRUE
-		notify_ghosts("[src] is ready to hatch!", null, enter_link = "<a href=?src=[REF(src)];activate=1>(Click to play)</a>", source = src, action = NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPIDER, flashwindow = flash_window)
+		var/notify_flags_to_pass = NOTIFY_CATEGORY_NOFLASH
+		if(flash_window)
+			notify_flags_to_pass &= GHOST_NOTIFY_FLASH_WINDOW
+		notify_ghosts(
+			"[src] is ready to hatch!",
+			source = src,
+			header = "Spider Infestation",
+			click_interact = TRUE,
+			ignore_key = POLL_IGNORE_SPIDER,
+			notify_flags = notify_flags_to_pass,
+		)
 		STOP_PROCESSING(SSobj, src)
 
 /obj/effect/mob_spawn/ghost_role/spider/Topic(href, href_list)

code/modules/mob_spawn/ghost_roles/venus_human_trap.dm

@@ -33,7 +33,13 @@
 /// Called when the attached flower bud has borne fruit (ie. is ready)
 /obj/effect/mob_spawn/ghost_role/venus_human_trap/proc/bear_fruit()
 	ready = TRUE
-	notify_ghosts("[src] has borne fruit!", source = src, action = NOTIFY_PLAY, ignore_key = POLL_IGNORE_VENUSHUMANTRAP)
+	notify_ghosts(
+		"[src] has borne fruit!",
+		source = src,
+		header = "Venus Human Trap",
+		click_interact = TRUE,
+		ignore_key = POLL_IGNORE_VENUSHUMANTRAP,
+	)
 
 /obj/effect/mob_spawn/ghost_role/venus_human_trap/allow_spawn(mob/user, silent = FALSE)
 	. = ..()