cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-01 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1773 from pobiega/master

Browse Source 
Bandaging already bandaged wounds. Fixes issue #1772
This commit is contained in:
Mloc
2012-10-16 01:48:04 -07:00
parent 161ebbbd0c 8991f73efc
commit a9e43389e6
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/game/objects/items/stacks/medical.dm
View File

@@ -9,7 +9,7 @@
else if (M.gender == FEMALE)
t_him = "her"
user << "\red \The [M] is dead, you cannot help [t_him]!"
return
return 1
if (!istype(M))
user << "\red \The [src] cannot be applied to [M]!"
@@ -21,24 +21,6 @@
user << "\red You don't have the dexterity to do this!"
return 1
if (user)
if (M != user)
user.visible_message( \
"\blue [M] has been applied with [src] by [user].", \
"\blue You apply \the [src] to [M]." \
)
else
var/t_himself = "itself"
if (user.gender == MALE)
t_himself = "himself"
else if (user.gender == FEMALE)
t_himself = "herself"
user.visible_message( \
"\blue [M] applied [src] on [t_himself].", \
"\blue You apply \the [src] on yourself." \
)
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/datum/organ/external/affecting = H.get_organ("chest")
@@ -65,16 +47,20 @@
if(src.heal_brute)
if(!affecting.bandage() && !child.bandage())
user << "\red The wounds on this limb have already been bandaged."
return 1
else if(src.heal_burn)
if(!affecting.salve() && !child.salve())
user << "\red The wounds on this limb have already been salved."
return 1
else
if(src.heal_brute)
if(!affecting.bandage())
user << "\red The wounds on this limb have already been bandaged."
return 1
else if(src.heal_burn)
if(!affecting.salve())
user << "\red The wounds on this limb have already been salved."
return 1
H.UpdateDamageIcon()
M.updatehealth()
@@ -82,3 +68,21 @@
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
use(1)
if (user)
if (M != user)
user.visible_message( \
"\blue [M] has been applied with [src] by [user].", \
"\blue You apply \the [src] to [M]." \
)
else
var/t_himself = "itself"
if (user.gender == MALE)
t_himself = "himself"
else if (user.gender == FEMALE)
t_himself = "herself"
user.visible_message( \
"\blue [M] applied [src] on [t_himself].", \
"\blue You apply \the [src] on yourself." \
)