cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192

Browse Source 
Conflicts:
	code/modules/clothing/head/misc.dm
This commit is contained in:
Cheridan
2014-01-02 10:00:58 -06:00
parent bb9c09df46 248e6e94d7
commit 3a11af405c
24 changed files with 572 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/medical.dm
+3 -3
View File
@@ -64,10 +64,10 @@
affecting = H.get_organ("head")
if (affecting.heal_damage(src.heal_brute, src.heal_burn, 0))
H.update_damage_overlays(0)
if (affecting.heal_damage(src.heal_brute, src.heal_burn, 0))
H.update_damage_overlays(0)
M.updatehealth()
M.updatehealth()
else
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))