diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 19af05f12af..809567a0a75 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -84,6 +84,7 @@ #define TARGET_DEPT_ENG 5 // These are used by supermatter and supermatter monitor program, mostly for UI updating purposes. Higher should always be worse! +// These are warning defines, they should trigger before the state, not after. #define SUPERMATTER_ERROR -1 // Unknown status, shouldn't happen but just in case. #define SUPERMATTER_INACTIVE 0 // No or minimal energy #define SUPERMATTER_NORMAL 1 // Normal operation diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 0055d513deb..fd031f987c6 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -116,8 +116,8 @@ aw_normal = status_adminwarn_check(SUPERMATTER_NORMAL, aw_normal, "INFO: Supermatter crystal has been energised.(JMP).", FALSE) aw_notify = status_adminwarn_check(SUPERMATTER_NOTIFY, aw_notify, "INFO: Supermatter crystal is approaching unsafe operating temperature.(JMP).", FALSE) aw_warning = status_adminwarn_check(SUPERMATTER_WARNING, aw_warning, "WARN: Supermatter crystal is taking integrity damage!(JMP).", FALSE) - aw_danger = status_adminwarn_check(SUPERMATTER_DANGER, aw_danger, "WARN: Supermatter integrity is below 50%!(JMP).", TRUE) - aw_emerg = status_adminwarn_check(SUPERMATTER_EMERGENCY, aw_emerg, "CRIT: Supermatter integrity is below 25%!(JMP).", FALSE) + aw_danger = status_adminwarn_check(SUPERMATTER_DANGER, aw_danger, "WARN: Supermatter integrity is below 75%!(JMP).", TRUE) + aw_emerg = status_adminwarn_check(SUPERMATTER_EMERGENCY, aw_emerg, "CRIT: Supermatter integrity is below 50%!(JMP).", FALSE) aw_delam = status_adminwarn_check(SUPERMATTER_DELAMINATING, aw_delam, "CRIT: Supermatter is delaminating!(JMP).", TRUE) /obj/machinery/power/supermatter_shard/proc/status_adminwarn_check(var/min_status, var/current_state, var/message, var/send_to_irc = FALSE) @@ -473,4 +473,4 @@ /obj/machinery/power/supermatter_shard/proc/supermatter_zap() playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5) - tesla_zap(src, 10, max(1000,power * damage / explosion_point)) \ No newline at end of file + tesla_zap(src, 10, max(1000,power * damage / explosion_point))