From 8a6a33bd4b707f477e826db2453ee2255a5470c7 Mon Sep 17 00:00:00 2001 From: Alffd Date: Mon, 11 Jun 2018 21:11:18 -0400 Subject: [PATCH] Fix non-existant icon status and tablet icon offsets --- code/__DEFINES/machines.dm | 6 +++--- .../programs/engineering/sm_monitor.dm | 6 ++++-- code/modules/power/supermatter/supermatter.dm | 9 ++++++--- icons/obj/modular_tablet.dmi | Bin 3260 -> 3249 bytes 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 35701e7f5b3..19af05f12af 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -89,6 +89,6 @@ #define SUPERMATTER_NORMAL 1 // Normal operation #define SUPERMATTER_NOTIFY 2 // Ambient temp > 80% of CRITICAL_TEMPERATURE #define SUPERMATTER_WARNING 3 // Ambient temp > CRITICAL_TEMPERATURE OR integrity damaged -#define SUPERMATTER_DANGER 4 // Integrity < 50% -#define SUPERMATTER_EMERGENCY 5 // Integrity < 25% -#define SUPERMATTER_DELAMINATING 6 // Pretty obvious. +#define SUPERMATTER_DANGER 4 // Integrity < 75% +#define SUPERMATTER_EMERGENCY 5 // Integrity < 50% +#define SUPERMATTER_DELAMINATING 6 // Pretty obvious, Integrity < 25% diff --git a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm index cd2ad3103db..db9081f6ad1 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm @@ -18,6 +18,8 @@ var/new_status = get_status() if(last_status != new_status) last_status = new_status + if(last_status == SUPERMATTER_ERROR) + last_status = SUPERMATTER_INACTIVE ui_header = "smmon_[last_status].gif" program_icon_state = "smmon_[last_status]" if(istype(computer)) @@ -38,7 +40,7 @@ var/turf/T = get_turf(nano_host()) if(!T) return - for(var/obj/machinery/power/supermatter_shard/S in atmos_machinery) + for(var/obj/machinery/power/supermatter_shard/S in SSair.atmos_machinery) // Delaminating, not within coverage, not on a tile. if(!(is_station_level(S.z) || is_mining_level(S.z) || atoms_share_level(S, T) || !istype(S.loc, /turf/simulated/))) continue @@ -53,7 +55,7 @@ . = max(., S.get_status()) /datum/computer_file/program/supermatter_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) assets.send(user) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index c9ceeb95816..6bd582703d7 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -102,7 +102,7 @@ poi_list |= src //Added to the atmos_machine process as the SM is highly coupled with the atmospherics system. //Having the SM run at a different rate then atmospherics causes odd behavior. - atmos_machinery += src + SSair.atmos_machinery += src radio = new(src) radio.listening = 0 investigate_log("has been created.", "supermatter") @@ -138,7 +138,7 @@ emergency_lighting(0) QDEL_NULL(radio) poi_list.Remove(src) - atmos_machinery -= src + SSair.atmos_machinery -= src return ..() /obj/machinery/power/supermatter_shard/proc/explode() @@ -436,9 +436,12 @@ return SUPERMATTER_ERROR if(get_integrity() < 25) - return SUPERMATTER_EMERGENCY + return SUPERMATTER_DELAMINATING if(get_integrity() < 50) + return SUPERMATTER_EMERGENCY + + if(get_integrity() < 75) return SUPERMATTER_DANGER if((get_integrity() < 100) || (air.temperature > CRITICAL_TEMPERATURE)) diff --git a/icons/obj/modular_tablet.dmi b/icons/obj/modular_tablet.dmi index d1357a58406587949772c857e34781461bf0909f..a6e3223a8d0821e51ebba2a6c8ca49483b01e4c4 100644 GIT binary patch delta 2735 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 P(Dre2_H?Ro3?=;+H!C#? delta 2746 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