From 7a8f5ec38efc8872cb3445501b923e76cbf16871 Mon Sep 17 00:00:00 2001
From: unknown <comma@nano.(none)>
Date: Thu, 5 Jul 2012 15:08:12 +0300
Subject: [PATCH] Makes ointment give different message from gauze when
 applied. No more 'bandaging with ointment' (Issue #1430)

---
 code/game/objects/items/weapons/medical.dm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm
index e827156a11c..214330cd104 100644
--- a/code/game/objects/items/weapons/medical.dm
+++ b/code/game/objects/items/weapons/medical.dm
@@ -8,6 +8,8 @@ MEDICAL
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
 	var/heal_cap = 50
+	var/ointment = istype(src, /obj/item/stack/medical/advanced/ointment) \
+				||   istype(src, /obj/item/stack/medical/ointment)
 
 	if(istype(src, /obj/item/stack/medical/advanced))
 		heal_cap = 0
@@ -89,7 +91,12 @@ MEDICAL
 
 		if (user)
 			if (M != user)
-				user.visible_message("\red \The [H]'s [affecting.display_name] has been bandaged with \a [src] by \the [user].",\
+				if ( ointment )
+					user.visible_message("\red \The [H]'s [affecting.display_name] burns has been salved with \a [src] by \the [user].",\
+					"\red You salve \the [H]'s [affecting.display_name] burns with \the [src].",\
+					"ou hear ointement being applied.")
+				else
+					user.visible_message("\red \The [H]'s [affecting.display_name] has been bandaged with \a [src] by \the [user].",\
 					"\red You bandage \the [H]'s [affecting.display_name] with \the [src].",\
 					"You hear gauze being ripped.")
 			else
@@ -98,7 +105,12 @@ MEDICAL
 					t_his = "his"
 				else if (user.gender == FEMALE)
 					t_his = "her"
-				user.visible_message("\red \The [user] bandages [t_his] [affecting.display_name] with \a [src].",\
+				if ( ointment )
+					user.visible_message("\red \The [user] salves [t_his] [affecting.display_name] burns with \a [src].",\
+					"\red You salve your [affecting.display_name] burns with \the [src].",\
+					"You hear ointement being applied.")
+				else
+					user.visible_message("\red \The [user] bandages [t_his] [affecting.display_name] with \a [src].",\
 					"\red You bandage your [affecting.display_name] with \the [src].",\
 					"You hear gauze being ripped.")
 		use(1)
@@ -109,6 +121,7 @@ MEDICAL
 			H.UpdateDamage()
 
 		M.updatehealth()
+
 	else
 		if (M.health < heal_cap)
 			var/t_him = "it"