diff --git a/code/modules/cm_aliens/hivebuffs/hivebuff.dm b/code/modules/cm_aliens/hivebuffs/hivebuff.dm index 4e478dc45642..c54c207c0104 100644 --- a/code/modules/cm_aliens/hivebuffs/hivebuff.dm +++ b/code/modules/cm_aliens/hivebuffs/hivebuff.dm @@ -425,7 +425,7 @@ radial_icon = "shield" /datum/hivebuff/defence/apply_buff_effects(mob/living/carbon/xenomorph/xeno) - xeno.armor_deflection += 0.05 * xeno.armor_deflectionarmor_modifier + xeno.armor_deflection += 0.05 * xeno.armor_deflection /datum/hivebuff/defence/remove_buff_effects(mob/living/carbon/xenomorph/xeno) xeno.armor_deflection = initial(xeno.armor_deflection) diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index ab11a1d88866..3869f5f94d94 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -144,6 +144,8 @@ /// Hivebuff being sustained by this pylon var/datum/hivebuff/sustained_buff + var/list/players_on_buff_cooldown = list() + /// Cooldown between trying to activate a hive buff COOLDOWN_DECLARE(buff_cooldown) @@ -283,8 +285,13 @@ xeno.hive.attempt_apply_hivebuff(buffs[selection], xeno, src) COOLDOWN_START(src, buff_cooldown, 30 SECONDS) + players_on_buff_cooldown += xeno + addtimer(CALLBACK(src, PROC_REF(remove_buff_cooldown), xeno), 30 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) return TRUE +/obj/effect/alien/resin/special/pylon/endgame/proc/remove_buff_cooldown(mob/living/carbon/xenomorph/xeno) + players_on_buff_cooldown -= xeno + //Hive Core - Generates strong weeds, supports other buildings /obj/effect/alien/resin/special/pylon/core name = XENO_STRUCTURE_CORE