From ac84b467a214a633570e7a5240c0150ad2766aff Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:14:21 +0100
Subject: [PATCH] Holodeck Nullrod Fix (#17692)

---
 code/game/objects/items/weapons/chaplain_items.dm    | 12 +++++++++++-
 html/changelogs/SleepyGemmy-holodeck_nullrod_fix.yml |  6 ++++++
 maps/sccv_horizon/sccv_horizon-4_centcomm.dmm        |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/SleepyGemmy-holodeck_nullrod_fix.yml

diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index a2b67d2b1b1..4d91e60e4f3 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -16,7 +16,8 @@
 	throw_range = 4
 	throwforce = 10
 	w_class = ITEMSIZE_SMALL
-	var/cooldown = 0 // floor tap cooldown
+	var/can_change_form = TRUE // For holodeck check.
+	var/cooldown = 0 // Floor tap cooldown.
 	var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame, "Tribunal Rod" = /obj/item/nullrod/dominia, "Tajaran charm" = /obj/item/nullrod/charm,
 									"Mata'ke Sword" = /obj/item/nullrod/matake, "Rredouane Sword" = /obj/item/nullrod/rredouane, "Shumaila Hammer" = /obj/item/nullrod/shumaila, "Zhukamir Ladle" = /obj/item/nullrod/zhukamir, "Azubarre Torch" = /obj/item/nullrod/azubarre)
 
@@ -36,6 +37,10 @@
 	icon_state = "tribunalrod"
 	item_state = "tribunalrod"
 
+// Unreassembleable Variant for the Holodeck
+/obj/item/nullrod/dominia/holodeck
+	can_change_form = FALSE
+
 /obj/item/nullrod/staff
 	name = "null staff"
 	desc = "A staff of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae."
@@ -144,6 +149,11 @@
 	set category = "Object"
 	set src in usr
 
+	// Holodeck Check
+	if(!can_change_form)
+		to_chat(user, SPAN_NOTICE("You can't change a holographic item's form..."))
+		return
+
 	if(use_check_and_message(user, USE_FORCE_SRC_IN_USER))
 		return
 
diff --git a/html/changelogs/SleepyGemmy-holodeck_nullrod_fix.yml b/html/changelogs/SleepyGemmy-holodeck_nullrod_fix.yml
new file mode 100644
index 00000000000..836bfca8d86
--- /dev/null
+++ b/html/changelogs/SleepyGemmy-holodeck_nullrod_fix.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed one of the holodeck templates having a real nullrod."
diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
index a41362e1dbb..48a6892dc04 100644
--- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
@@ -38007,7 +38007,7 @@
 	dir = 1
 	},
 /obj/structure/table/stone/marble,
-/obj/item/nullrod/dominia,
+/obj/item/nullrod/dominia/holodeck,
 /turf/simulated/floor/marble,
 /area/horizon/holodeck/source_tribunal)
 "lGe" = (