From da1da717d295e16ddbbd2480c208adb8951668f5 Mon Sep 17 00:00:00 2001
From: Thalpy <33956696+Thalpy@users.noreply.github.com>
Date: Thu, 21 Nov 2019 19:03:48 +0000
Subject: [PATCH 1/2] Update code/game/objects/items/devices/scanners.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/game/objects/items/devices/scanners.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index c07c52b075..70359cd160 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -209,7 +209,7 @@ SLIME SCANNER
 
 
 			//EARS
-			if(istype(O, /obj/item/organ/ears))
+			else if(istype(O, /obj/item/organ/ears))
 				var/obj/item/organ/ears/ears = O
 				if(advanced)
 					if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))

From a0a52018f39ceb0d3d0b90f874003f3bba1e51af Mon Sep 17 00:00:00 2001
From: Thalpy <33956696+Thalpy@users.noreply.github.com>
Date: Thu, 21 Nov 2019 19:06:34 +0000
Subject: [PATCH 2/2] Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/game/objects/items/devices/scanners.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 70359cd160..8cb2f51e9c 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -224,7 +224,7 @@ SLIME SCANNER
 
 
 			//BRAIN
-			if(istype(O, /obj/item/organ/brain))
+			else if(istype(O, /obj/item/organ/brain))
 				if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200)
 					damage_message += " <span class='alert'>Subject's brain function is non-existent. Neurine injection recomended.</span>"
 				else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
@@ -270,7 +270,7 @@ SLIME SCANNER
 
 
 			//LIVER
-			if(istype(O, /obj/item/organ/liver))
+			else if(istype(O, /obj/item/organ/liver))
 				var/obj/item/organ/liver/L = O
 				if(H.undergoing_liver_failure() && H.stat != DEAD) //might be depreciated
 					temp_message += "<span class='danger'>Subject is suffering from liver failure: Apply Corazone and begin a liver transplant immediately!</span>"
@@ -278,7 +278,7 @@ SLIME SCANNER
 					temp_message += " <span class='danger'>Subject is suffering from an enlarged liver.</span>" //i.e. shrink their liver or give them a transplant.
 
 			//HEART
-			if(ishuman(M) && (istype(O, /obj/item/organ/heart)))
+			else if(ishuman(M) && (istype(O, /obj/item/organ/heart)))
 				var/obj/item/organ/heart/He = O
 				if(H.undergoing_cardiac_arrest() && H.stat != DEAD)
 					temp_message += " <span class='danger'>Subject suffering from heart attack: Apply defibrillation or other electric shock <b>immediately!</b></span>"
@@ -286,18 +286,18 @@ SLIME SCANNER
 					heart_ded = TRUE
 
 			//TONGUE
-			if(istype(O, /obj/item/organ/tongue))
+			else if(istype(O, /obj/item/organ/tongue))
 				var/obj/item/organ/tongue/T = O
 				if(T.name == "fluffy tongue")
 					temp_message += " <span class='danger'>Subject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.</span>"
 
 			//HECK
-			if(istype(O, /obj/item/organ/genital/penis))
+			else if(istype(O, /obj/item/organ/genital/penis))
 				var/obj/item/organ/genital/penis/P = O
 				if(P.length>20)
 					temp_message += " <span class='info'>Subject has a sizeable gentleman's organ at [P.length] inches.</span>"
 
-			if(istype(O, /obj/item/organ/genital/breasts))
+			else if(istype(O, /obj/item/organ/genital/breasts))
 				var/obj/item/organ/genital/breasts/Br = O
 				if(Br.cached_size>5)
 					temp_message += " <span class='info'>Subject has a sizeable bosom with a [Br.size] cup.</span>"