diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index bc0c2dca14b..bdaf5f7d75c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -107,6 +107,8 @@ var/tip_timer // reference to timer id for a tooltip we might open soon + var/no_random_knockdown = FALSE //stops item from being able to randomly knock people down in combat + /obj/item/New() ..() if(embed_chance < 0) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index ee7060dfd89..c8b324d6f43 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -278,6 +278,7 @@ /obj/item/weapon/holo damtype = HALLOSS no_attack_log = 1 + no_random_knockdown = TRUE /obj/item/weapon/holo/esword desc = "May the force be within you. Sorta." diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 8591001d285..b0244149d8a 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -321,7 +321,7 @@ emp_act H.bloody_body(src) H.bloody_hands(src) - if(!stat) + if(!stat && !(I.no_random_knockdown)) switch(hit_zone) if(BP_HEAD)//Harder to score a stun but if you do it lasts a bit longer if(prob(effective_force))