From d8cde4f3ab9d9193ced7e1d606ebf5bc6a543668 Mon Sep 17 00:00:00 2001
From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date: Thu, 7 Jul 2022 15:24:58 -0400
Subject: [PATCH] Holodeck claymores & eswords can only block holodeck items
 (#18229)

* fix

* also esword

* implement changes + better scoping

* oops

* comment cleanup

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
---
 code/game/machinery/computer/HolodeckControl.dm | 8 ++++++++
 1 file changed, 8 insertions(+)

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"