From be53da5cbc8fc602dc8dbdfa884aa60a535ad072 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Sat, 3 Jan 2026 18:52:52 +0100 Subject: [PATCH] Fixes lingering language holders caused by the sleeping carp (#94701) ## About The Pull Request Sleeping Carp tried to remove the lang holder when the owner was being destroyed, which would cause the holder to be re-instantiated mid-deletion ## Changelog :cl: fix: Fixed lingering language holders caused by the sleeping carp /:cl: --- code/datums/martial/sleeping_carp.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index b6f556e3aa8..23baed7d334 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -45,7 +45,8 @@ remove_from.remove_traits(scarp_traits, SLEEPING_CARP_TRAIT) UnregisterSignal(remove_from, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_PRE_BULLET_ACT, COMSIG_LIVING_CHECK_BLOCK)) remove_from.faction -= FACTION_CARP //:( - remove_from.remove_language(/datum/language/carptongue, ALL, type) + if (!QDELING(remove_from)) + remove_from.remove_language(/datum/language/carptongue, ALL, type) return ..() /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/attacker, mob/living/defender)