From c0ae9560e9aac611bdfcec72fc9171a7a39ec86a Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Mon, 8 Dec 2025 18:54:03 -0500 Subject: [PATCH] Fixes skeleton reanimators spawning in xenobio (#31209) --- code/modules/events/demon_incursion.dm | 4 ++-- .../mob/living/basic/hostile/nether_mobs/skeleton_mob.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/events/demon_incursion.dm b/code/modules/events/demon_incursion.dm index 6fb94087921..c5ec6952244 100644 --- a/code/modules/events/demon_incursion.dm +++ b/code/modules/events/demon_incursion.dm @@ -119,7 +119,7 @@ /mob/living/basic/hellhound/whelp = 5, // Specialized mobs - tank /mob/living/basic/skeleton/incursion/security = 5, // Specialized mobs - ranged /mob/living/basic/giant_spider/flesh_spider = 5, // Specialized mobs - poison/harasser - /mob/living/basic/skeleton/reanimator = 4, // Specialized mobs - Summoner + /mob/living/basic/skeleton/incursion/reanimator = 4, // Specialized mobs - Summoner /mob/living/basic/skeleton/incursion/mobster = 1,) // Specialized mobs - ranged icon = 'icons/obj/structures/portal.dmi' icon_state = "portal" @@ -133,7 +133,7 @@ /mob/living/basic/giant_spider/flesh_spider, /mob/living/basic/skeleton/incursion/security, /mob/living/basic/skeleton/incursion/mobster, - /mob/living/basic/skeleton/reanimator) + /mob/living/basic/skeleton/incursion/reanimator) /// Chance that a mob type is special var/special_chance = 15 /// The event that spawned this portal diff --git a/code/modules/mob/living/basic/hostile/nether_mobs/skeleton_mob.dm b/code/modules/mob/living/basic/hostile/nether_mobs/skeleton_mob.dm index 5a220089e06..e0fb09e2ff0 100644 --- a/code/modules/mob/living/basic/hostile/nether_mobs/skeleton_mob.dm +++ b/code/modules/mob/living/basic/hostile/nether_mobs/skeleton_mob.dm @@ -159,7 +159,7 @@ /obj/projectile/bullet/skeleton_smg damage = 5 -/mob/living/basic/skeleton/reanimator +/mob/living/basic/skeleton/incursion/reanimator name = "skeletal reanimator" desc = "A dark necromancer from the depths of an unknowable darkness." icon_state = "skeleton_reanimator" @@ -175,11 +175,11 @@ /datum/action/cooldown/mob_cooldown/summon_skulls = BB_REANIMATOR_SKULL_ACTION, ) -/mob/living/basic/skeleton/reanimator/Initialize(mapload) +/mob/living/basic/skeleton/incursion/reanimator/Initialize(mapload) . = ..() grant_actions_by_list(reanimator_actions) -/mob/living/basic/skeleton/reanimator/melee_attack(mob/living/carbon/human/target, list/modifiers, ignore_cooldown) +/mob/living/basic/skeleton/incursion/reanimator/melee_attack(mob/living/carbon/human/target, list/modifiers, ignore_cooldown) if(!ishuman(target)) return ..() if(target.stat != DEAD) @@ -198,7 +198,7 @@ sleep(3 SECONDS) // Locks the revitalizer down for 2 seconds, but gives the player 5 seconds to return reanimate(target) -/mob/living/basic/skeleton/reanimator/proc/reanimate(mob/living/carbon/human/H) +/mob/living/basic/skeleton/incursion/reanimator/proc/reanimate(mob/living/carbon/human/H) visible_message("[name] releases dark tendrils into the flesh of [H], morphing their corpse into a grotesque creature!") var/mob/living/basic/netherworld/blankbody/blank = new(H.loc) blank.name = "[H]"