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/ATMOSPHERICS/components/omni_devices/mixer.dm
View File

@@ -52,7 +52,7 @@
/obj/machinery/atmospherics/omni/mixer/Destroy() /obj/machinery/atmospherics/omni/mixer/Destroy()
inputs.Cut() inputs.Cut()
output = null output = null
..() . = ..()
/obj/machinery/atmospherics/omni/mixer/sort_ports() /obj/machinery/atmospherics/omni/mixer/sort_ports()
for(var/datum/omni_port/P in ports) for(var/datum/omni_port/P in ports)

2
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
View File

@@ -244,7 +244,7 @@
P.node.disconnect(src) P.node.disconnect(src)
qdel(P.network) qdel(P.network)
P.node = null P.node = null
ports = null
. = ..() . = ..()
/obj/machinery/atmospherics/omni/atmos_init() /obj/machinery/atmospherics/omni/atmos_init()

6
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -106,8 +106,6 @@
/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0) /obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
if(!check_icon_cache()) if(!check_icon_cache())
return return
if (!node)
use_power = 0
overlays.Cut() overlays.Cut()
@@ -122,10 +120,10 @@
if(welded) if(welded)
vent_icon += "weld" vent_icon += "weld"
else if(!powered()) else if(!use_power || !node || (stat & (NOPOWER|BROKEN)))
vent_icon += "off" vent_icon += "off"
else else
vent_icon += "[use_power ? "[pump_direction ? "out" : "in"]" : "off"]" vent_icon += "[pump_direction ? "out" : "in"]"
overlays += icon_manager.get_atmos_icon("device", , , vent_icon) overlays += icon_manager.get_atmos_icon("device", , , vent_icon)

2
code/controllers/subsystems/garbage.dm
View File

@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(garbage)
#endif #endif
var/type = D.type var/type = D.type
var/datum/qdel_item/I = items[type] var/datum/qdel_item/I = items[type]
testing("GC: -- \ref[src] | [type] was unable to be GC'd --") testing("GC: -- \ref[D] | [type] was unable to be GC'd --")
I.failures++ I.failures++
if (GC_QUEUE_HARDDELETE) if (GC_QUEUE_HARDDELETE)
HardDelete(D) HardDelete(D)

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, "\[/u\]", "</U>") t = replacetext(t, "\[/u\]", "</U>")
t = replacetext(t, "\[time\]", "[stationtime2text()]") 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 size=\"4\">")
t = replacetext(t, "\[/large\]", "</font>") t = replacetext(t, "\[/large\]", "</font>")
if(findtext(t, "\[sign\]")) 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() /obj/machinery/power/sensor/proc/auto_set_name()
name = "[name_tag] - Powernet Sensor" 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() // Proc: check_grid_warning()
// Parameters: None // Parameters: None
// Description: Checks connected powernet for warnings. If warning is found returns 1 // Description: Checks connected powernet for warnings. If warning is found returns 1