From 07e4254e92a67d0c4bd10702d397cc82b1dc74be Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:05:16 +0200
Subject: [PATCH 1/3] Update surgery.dm

---
 code/modules/surgery/surgery.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index d5ca4814c197..d5f52184bea0 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -56,6 +56,8 @@
 	if(requires_tech)
 		. = FALSE
 
+	var/obj/item/healthanalyzer/advanced/adv = locate() in R.GetAllContents()
+
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		var/obj/item/surgical_processor/SP = locate() in R.module.modules
@@ -63,10 +65,9 @@
 			return FALSE
 		if(type in SP.advanced_surgeries)
 			return TRUE
-	else
+	else if(adv)
 		var/mob/living/carbon/human/R = user
-		var/obj/item/healthanalyzer/advanced/adv = locate() in R.GetAllContents()
-		if(!adv || (replaced_by in adv.advanced_surgeries))
+		if((replaced_by in adv.advanced_surgeries))
 			return FALSE
 		if(type in adv.advanced_surgeries)
 			return TRUE

From 5f359d3a8a91a18dc73a7b2f8763732171343a25 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:07:59 +0200
Subject: [PATCH 2/3] Update surgery.dm

---
 code/modules/surgery/surgery.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index d5f52184bea0..64445d88c1d5 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -55,8 +55,8 @@
 
 	if(requires_tech)
 		. = FALSE
-
-	var/obj/item/healthanalyzer/advanced/adv = locate() in R.GetAllContents()
+	var/mob/living/carbon/human/user_human = user
+	var/obj/item/healthanalyzer/advanced/adv = locate() in user_human.GetAllContents()
 
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
@@ -65,8 +65,7 @@
 			return FALSE
 		if(type in SP.advanced_surgeries)
 			return TRUE
-	else if(adv)
-		var/mob/living/carbon/human/R = user
+	if(adv)
 		if((replaced_by in adv.advanced_surgeries))
 			return FALSE
 		if(type in adv.advanced_surgeries)

From 856ca4825d6c847d6983dd742be5717046beeb38 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:09:31 +0200
Subject: [PATCH 3/3] Update surgery.dm

---
 code/modules/surgery/surgery.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 64445d88c1d5..1c804a2356cd 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -55,8 +55,8 @@
 
 	if(requires_tech)
 		. = FALSE
-	var/mob/living/carbon/human/user_human = user
-	var/obj/item/healthanalyzer/advanced/adv = locate() in user_human.GetAllContents()
+		
+	var/obj/item/healthanalyzer/advanced/adv = locate() in user.GetAllContents()
 
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user