diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index f0df15af4fe..fe4c1088885 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -389,6 +389,8 @@
 					organStatus["splinted"] = 1
 				if(E.status & ORGAN_BLEEDING)
 					organStatus["bleeding"] = 1
+				if(E.status & ORGAN_DEAD)
+					organStatus["dead"] = 1
 
 				organData["status"] = organStatus
 
@@ -415,6 +417,7 @@
 				organData["bruised"] = I.min_broken_damage
 				organData["broken"] = I.min_bruised_damage
 				organData["robotic"] = I.robotic
+				organData["dead"] = (I.status & ORGAN_DEAD)
 
 				intOrganData.Add(list(organData))
 
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index c4ab2e26331..a4c7d0dd01b 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -86,11 +86,11 @@ var/list/organ_cache = list()
 		return
 
 	if(!owner)
-		if(reagents)
-			var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list
-			if(B && prob(40))
-				reagents.remove_reagent("blood",0.1)
-				blood_splatter(src,B,1)
+		if(reagents && prob(40))
+			reagents.remove_any(0.1)
+			for(var/datum/reagent/R in reagents.reagent_list)
+				R.reaction_turf(get_turf(src), 0.1)
+
 		// Maybe scale it down a bit, have it REALLY kick in once past the basic infection threshold
 		// Another mercy for surgeons preparing transplant organs
 		germ_level++
diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl
index 017abaad0cb..66650e62f86 100644
--- a/nano/templates/adv_med.tmpl
+++ b/nano/templates/adv_med.tmpl
@@ -174,6 +174,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
 						</span>
 						{{if value.status.splinted}} splinted <br> {{/if}}
 						{{if value.status.robotic}} robotic <br> {{/if}}
+						{{if value.status.dead}} <span class='bad'>DEAD</span> <br {{/if}}
 						{{if value.shrapnel_len}}
 							{{for value.shrapnel : shrapValue:shrapindex}}
 								{{:shrapValue.known ? shrapValue.name : "unknown object"}} <br>
@@ -220,6 +221,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
 						</span>
 						{{if value.robotic == 1}} robotic <br> {{/if}}
 						{{if value.robotic == 2}} assisted <br> {{/if}}
+						{{if value.dead}} <span class='bad'>DEAD</span> <br> {{/if}}
 					</td>
 				</tr>
 			{{/for}}