From e641fe9c1afcaefb09d7dcd3c434b902f3438cb3 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:45:56 +0000 Subject: [PATCH] Swarmer Beacon EMP damage (#15032) * Update swarmer.dm * Update swarmer.dm --- .../living/simple_animal/hostile/megafauna/swarmer.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 2515da9dff9..34b0a3d51a4 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -56,10 +56,15 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa wander = FALSE layer = BELOW_MOB_LAYER AIStatus = AI_OFF + del_on_death = TRUE + /// Current spawn cooldown remaining var/swarmer_spawn_cooldown = 0 - var/swarmer_spawn_cooldown_amt = 150 //Deciseconds between the swarmers we spawn + /// Current help cooldown remaining var/call_help_cooldown = 0 - var/call_help_cooldown_amt = 150 //Deciseconds between calling swarmers to help us when attacked + /// Time between the swarmers we spawn + var/swarmer_spawn_cooldown_amt = 15 SECONDS + /// Time between calling swarmers to help us when attacked + var/call_help_cooldown_amt = 15 SECONDS var/static/list/swarmer_caps @@ -87,6 +92,8 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa call_help_cooldown = world.time + call_help_cooldown_amt summon_backup(25) //long range, only called max once per 15 seconds, so it's not deathlag +/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/emp_act(severity) + adjustHealth(50) /obj/item/gps/internal/swarmer_beacon icon_state = null