diff --git a/code/unused/organs/implants.dm b/code/WorkInProgress/organs/implants.dm
similarity index 100%
rename from code/unused/organs/implants.dm
rename to code/WorkInProgress/organs/implants.dm
diff --git a/code/unused/organs/organs.dm b/code/WorkInProgress/organs/organs.dm
similarity index 100%
rename from code/unused/organs/organs.dm
rename to code/WorkInProgress/organs/organs.dm
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 4247af5678..1ff51f8677 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -23,23 +23,20 @@
 		usr.emote(message)
 
 /mob/proc/say_dead(var/message)
-	var/m_name = src.real_name
-	if(!m_name)
-		m_name = src.name
-	//var/alt_name = ""
+	var/name = src.real_name
+	var/alt_name = ""
 
-	//if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
-		//var/mob/living/carbon/human/H = src
-		//alt_name = " (as [H.get_authentification_name()])"
-	//else if (istype(src, /mob/dead/observer))
-	//	name = "Ghost"
-	//	alt_name = " ([src.real_name])"
-	//else if (!istype(src, /mob/living/carbon/human))
-	//	name = src.name
+	if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
+		var/mob/living/carbon/human/H = src
+		alt_name = " (as [H.get_authentification_name()])"
+	if (!istype(src, /mob/living/carbon/human))
+		name = src.name
+	if (istype(src, /mob/dead/observer))
+		name = "Ghost"
+		alt_name = " ([src.real_name])"
 
 	message = src.say_quote(message)
-
-	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[m_name]</span> <span class='message'>[message]</span></span>"
+	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
 
 	for (var/mob/M in world)
 		if (istype(M, /mob/new_player))
@@ -47,6 +44,7 @@
 		if (M.stat == 2 || (M.client && M.client.holder && M.client.deadchat)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
 			if(M.client && !M.client.STFU_ghosts) //Admin shut-off for ghosts chatter
 				M.show_message(rendered, 2)
+	return
 
 /mob/proc/say_understands(var/mob/other)
 	if (src.stat == 2)
diff --git a/tgstation.dme b/tgstation.dme
index 7d3562cd58..187cff71c4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -135,12 +135,12 @@
 #define FILE_DIR "code/unused/hivebot"
 #define FILE_DIR "code/unused/mining"
 #define FILE_DIR "code/unused/optics"
-#define FILE_DIR "code/unused/organs"
 #define FILE_DIR "code/unused/pda2"
 #define FILE_DIR "code/unused/powerarmor"
 #define FILE_DIR "code/unused/spacecraft"
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/mapload"
+#define FILE_DIR "code/WorkInProgress/organs"
 #define FILE_DIR "code/WorkInProgress/virus2"
 #define FILE_DIR "html"
 #define FILE_DIR "icons"
@@ -981,6 +981,8 @@
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\mapload\dmm_suite.dm"
 #include "code\WorkInProgress\mapload\reader.dm"
+#include "code\WorkInProgress\organs\implants.dm"
+#include "code\WorkInProgress\organs\organs.dm"
 #include "code\WorkInProgress\virus2\analyser.dm"
 #include "code\WorkInProgress\virus2\antibodies.dm"
 #include "code\WorkInProgress\virus2\base.dm"