cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces assignments to health with max_damage

Browse Source 
Except where they were already equal.
This commit is contained in:
mwerezak
2015-05-30 13:29:55 -04:00
parent 217e7b966f
commit f23a656526
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/organs/organ_external.dm
View File

@@ -846,7 +846,7 @@ Note that amputating the affected organ does in fact remove the infection from t
owner.update_body() owner.update_body()
/obj/item/organ/external/proc/get_damage() //returns total damage /obj/item/organ/external/proc/get_damage() //returns total damage
return max(brute_dam + burn_dam - perma_injury, perma_injury) //could use health? return max(brute_dam + burn_dam - perma_injury, perma_injury) //could use max_damage?
/obj/item/organ/external/proc/has_infected_wound() /obj/item/organ/external/proc/has_infected_wound()
for(var/datum/wound/W in wounds) for(var/datum/wound/W in wounds)
@@ -994,7 +994,7 @@ Note that amputating the affected organ does in fact remove the infection from t
name = "upper body" name = "upper body"
limb_name = "chest" limb_name = "chest"
icon_name = "torso" icon_name = "torso"
health = 100 max_damage = 100
min_broken_damage = 35 min_broken_damage = 35
body_part = UPPER_TORSO body_part = UPPER_TORSO
vital = 1 vital = 1
@@ -1010,7 +1010,7 @@ Note that amputating the affected organ does in fact remove the infection from t
name = "lower body" name = "lower body"
limb_name = "groin" limb_name = "groin"
icon_name = "groin" icon_name = "groin"
health = 100 max_damage = 100
min_broken_damage = 35 min_broken_damage = 35
body_part = LOWER_TORSO body_part = LOWER_TORSO
vital = 1 vital = 1
@@ -1024,7 +1024,7 @@ Note that amputating the affected organ does in fact remove the infection from t
limb_name = "l_arm" limb_name = "l_arm"
name = "left arm" name = "left arm"
icon_name = "l_arm" icon_name = "l_arm"
health = 50 max_damage = 50
min_broken_damage = 30 min_broken_damage = 30
body_part = ARM_LEFT body_part = ARM_LEFT
parent_organ = "chest" parent_organ = "chest"
@@ -1044,7 +1044,7 @@ Note that amputating the affected organ does in fact remove the infection from t
limb_name = "l_leg" limb_name = "l_leg"
name = "left leg" name = "left leg"
icon_name = "l_leg" icon_name = "l_leg"
health = 50 max_damage = 50
min_broken_damage = 30 min_broken_damage = 30
body_part = LEG_LEFT body_part = LEG_LEFT
icon_position = LEFT icon_position = LEFT
@@ -1066,7 +1066,6 @@ Note that amputating the affected organ does in fact remove the infection from t
limb_name = "l_foot" limb_name = "l_foot"
name = "left foot" name = "left foot"
icon_name = "l_foot" icon_name = "l_foot"
health = 30
min_broken_damage = 15 min_broken_damage = 15
body_part = FOOT_LEFT body_part = FOOT_LEFT
icon_position = LEFT icon_position = LEFT
@@ -1093,7 +1092,6 @@ Note that amputating the affected organ does in fact remove the infection from t
limb_name = "l_hand" limb_name = "l_hand"
name = "left hand" name = "left hand"
icon_name = "l_hand" icon_name = "l_hand"
health = 30
min_broken_damage = 15 min_broken_damage = 15
body_part = HAND_LEFT body_part = HAND_LEFT
parent_organ = "l_arm" parent_organ = "l_arm"
@@ -1118,7 +1116,7 @@ Note that amputating the affected organ does in fact remove the infection from t
limb_name = "head" limb_name = "head"
icon_name = "head" icon_name = "head"
name = "head" name = "head"
health = 75 max_damage = 75
min_broken_damage = 35 min_broken_damage = 35
body_part = HEAD body_part = HEAD
vital = 1 vital = 1