From d9e966234aff08f96bf50b632bc3539a8139a62b Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Mon, 22 Feb 2021 13:36:06 -0300
Subject: [PATCH 1/3] upload hivelord.dm

---
 .../hostile/mining_mobs/hivelord.dm           | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index ae0f5ea3ca..f742bfb8d1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -42,6 +42,8 @@
 		A.GiveTarget(target)
 		A.friends = friends
 		A.faction = faction.Copy()
+		if(!A.istype(/mob/living/simple_animal/hostile/poison/bees/toxin))
+			A.my_creator = type
 		ranged_cooldown = world.time + ranged_cooldown_time
 
 /mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget()
@@ -88,6 +90,7 @@
 	density = FALSE
 	del_on_death = 1
 	var/swarming = FALSE
+	var/my_creator = null
 
 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize()
 	. = ..()
@@ -205,11 +208,7 @@
 
 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
 	visible_message("<span class='warning'>[name] burrows into the flesh of [H]!</span>")
-	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
-	if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
-		L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
-	else
-		L = new(H.loc)
+	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L = check_infest_type(H)
 	visible_message("<span class='warning'>[L] staggers to [L.p_their()] feet!</span>")
 	H.death()
 	H.adjustBruteLoss(1000)
@@ -217,6 +216,20 @@
 	H.forceMove(L)
 	qdel(src)
 
+/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/check_infest_type(mob/living/carbon/human)
+	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
+	var/list/blacklisted_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf)
+	if(HAS_TRAIT(human, TRAIT_DWARF)) //dwarf legions aren't just fluff!
+		L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(human.loc)
+	else if(my_creator)
+		if(my_creator in blacklisted_types)
+			L = new(human.loc)
+		else
+			L = new my_creator(human.loc)
+	else
+		L = new(human.loc)
+	return L
+
 //Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions)
 /mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced
 	stat_attack = DEAD

From 19efaba061e9924ef90b851f8ca10bece1f5f066 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Mon, 22 Feb 2021 13:37:49 -0300
Subject: [PATCH 2/3] upload hivelord.dm

---
 .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index f742bfb8d1..340458c132 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -216,7 +216,7 @@
 	H.forceMove(L)
 	qdel(src)
 
-/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/check_infest_type(mob/living/carbon/human)
+/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/check_infest_type(mob/living/carbon/human/human)
 	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
 	var/list/blacklisted_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf)
 	if(HAS_TRAIT(human, TRAIT_DWARF)) //dwarf legions aren't just fluff!

From eb4fcd8a005abaad1fcbdd1205879b8e979e55d7 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Mon, 22 Feb 2021 13:51:49 -0300
Subject: [PATCH 3/3] for some reason A doesn't have istype? what.

---
 .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 340458c132..446fe80c7d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -42,7 +42,7 @@
 		A.GiveTarget(target)
 		A.friends = friends
 		A.faction = faction.Copy()
-		if(!A.istype(/mob/living/simple_animal/hostile/poison/bees/toxin))
+		if(!A == /mob/living/simple_animal/hostile/poison/bees/toxin)
 			A.my_creator = type
 		ranged_cooldown = world.time + ranged_cooldown_time