diff --git a/baystation12.dme b/baystation12.dme
index 8b4d64ba6ff..5a034ff343b 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -784,10 +784,10 @@
 #include "code\modules\customitems\item_defines.dm"
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\destilery\main.dm"
-#include "code\modules\detectivework\detective_work.dm"
-#include "code\modules\detectivework\evidence.dm"
-#include "code\modules\detectivework\footprints_and_rag.dm"
-#include "code\modules\detectivework\scanner.dm"
+#include "code\modules\DetectiveWork\detective_work.dm"
+#include "code\modules\DetectiveWork\evidence.dm"
+#include "code\modules\DetectiveWork\footprints_and_rag.dm"
+#include "code\modules\DetectiveWork\scanner.dm"
 #include "code\modules\events\alien_infestation.dm"
 #include "code\modules\events\blob.dm"
 #include "code\modules\events\brand_intelligence.dm"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7c394844d5e..d51e1316da5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1028,6 +1028,7 @@
 		if (!O.amputated)
 			O.status &= ~ORGAN_DESTROYED
 		O.wounds.Cut()
+		O.heal_damage(1000,1000,1,1)
 
 	var/datum/organ/external/head/h = organs_by_name["head"]
 	h.disfigured = 0
@@ -1047,6 +1048,10 @@
 
 	for (var/datum/disease/virus in viruses)
 		virus.cure()
+	for (var/ID in virus2)
+		var/datum/disease2/disease/V = virus2[ID]
+		V.cure(src)
+
 	..()
 
 /mob/living/carbon/human/proc/is_lung_ruptured()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 245a372d2a0..162a69b49c7 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -269,15 +269,6 @@
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
-	if(ishuman(src))
-		var/mob/living/carbon/human/H = src
-		for(var/datum/organ/external/O in H.organs)
-			O.heal_damage(1000,1000,1,1)
-		for(var/datum/organ/internal/I in H.internal_organs)
-			I.damage = 0
-		for (var/ID in H.virus2)
-			var/datum/disease2/disease/V = H.virus2[ID]
-			V.cure(src)
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	if(stat == 2)