From 92d878398a79e2931fea8e25a1db02d87168ad21 Mon Sep 17 00:00:00 2001 From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:47:52 -0400 Subject: [PATCH 1/2] its knockdown time --- code/__DEFINES/combat.dm | 1 + code/modules/mining/lavaland/loot/tendril_loot.dm | 3 ++- code/modules/mob/living/damage_procs.dm | 6 +++++- code/modules/projectiles/projectile.dm | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index bd59e863303b..1556c834e497 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -24,6 +24,7 @@ #define STUN "stun" #define WEAKEN "weaken" +#define KNOCKDOWN "knockdown" #define PARALYZE "paralize" #define IRRADIATE "irradiate" #define STUTTER "stutter" diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 7215d031c4a8..b03e6cf88786 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -380,7 +380,8 @@ armour_penetration = 100 damage_type = BRUTE hitsound = 'sound/effects/splat.ogg' - weaken = 6 SECONDS + weaken = 2 SECONDS + knockdown = 6 SECONDS /obj/item/projectile/hook/fire(setAngle) if(firer) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 2b715724d76d..1ff68e08ac3c 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -83,6 +83,8 @@ Stun(effect * blocked) if(WEAKEN) Weaken(effect * blocked) + if(KNOCKDOWN) + KnockDown(effect * blocked) if(PARALYZE) Paralyse(effect * blocked) if(IRRADIATE) @@ -101,13 +103,15 @@ updatehealth("apply effect") return TRUE -/mob/living/proc/apply_effects(stun = 0, weaken = 0, paralyze = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0) +/mob/living/proc/apply_effects(stun = 0, weaken = 0, knockdown = 0, paralyze = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0) if(blocked >= 100) return FALSE if(stun) apply_effect(stun, STUN, blocked) if(weaken) apply_effect(weaken, WEAKEN, blocked) + if(knockdown) + apply_effect(knockdown, KNOCKDOWN, blocked) if(paralyze) apply_effect(paralyze, PARALYZE, blocked) if(irradiate) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 2840b3c94126..6fdb6dba2a55 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -45,6 +45,7 @@ //Effects var/stun = 0 var/weaken = 0 + var/knockdown = 0 var/paralyze = 0 var/irradiate = 0 var/stutter = 0 @@ -176,7 +177,7 @@ if(!log_override && firer && !alwayslog) add_attack_logs(firer, L, "Shot with a [type][additional_log_text]") - return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter) + return L.apply_effects(stun, weaken, knockdown, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter) /obj/item/projectile/proc/get_splatter_blockage(turf/step_over, atom/target, splatter_dir, target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows). var/turf/step_cardinal = !(splatter_dir in list(NORTH, SOUTH, EAST, WEST)) ? get_step(target_loca, get_cardinal_dir(target_loca, step_over)) : null From 7a398b3042bd20c98caa1b42be3a6597e99c0aea Mon Sep 17 00:00:00 2001 From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Thu, 7 Jul 2022 16:17:49 -0400 Subject: [PATCH 2/2] weaken tweak --- code/modules/mining/lavaland/loot/tendril_loot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index b03e6cf88786..8db63983c090 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -380,7 +380,7 @@ armour_penetration = 100 damage_type = BRUTE hitsound = 'sound/effects/splat.ogg' - weaken = 2 SECONDS + weaken = 1 SECONDS knockdown = 6 SECONDS /obj/item/projectile/hook/fire(setAngle)