cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10837 from mwerezak/brainloss-fix

Browse Source 
Fixes adjustBrainLoss
This commit is contained in:
Zuhayr
2015-08-24 15:24:12 +09:30
parent 1a7b0e33a4 5bcede5801
commit ddcf7ec282
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -30,7 +30,6 @@
var/obj/item/organ/brain/sponge = internal_organs_by_name["brain"] var/obj/item/organ/brain/sponge = internal_organs_by_name["brain"]
if(sponge) if(sponge)
sponge.take_damage(amount) sponge.take_damage(amount)
sponge.damage = min(max(brainloss, 0),(maxHealth*2))
brainloss = sponge.damage brainloss = sponge.damage
else else
brainloss = 200 brainloss = 200

7
code/modules/organs/organ.dm
View File

@@ -193,14 +193,15 @@ var/list/organ_cache = list()
W.damage += damage W.damage += damage
W.time_inflicted = world.time W.time_inflicted = world.time
//Note: external organs have their own version of this proc
/obj/item/organ/proc/take_damage(amount, var/silent=0) /obj/item/organ/proc/take_damage(amount, var/silent=0)
if(src.status & ORGAN_ROBOT) if(src.status & ORGAN_ROBOT)
src.damage += (amount * 0.8) src.damage = between(0, src.damage + (amount * 0.8), max_damage)
else else
src.damage += amount src.damage = between(0, src.damage + amount, max_damage)
//only show this if the organ is not robotic //only show this if the organ is not robotic
if(owner && parent_organ) if(owner && parent_organ && amount > 0)
var/obj/item/organ/external/parent = owner.get_organ(parent_organ) var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(parent && !silent) if(parent && !silent)
owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1) owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)