From 1966acb410d0baaa8f55e72725f39bcd20e11d5b Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 15 Jan 2023 11:03:17 -0800
Subject: [PATCH] Repairing light robotic damage messaging fix

---
 code/game/objects/items/weapons/tools/weldingtool.dm | 10 +++++++---
 code/modules/organs/organ_external.dm                |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index b372ae1917a..f4fe294f8de 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -79,21 +79,25 @@
 		if(S.organ_tag == BP_HEAD)
 			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
 				to_chat(user, "<span class='warning'>You can't apply [src] through [H.head]!</span>")
-				return 1
+				return TRUE
 		else
 			if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
 				to_chat(user, "<span class='warning'>You can't apply [src] through [H.wear_suit]!</span>")
-				return 1
+				return TRUE
 
 		if(!welding)
 			to_chat(user, "<span class='warning'>You'll need to turn [src] on to patch the damage on [H]'s [S.name]!</span>")
-			return 1
+			return TRUE
 
 		if(S.robo_repair(15, BRUTE, "some dents", src, user))
 			remove_fuel(1, user)
+<<<<<<< HEAD
 			return 1
 		else
 			return 1 //Stops you from accidentally harming someone while on help intent.
+=======
+		return TRUE
+>>>>>>> 02c3aebf2a3... Repairing light robotic damage messaging fix (#8870)
 
 	return ..()
 
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 4460c5bb55e..a1be224cf37 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -461,11 +461,18 @@
 		if("omni")src.heal_damage(repair_amount, repair_amount, 0, 1)
 
 	if(damage_desc)
+		var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching"
 		if(user == src.owner)
 			var/datum/gender/T = gender_datums[user.get_visible_gender()]
+<<<<<<< HEAD
 			user.visible_message("<b>\The [user]</b> patches [damage_desc] on [T.his] [src.name] with [tool].")
 		else
 			user.visible_message("<b>\The [user]</b> patches [damage_desc] on [owner]'s [src.name] with [tool].")
+=======
+			user.visible_message("<span class='notice'>\The [user] [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].</span>")
+		else
+			user.visible_message("<span class='notice'>\The [user] [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].</span>")
+>>>>>>> 02c3aebf2a3... Repairing light robotic damage messaging fix (#8870)
 
 	return 1