From 32c1d648492746b6e9458d594fa6fcb7f9846d26 Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:11:33 -0400
Subject: [PATCH] Fixes dead demon rendering when dying in a clown car (#29970)

* Fixes dead demon rendering when dying in a clown car

* Better implementation, fixes more shit
---
 code/modules/mob/living/basic/basic_mob.dm             | 2 ++
 code/modules/mob/living/simple_animal/simple_animal.dm | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/code/modules/mob/living/basic/basic_mob.dm b/code/modules/mob/living/basic/basic_mob.dm
index 048144b89c7..edc91d3a2c7 100644
--- a/code/modules/mob/living/basic/basic_mob.dm
+++ b/code/modules/mob/living/basic/basic_mob.dm
@@ -303,6 +303,8 @@ RESTRICT_TYPE(/mob/living/basic)
 	if(HAS_TRAIT(src, TRAIT_XENOBIO_SPAWNED))
 		SSmobs.xenobiology_mobs--
 	if(basic_mob_flags & DEL_ON_DEATH)
+		// Moves them to their turf to prevent rendering problems
+		forceMove(get_turf(src))
 		// From simplemob implementation; prevent infinite loops if the mob
 		// Destroy() is overridden in such a manner as to cause a call to
 		// death() again. One hopes this isn't still necessary but whatevs
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 3ce3ca105c0..4f61e2a043b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -347,6 +347,8 @@
 	if(HAS_TRAIT(src, TRAIT_XENOBIO_SPAWNED))
 		SSmobs.xenobiology_mobs--
 	if(del_on_death)
+		// Moves them to their turf to prevent rendering problems
+		forceMove(get_turf(src))
 		//Prevent infinite loops if the mob Destroy() is overridden in such
 		//a manner as to cause a call to death() again
 		del_on_death = FALSE