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

Puts maxHealth instead of hardcoded 100 where it should be (#10405)

Browse Source
This commit is contained in:
Jiří Barouš
2020-10-30 11:31:04 +01:00
committed by GitHub
parent 1f0d3c1fce
commit ccd6a607ab
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -204,7 +204,7 @@ default behaviour is:
/mob/living/proc/updatehealth()
if(status_flags & GODMODE)
health = 100
health = maxHealth
stat = CONSCIOUS
else
health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - getHalLoss()
code/modules/mob/living/silicon/decoy/life.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/mob/living/silicon/decoy/updatehealth()
if(status_flags & GODMODE)
health = 100
health = maxHealth
stat = CONSCIOUS
else
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
code/modules/mob/living/silicon/pai/life.dm
+3 -3
View File
@@ -31,10 +31,10 @@
/mob/living/silicon/pai/updatehealth()
if(status_flags & GODMODE)
health = 100
health = maxHealth
stat = CONSCIOUS
else
health = 100 - getBruteLoss() - getFireLoss()
health = maxHealth - getBruteLoss() - getFireLoss()
/mob/living/silicon/pai/Stat()
..()
@@ -49,4 +49,4 @@
stat(null, "Bot M#$FUN90: MALFUNC--")
if(istype(card.loc, /mob/living/bot/floorbot))
var/mob/living/bot/floorbot/F = card.loc
stat(null, "Metal Count: [F.amount]/[F.maxAmount]")
stat(null, "Metal Count: [F.amount]/[F.maxAmount]")