mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
Fixes tentacle rod sharing casing typepath with ling tentacle (#96109)
## About The Pull Request Closes #96011 ## Changelog 🆑 fix: Fixed changeling tentacles not being able to fire /🆑
This commit is contained in:
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user