cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4620 from VOREStation/vplk-misc-fixes-2

Browse Source 
Miscellaneous Small Fixes II
This commit is contained in:
Neerti
2018-01-24 12:32:18 -05:00
committed by GitHub
parent 8ec8b89e10 9d700f5946
commit 84c22eb54a
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/paperwork/paper.dm
View File

@@ -251,7 +251,7 @@
t = replacetext(t, "\[u\]", "<U>")
t = replacetext(t, "\[/u\]", "</U>")
t = replacetext(t, "\[time\]", "[stationtime2text()]")
t = replacetext(t, "\[date\]", "[station_date]")
t = replacetext(t, "\[date\]", "[stationdate2text()]")
t = replacetext(t, "\[large\]", "<font size=\"4\">")
t = replacetext(t, "\[/large\]", "</font>")
if(findtext(t, "\[sign\]"))

7
code/modules/power/sensors/powernet_sensor.dm
View File

@@ -32,6 +32,13 @@
/obj/machinery/power/sensor/proc/auto_set_name()
name = "[name_tag] - Powernet Sensor"
/obj/machinery/power/sensor/Destroy()
. = ..()
// TODO - Switch power_monitor to register deletion events instead of this.
for(var/obj/machinery/computer/power_monitor/PM in world)
if(PM.power_monitor)
PM.power_monitor.refresh_sensors()
// Proc: check_grid_warning()
// Parameters: None
// Description: Checks connected powernet for warnings. If warning is found returns 1