Binder fixes (#7673)

This commit is contained in:
Eli
2024-02-03 05:15:39 +11:00
committed by GitHub
parent 0272d5d8ea
commit 2edc2faf5b
4 changed files with 15 additions and 0 deletions

View File

@@ -847,6 +847,10 @@
if(src && input && !M.stat && in_range(M,src))
name = input
//CHOMPAdd Start - Rename possessed voices too
for(var/mob/living/voice/V in possessed_voice)
V.name = input
//CHOMPAdd End
to_chat(M, "You name the plushie [input], giving it a hug for good luck.")
return 1

View File

@@ -46,6 +46,7 @@
for(var/mob/living/voice/V in I.possessed_voice)
if(!V.tf_mob_holder)
V.ghostize(0)
V.stat = DEAD //CHOMPAdd - Helps with autosleeving
V.Destroy()
//CHOMPAdd End

View File

@@ -14,6 +14,8 @@
for(var/mob/living/voice/V in possessed_voice) // Delete voices.
V.ghostize(0) //CHOMPAdd - Prevent Reenter Corpse sending observers to the shadow realm
V.stat = DEAD //CHOMPAdd - Helps with autosleeving
if(V.mind) V.mind.vore_death = 1 //CHOMPAdd - Digested item TFs get vore_death timer
V.Destroy() //Destroy the voice.
for(var/mob/living/M in contents)//Drop mobs from objects(shoes) before deletion
M.forceMove(item_storage)
@@ -115,6 +117,8 @@
if(!recycled)
for(var/mob/living/voice/V in possessed_voice) // Delete voices.
V.ghostize(0) //CHOMPAdd - Prevent Reenter Corpse sending observers to the shadow realm
V.stat = DEAD //CHOMPAdd - Helps with autosleeving
if(V.mind) V.mind.vore_death = 1 //CHOMPAdd - Digested item TFs get vore_death timer
V.Destroy() //Destroy the voice.
if(istype(B) && recycled)
//CHOMPEdit End

View File

@@ -35,6 +35,12 @@
update_icon()
/obj/item/device/mindbinder/pre_attack(atom/A)
if(istype(A, /obj/structure/gargoyle))
var/obj/structure/gargoyle/G = A
A = G.gargoyle
if(istype(A, /obj/item/weapon/holder))
var/obj/item/weapon/holder/H = A
A = H.held_mob
if(istype(A, /mob/living))
var/mob/living/M = A
if(usr == M)