diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index b345b8c1490..f349f8d8663 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -54,7 +54,6 @@ #define COOLDOWN_EVASION_ACTIVATION "cooldown_evasion_activation" #define COOLDOWN_TANK_SWIVEL "tank_turret_swivel" #define COOLDOWN_ARMORED_HORN "cooldown_armored_horn" -#define COOLDOWN_MOB_EX_ACT "mob_ex_act" //Mecha cooldowns #define COOLDOWN_MECHA "mecha" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fd6969c149a..c8ec8344ffe 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -122,9 +122,6 @@ if(severity <= 0) return - if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_MOB_EX_ACT)) - return - if(lying_angle) severity *= EXPLOSION_PRONE_MULTIPLIER @@ -164,7 +161,7 @@ take_overall_damage(severity * 0.5, BRUTE, BOMB, updating_health = TRUE, max_limbs = 4) take_overall_damage(severity * 0.5, BURN, BOMB, updating_health = TRUE, max_limbs = 4) explosion_throw(severity, direction) - TIMER_COOLDOWN_START(src, COOLDOWN_MOB_EX_ACT, 0.1 SECONDS) // this is to prevent x2 damage from mob getting thrown into the explosions wave + /mob/living/carbon/human/attack_animal(mob/living/M as mob) if(M.melee_damage == 0) diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm index 2a037239633..97b9f1c5a0f 100644 --- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm @@ -28,9 +28,6 @@ if(status_flags & (INCORPOREAL|GODMODE)) return - if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_MOB_EX_ACT)) - return - if(lying_angle) severity *= EXPLOSION_PRONE_MULTIPLIER @@ -57,7 +54,6 @@ adjust_stagger(powerfactor_value / 2) else adjust_slowdown(powerfactor_value / 3) - TIMER_COOLDOWN_START(src, COOLDOWN_MOB_EX_ACT, 0.1 SECONDS) // this is to prevent x2 damage from mob getting thrown into the explosions wave /mob/living/carbon/xenomorph/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration) if(status_flags & GODMODE)