From f250d6ef946c695954039886a6e179b5ac235569 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 8 Dec 2018 04:13:16 -0800 Subject: [PATCH 1/2] Update human_defense.dm --- code/modules/mob/living/carbon/human/human_defense.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index aba8e98583..232e029bde 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -272,7 +272,10 @@ "[M] disarmed [src]!") else playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - Knockdown(100) + if(!IsKnockdown()) //CITADEL EDIT + Knockdown(100, override_duration = 30, override_stam = 25) + else + Knockdown(100) log_combat(M, src, "tackled") visible_message("[M] has tackled down [src]!", \ "[M] has tackled down [src]!") From 7978daa37062487a2c3ae4de5c412137904232b0 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 8 Dec 2018 04:18:57 -0800 Subject: [PATCH 2/2] oopsies woopsies i made a fucky wucky --- code/modules/mob/living/carbon/human/human_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 232e029bde..4185f8f3aa 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -272,7 +272,7 @@ "[M] disarmed [src]!") else playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - if(!IsKnockdown()) //CITADEL EDIT + if(!lying) //CITADEL EDIT Knockdown(100, override_duration = 30, override_stam = 25) else Knockdown(100)