diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 06d057b240e..2dd68c2c81f 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -425,6 +425,13 @@ /obj/item/holo damtype = STAMINA +//override block check, we don't want to block anything that's not a holo object +/obj/item/holo/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby) + if(!istype(hitby, /obj/item/holo)) + return FALSE + else + return ..() + /obj/item/holo/claymore name = "claymore" desc = "What are you standing around staring at this for? Get to killing!" @@ -437,6 +444,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 + /obj/item/holo/claymore/blue icon_state = "claymoreblue" item_state = "claymoreblue"