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

Fixes some more merge issues

Browse Source
This commit is contained in:
cib
2012-08-06 13:48:21 -07:00
parent 9b9d541a25
commit 1f6231c174
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/living/carbon/human/life.dm
View File

@@ -968,19 +968,19 @@
if(D.data["donor"] == src)
B = D
break
var/datum/reagent/nutriment/F = locate() in vessel.reagent_list
if(F != null)
if(F.volume >= 1)
B.volume = max(min(10 + blood_volume,560), 0)
F.volume -= 1
else
//At this point, we dun care which blood we are adding to, as long as they get more blood.
var/blood_regen = 0.5
if(B.volume < 400)
blood_regen = 1
if(B.volume < 200)
blood_regen = 1.5
B.volume = max(min(B.volume + blood_regen,560), 0)
var/blood_regen = 0.5
if(B.volume < 400)
blood_regen = 1
if(B.volume < 200)
blood_regen = 1.5
B.volume = max(min(B.volume + blood_regen,560), 0)
if(blood_volume > 448)

4
code/modules/mob/organ/organ.dm
View File

@@ -388,7 +388,7 @@
proc/update_damages()
brute_dam = 0
burn_dam = 0
status &= ~BLEEDING
status &= ~ORGAN_BLEEDING
for(var/datum/wound/W in wounds)
if(W.damage_type == CUT || W.damage_type == BRUISE)
brute_dam += W.damage
@@ -396,7 +396,7 @@
burn_dam += W.damage
if(W.bleeding && !W.bandaged)
status |= BLEEDING
status |= ORGAN_BLEEDING
proc/update_wounds()
for(var/datum/wound/W in wounds)