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

Mech warning fix (#1180)

Browse Source 
Fixes mech warnings
This commit is contained in:
NanakoAC
2016-11-24 11:40:54 +02:00
committed by skull132
parent ca6dee493e
commit 37e4eb40b0
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+16 -4
View File
@@ -1240,7 +1240,7 @@
set_dir(dir_in)
pr_manage_warnings.resume_sounds(src)
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
if(!hasInternalDamage() && cell.charge >= cell.maxcharge && health >= initial(health))
if(cell && !hasInternalDamage() && cell.charge >= cell.maxcharge && health >= initial(health))
narrator_message(NOMINAL)
return 1
else
@@ -1985,9 +1985,20 @@
process(var/obj/mecha/mecha)
// No cell will kill warnings.
// Makes sense, caution systems are battery powered.
if (!mecha || !mecha.cell)
if (!mecha)
return
if (!mecha.cell)
if((mecha.power_alert_status || mecha.damage_alert_status))
// No cell will kill warnings.
// Makes sense, caution systems are battery powered.
mecha.power_alert_status = 0//cancel the alert status
power_warning_delay = initial(power_warning_delay)//Reset the delay
stop_sound(1, mecha)
mecha.damage_alert_status = 0
damage_warning_delay = initial(damage_warning_delay)//Reset the delay
stop_sound(2, mecha)
return
if (!mecha.power_alert_status && mecha.cell)//If we're in the fine status
@@ -1999,6 +2010,7 @@
//No 'else' here, we want this to run in the same proc if the alert status was just enabled
if (mecha.power_alert_status)//IF we're in either warning status
if (mecha.cell.charge >= (mecha.cell.maxcharge*0.3))//But power has risen back above danger levels
mecha.power_alert_status = 0//cancel the alert status
power_warning_delay = initial(power_warning_delay)//Reset the delay