diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm
index d903e34fb6..5fbd4257a9 100644
--- a/code/game/objects/items/weapons/medical.dm
+++ b/code/game/objects/items/weapons/medical.dm
@@ -46,22 +46,14 @@ MEDICAL
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.organs["chest"]
+		var/datum/organ/external/affecting = H.get_organ("chest")
 
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/user2 = user
-			var/t = user2.zone_sel.selecting
-
-			if (t in list("eyes", "mouth"))
-				t = "head"
-
-			if (H.organs[t])
-				affecting = H.organs[t]
+			affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
 		else
-			if (!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
-				affecting = H.organs["head"]
-				if (!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
-					affecting = H.organs["groin"]
+			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
+				affecting = H.get_organ("head")
 
 		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
 			H.UpdateDamageIcon()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index ee64ac9770..b77604049f 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -76,7 +76,6 @@ emp_act
 	visible_message("\red <B>[src] has been attacked in the [hit_area] with [I.name] by [user]!</B>")
 
 	if(check_shields(I.force, "the [I.name]"))
-		world << "SHIELDS"
 		return 0
 	var/armor = run_armor_check(affecting, "melee", "Your armor has protected you from a hit to the [hit_area].", "Your armor has softened hit to your [hit_area].")
 	if(armor >= 2)	return 0