Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1

DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
2020-04-09 10:07:25 -07:00
parent f80900fd0b 0cd7437f49
commit a203ef7de5
1 changed files with 2 additions and 0 deletions
@@ -7,6 +7,8 @@
 /mob/living/proc/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg)
 	if(!iscarbon(src))
 		return Paralyze(amount, updating, ignore_canknockdown)
+	if(!ignore_canknockdown && !(status_flags & CANKNOCKDOWN))
+		return FALSE
 	if(istype(buckled, /obj/vehicle/ridden))
 		buckled.unbuckle_mob(src)
 	var/drop_items = amount > 80		//80 is cutoff for old item dropping behavior