Holodeck Nullrod Fix (#17692)

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
 

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."

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" = (