From 2ff89d38d51caca98aca14adbf08d7cb7c4100b4 Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 7 Aug 2023 15:43:35 +0300 Subject: [PATCH] Fixes despawned TF items spitting out visible voice ghost mobs for all to see. (#6745) --- code/game/machinery/cryopod.dm | 3 +++ modular_chomp/code/modules/recycling/v_garbosystem.dm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 91abfffe51..db32484e91 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -421,6 +421,9 @@ items -= announce // or the autosay radio. for(var/obj/item/W in items) + if(islist(W.possessed_voice)) //CHOMPAdd + for(var/mob/living/V in W.possessed_voice) + despawn_occupant(V) //VOREStation Addition Start if(istype(W, /obj/item/device/pda)) var/obj/item/device/pda/found_pda = W diff --git a/modular_chomp/code/modules/recycling/v_garbosystem.dm b/modular_chomp/code/modules/recycling/v_garbosystem.dm index 23e033355d..55c302db69 100644 --- a/modular_chomp/code/modules/recycling/v_garbosystem.dm +++ b/modular_chomp/code/modules/recycling/v_garbosystem.dm @@ -66,7 +66,7 @@ for(var/atom/movable/A in affecting) if(!isobj(A) && !isliving(A)) continue - if(istype(A, /obj/effect/decal/cleanable)) + if(istype(A, /obj/effect/decal/cleanable) || istype(A, /mob/living/voice)) qdel(A) if(!A.anchored) if(A.loc == src.loc)