From 41a044bb412f260712f3b9fb786bfae63a67fd27 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Tue, 19 May 2026 12:53:39 +0200
Subject: [PATCH] Fixes tentacle rod sharing casing typepath with ling tentacle
 (#96109)

## About The Pull Request

Closes #96011
## Changelog
:cl:
fix: Fixed changeling tentacles not being able to fire
/:cl:
---
 code/modules/projectiles/guns/magic/staff.dm           |  2 +-
 .../projectiles/guns/magic/wands/wand_tentacle.dm      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 308a6c87884..3615616f4f3 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -213,7 +213,7 @@
 		/obj/projectile/magic/spellblade,
 		/obj/projectile/magic/swap,
 		/obj/projectile/magic/teleport,
-		/obj/projectile/magic/tentacle,
+		/obj/projectile/magic/tentacle_staff,
 		/obj/projectile/magic/wipe,
 		/obj/projectile/temp/chill
 	)
diff --git a/code/modules/projectiles/guns/magic/wands/wand_tentacle.dm b/code/modules/projectiles/guns/magic/wands/wand_tentacle.dm
index e01aa152f20..c4be4e60a8d 100644
--- a/code/modules/projectiles/guns/magic/wands/wand_tentacle.dm
+++ b/code/modules/projectiles/guns/magic/wands/wand_tentacle.dm
@@ -7,7 +7,7 @@
 	name = "restraining rod"
 	desc = "This wriggling wand binds its victims in a place for a time, although it doesn't stop them from shooting back."
 	school = SCHOOL_CONJURATION
-	ammo_type = /obj/item/ammo_casing/magic/tentacle
+	ammo_type = /obj/item/ammo_casing/magic/tentacle_staff
 	icon_state = "tentawand"
 	base_icon_state = "tentawand"
 	fire_sound = 'sound/effects/splat.ogg'
@@ -24,15 +24,15 @@
 	. = ..()
 	return user.has_status_effect(/datum/status_effect/incapacitating/immobilized/wizard_tentacle/suicide) ? MANUAL_SUICIDE : SHAME
 
-/obj/item/ammo_casing/magic/tentacle
-	projectile_type = /obj/projectile/magic/tentacle
+/obj/item/ammo_casing/magic/tentacle_staff
+	projectile_type = /obj/projectile/magic/tentacle_staff
 
 /// Grabs the target for a while in an unwanted hug
-/obj/projectile/magic/tentacle
+/obj/projectile/magic/tentacle_staff
 	name = "bolt of binding"
 	icon_state = "tentacle_end"
 
-/obj/projectile/magic/tentacle/on_hit(mob/living/target, blocked = 0, pierce_hit)
+/obj/projectile/magic/tentacle_staff/on_hit(mob/living/target, blocked = 0, pierce_hit)
 	. = ..()
 	if (. == BULLET_ACT_BLOCK || !istype(target) || blocked >= 100)
 		return