From 2ba85812675eb7fb2b3c234d8bb89a6b07e9e1a0 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 26 Jun 2012 20:36:16 +0100 Subject: [PATCH] Fixes gauze/ointment not being applied to wounds. --- code/game/objects/items/weapons/medical.dm | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm index 145d8220b27..bed678e086b 100644 --- a/code/game/objects/items/weapons/medical.dm +++ b/code/game/objects/items/weapons/medical.dm @@ -87,25 +87,26 @@ MEDICAL user << "\red \The [M] is wounded badly, this item cannot help [t_him]!" return + if (user) + if (M != user) + 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 + var/t_his = "its" + if (user.gender == MALE) + 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].",\ + "\red You bandage your [affecting.display_name] with \the [src].",\ + "You hear gauze being ripped.") + use(1) + if (affecting.heal_damage(src.heal_brute, src.heal_burn)) H.UpdateDamageIcon() - if (user) - if (M != user) - 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 - var/t_his = "its" - if (user.gender == MALE) - 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].",\ - "\red You bandage your [affecting.display_name] with \the [src].",\ - "You hear gauze being ripped.") - use(1) else - user << "Nothing to patch up!" + H.UpdateDamage() M.updatehealth() else