From e88b25bb2477fc60e405b1c3891d52e898da3233 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:31:59 -0400
Subject: [PATCH] wooohoo! I can see demons! (#19020)

---
 code/__DEFINES/mobs.dm                        | 19 ++++++++++---------
 .../miniantags/slaughter/bloodcrawl.dm        |  4 ++--
 .../miniantags/slaughter/slaughter.dm         |  2 +-
 code/modules/mob/dead/observer/orbit.dm       |  4 ++++
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index d600a7e857a..b25e86a8579 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -236,15 +236,16 @@
 #define iswryn(A) (is_species(A, /datum/species/wryn))
 #define ismoth(A) (is_species(A, /datum/species/moth))
 
-#define isanimal(A)		(istype((A), /mob/living/simple_animal))
-#define isdog(A)		(istype((A), /mob/living/simple_animal/pet/dog))
-#define iscorgi(A)		(istype((A), /mob/living/simple_animal/pet/dog/corgi))
-#define ismouse(A)		(istype((A), /mob/living/simple_animal/mouse))
-#define isbot(A)		(istype((A), /mob/living/simple_animal/bot))
-#define isguardian(A)	(istype((A), /mob/living/simple_animal/hostile/guardian))
-#define isnymph(A)      (istype((A), /mob/living/simple_animal/diona))
-#define ishostile(A) 	(istype(A, /mob/living/simple_animal/hostile))
-#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
+#define isanimal(A)			(istype((A), /mob/living/simple_animal))
+#define isdog(A)			(istype((A), /mob/living/simple_animal/pet/dog))
+#define iscorgi(A)			(istype((A), /mob/living/simple_animal/pet/dog/corgi))
+#define ismouse(A)			(istype((A), /mob/living/simple_animal/mouse))
+#define isbot(A)			(istype((A), /mob/living/simple_animal/bot))
+#define isguardian(A)		(istype((A), /mob/living/simple_animal/hostile/guardian))
+#define isnymph(A)      	(istype((A), /mob/living/simple_animal/diona))
+#define ishostile(A) 		(istype((A), /mob/living/simple_animal/hostile))
+#define isterrorspider(A) 	(istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
+#define isslaughterdemon(A) (istype((A), /mob/living/simple_animal/slaughter))
 
 #define issilicon(A)	(istype((A), /mob/living/silicon))
 #define isAI(A)			(istype((A), /mob/living/silicon/ai))
diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
index 68345eb622a..988ff1f4595 100644
--- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
+++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
@@ -59,7 +59,7 @@
 			if(animation)
 				qdel(animation)
 			var/sound
-			if(istype(src, /mob/living/simple_animal/slaughter))
+			if(isslaughterdemon(src))
 				var/mob/living/simple_animal/slaughter/SD = src
 				sound = SD.feast_sound
 			else
@@ -133,7 +133,7 @@
 	animation.master = B.loc
 	animation.dir = dir
 
-	if(prob(25) && istype(src, /mob/living/simple_animal/slaughter))
+	if(prob(25) && isslaughterdemon(src))
 		var/list/voice = list('sound/hallucinations/behind_you1.ogg','sound/hallucinations/im_here1.ogg','sound/hallucinations/turn_around1.ogg','sound/hallucinations/i_see_you1.ogg')
 		playsound(get_turf(src), pick(voice),50, 1, -1)
 	visible_message("<span class='warning'><B>\The [src] rises out of \the [B]!</B>")
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index b0d71f6413f..a7141371f05 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -344,7 +344,7 @@
 	..()
 
 /datum/objective/slaughter/check_completion()
-	if(!istype(owner.current, /mob/living/simple_animal/slaughter) || !owner.current)
+	if(!isslaughterdemon(owner.current) || !owner.current)
 		return 0
 	var/mob/living/simple_animal/slaughter/R = owner.current
 	if(!R || R.stat == DEAD)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 823abd59fdb..cbf33ead1da 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -129,6 +129,10 @@
 					var/list/antag_serialized = serialized.Copy()
 					antag_serialized["antag"] = "Xenomorph"
 					antagonists += list(antag_serialized)
+				else if(isslaughterdemon(M))
+					var/list/antag_serialized = serialized.Copy()
+					antag_serialized["antag"] = "Slaughter Demon"
+					antagonists += list(antag_serialized)
 		else
 			misc += list(serialized)