From 0b8bae86ae82d10f9655da6c97784a1d8d0c2e6a Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 17 Feb 2013 17:35:46 +0400 Subject: [PATCH] Only bandaging bleeding wounds would cause itching. Bruise packs give out different message during treatment depending on type and severity of wound. --- code/game/objects/items/stacks/medical.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 56a8181f846..3c66e61d80a 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -42,8 +42,19 @@ user << "\red The wounds on [M]'s [affecting.display_name] have already been bandaged." return 1 else - user.visible_message( "\blue [user] bandages wounds on [M]'s [affecting.display_name].", \ - "\blue You bandage wounds on [M]'s [affecting.display_name]." ) + for (var/datum/wound/W in affecting.wounds) + if (W.internal) + continue + if (W.current_stage <= W.max_bleeding_stage) + user.visible_message( "\blue [user] bandages [W.desc] on [M]'s [affecting.display_name].", \ + "\blue You bandage [W.desc] on [M]'s [affecting.display_name]." ) + H.add_side_effect("Itch") + else if (istype(W,/datum/wound/bruise)) + user.visible_message( "\blue [user] places bruise patch over [W.desc] on [M]'s [affecting.display_name].", \ + "\blue You place bruise patch over [W.desc] on [M]'s [affecting.display_name]." ) + else + user.visible_message( "\blue [user] places bandaid over [W.desc] on [M]'s [affecting.display_name].", \ + "\blue You place bandaid over [W.desc] on [M]'s [affecting.display_name]." ) else if(src.heal_burn) if(!affecting.salve()) @@ -53,7 +64,6 @@ user.visible_message( "\blue [user] salves wounds on [M]'s [affecting.display_name].", \ "\blue You salve wounds on [M]'s [affecting.display_name]." ) - H.add_side_effect("Itch") H.UpdateDamageIcon() else M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))