From 2ba0edbefbe5444cdfbd683fbbd870fa7289783c Mon Sep 17 00:00:00 2001
From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Date: Wed, 30 Apr 2025 06:03:21 +0500
Subject: [PATCH] fix (#29129)

---
 code/modules/mob/living/death.dm                       | 3 ++-
 code/modules/mob/living/living_defines.dm              | 2 ++
 code/modules/mob/living/simple_animal/simple_animal.dm | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 23e6ba4f0ab..69b97646d81 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -5,7 +5,8 @@
 		return FALSE
 	// hide and freeze for the GC
 	notransform = TRUE
-	icon = null
+	if(gib_nullifies_icon)
+		icon = null
 	invisibility = 101
 
 	playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 9495aedd4f2..b80b9349aeb 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -119,3 +119,5 @@
 	var/last_taste_text
 	///If a creature gets to be super special and have extra range on their chat messages
 	var/extra_message_range = 0
+	/// Sets our icon to `null` when `gib()` is used
+	var/gib_nullifies_icon = TRUE
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 17a5637720a..349c82e35da 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -10,6 +10,7 @@
 	universal_speak = FALSE
 	status_flags = CANPUSH
 	healable = TRUE
+	gib_nullifies_icon = FALSE // prevents players from having transparent icon when their body is gibbed
 
 	var/icon_living = ""
 	var/icon_dead = ""