diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 829d131ea3..07ad0a5699 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -6,15 +6,15 @@ // override_stam = If this is set, does this amount of stamina damage. /mob/living/proc/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) if(!iscarbon(src)) - return Paralyze(amount, updating, ignore_canstun) + return Paralyze(amount, updating, ignore_canknockdown) if(istype(buckled, /obj/vehicle/ridden)) buckled.unbuckle_mob(src) var/drop_items = amount > 80 //80 is cutoff for old item dropping behavior - var/stamdmg = isnull(override_stam)? (amount * 0.25) : override_stam + var/stamdmg = isnull(override_stamdmg)? (amount * 0.25) : override_stamdmg KnockToFloor(drop_items, TRUE, updating) adjustStaminaLoss(stamdmg) - if(!isnull(override_duration)) - Paralyze(override_duration) + if(!isnull(override_hardstun)) + Paralyze(override_hardstun) ////////////////////////////// STUN //////////////////////////////////// diff --git a/tgstation.dme b/tgstation.dme index 1ef38195b0..074a127afb 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3100,7 +3100,6 @@ #include "modular_citadel\code\_onclick\hud\stamina.dm" #include "modular_citadel\code\datums\components\souldeath.dm" #include "modular_citadel\code\datums\status_effects\chems.dm" -#include "modular_citadel\code\datums\status_effects\debuffs.dm" #include "modular_citadel\code\game\machinery\wishgranter.dm" #include "modular_citadel\code\game\objects\cit_screenshake.dm" #include "modular_citadel\code\game\objects\effects\temporary_visuals\souldeath.dm"