cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes organ damage and pulse (#7521)

Browse Source 
Fixes organ damage and pulse
This commit is contained in:
Matt Atlas
2019-11-27 23:15:11 +02:00
committed by Erki
parent 173822fad7
commit f088260110
6 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/_internal.dm
-4
View File
@@ -97,10 +97,6 @@
..()
handle_regeneration()
/obj/item/organ/internal/proc/heal_damage(amount)
if (can_recover())
damage = between(0, damage - round(amount, 0.1), max_damage)
/obj/item/organ/internal/proc/handle_regeneration()
if(!damage || BP_IS_ROBOTIC(src) || !owner || owner.chem_effects[CE_TOXIN])
return
code/modules/organs/organ.dm
+4
View File
@@ -246,6 +246,10 @@
/obj/item/organ/proc/rejuvenate()
damage = 0
/obj/item/organ/proc/heal_damage(amount)
if (can_recover())
damage = between(0, damage - round(amount, 0.1), max_damage)
/obj/item/organ/proc/is_broken()
return (damage >= min_broken_damage || (status & ORGAN_CUT_AWAY) || (status & ORGAN_BROKEN))
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -344,7 +344,7 @@
droplimb(0, DROPLIMB_EDGE)
/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
/obj/item/organ/external/heal_damage(brute, burn, internal = 0, robo_repair = 0)
if(status & ORGAN_ROBOT && !robo_repair)
return