stuff

cmss13-devs · May 25, 2024 · 310a0aa · 310a0aa
1 parent 7f356a6
commit 310a0aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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