cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8536

Browse Source 
Also removes a bunch of redundant comments
This commit is contained in:
mwerezak
2015-04-27 01:09:33 -04:00
parent 529a0e3fe9
commit 290a7d5000
2 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/nano/modules/power_monitor.dm
View File

@@ -33,9 +33,7 @@
ui.open() ui.open()
ui.set_auto_update(1) ui.set_auto_update(1)
// Proc: refresh_sensors() // Refreshes list of active sensors kept on this computer.
// Parameters: None
// Description: Refreshes list of active sensors kept on this computer.
/obj/nano_module/power_monitor/proc/refresh_sensors() /obj/nano_module/power_monitor/proc/refresh_sensors()
grid_sensors = list() grid_sensors = list()
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
@@ -46,9 +44,7 @@
else else
grid_sensors += S grid_sensors += S
// Proc: Topic() // Allows us to process UI clicks, which are relayed in form of hrefs.
// Parameters: 2 (href, href_list - allows us to process UI clicks)
// Description: Allows us to process UI clicks, which are relayed in form of hrefs.
/obj/nano_module/power_monitor/Topic(href, href_list) /obj/nano_module/power_monitor/Topic(href, href_list)
if(..()) if(..())
return return

30
code/modules/power/sensors/sensor_monitoring.dm
View File

@@ -1,7 +1,4 @@
// POWERNET SENSOR MONITORING CONSOLE // POWERNET SENSOR MONITORING CONSOLE
//
// Last Change 31.12.2014 by Atlantis
//
// Connects to powernet sensors and loads data from them. Shows this data to the user. // Connects to powernet sensors and loads data from them. Shows this data to the user.
// Newly supports NanoUI. // Newly supports NanoUI.
@@ -22,18 +19,14 @@
active_power_usage = 300 active_power_usage = 300
var/obj/nano_module/power_monitor/power_monitor var/obj/nano_module/power_monitor/power_monitor
// Proc: process() // Checks the sensors for alerts. If change (alerts cleared or detected) occurs, calls for icon update.
// Parameters: None
// Description: Checks the sensors for alerts. If change (alerts cleared or detected) occurs, calls for icon update.
/obj/machinery/computer/power_monitor/process() /obj/machinery/computer/power_monitor/process()
var/alert = check_warnings() var/alert = check_warnings()
if(alert != alerting) if(alert != alerting)
alerting = !alerting alerting = !alerting
update_icon() update_icon()
// Proc: update_icon() // Updates icon of this computer according to current status.
// Parameters: None
// Description: Updates icon of this computer according to current status.
/obj/machinery/computer/power_monitor/update_icon() /obj/machinery/computer/power_monitor/update_icon()
if(stat & BROKEN) if(stat & BROKEN)
icon_state = "powerb" icon_state = "powerb"
@@ -46,17 +39,12 @@
return return
icon_state = "power" icon_state = "power"
// Proc: New() // On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
// Parameters: None
// Description: On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
/obj/machinery/computer/power_monitor/New() /obj/machinery/computer/power_monitor/New()
..() ..()
spawn(50) power_monitor = new(src)
power_monitor = new(src)
// Proc: attack_hand() // On user click opens the UI of this computer.
// Parameters: None
// Description: On user click opens the UI of this computer.
/obj/machinery/computer/power_monitor/attack_hand(mob/user) /obj/machinery/computer/power_monitor/attack_hand(mob/user)
add_fingerprint(user) add_fingerprint(user)
@@ -64,16 +52,12 @@
return return
ui_interact(user) ui_interact(user)
// Proc: ui_interact() // Uses dark magic to operate the NanoUI of this computer.
// Parameters: 4 (standard NanoUI parameters)
// Description: Uses dark magic to operate the NanoUI of this computer.
/obj/machinery/computer/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) /obj/machinery/computer/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
power_monitor.ui_interact(user, ui_key, ui, force_open) power_monitor.ui_interact(user, ui_key, ui, force_open)
// Proc: check_warnings() // Verifies if any warnings were registered by connected sensors.
// Parameters: None
// Description: Verifies if any warnings were registered by connected sensors.
/obj/machinery/computer/power_monitor/proc/check_warnings() /obj/machinery/computer/power_monitor/proc/check_warnings()
for(var/obj/machinery/power/sensor/S in power_monitor.grid_sensors) for(var/obj/machinery/power/sensor/S in power_monitor.grid_sensors)
if(S.check_grid_warning()) if(S.check_grid_warning())