cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4951

Browse Source
This commit is contained in:
PJB3005
2015-06-14 18:26:46 +02:00
parent a018562a25
commit 4af5412cb0
7 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/unary/outlet_injector.dm
View File

@@ -109,7 +109,7 @@
set_frequency(frequency)
/obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["type"] && signal.data["type"] != "injector"))
return 0
if("power" in signal.data)

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

@@ -204,7 +204,7 @@
if(stat & (NOPOWER|BROKEN))
return
//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["type"] && signal.data["type"] != "vent"))
return 0
var/handled=0

2
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -217,7 +217,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/receive_signal(datum/signal/signal)
if(stat & (NOPOWER|BROKEN))
return
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["type"] && signal.data["type"] != "scrubber"))
return 0
if(signal.data["power"] != null)

12
code/modules/atmos_automation/implementation/injectors.dm
View File

@@ -7,26 +7,26 @@
var/injector = null
var/state = 0
Export()
/datum/automation/set_injector_power/Export()
var/list/json = ..()
json["injector"] = injector
json["state"] = state
return json
Import(var/list/json)
/datum/automation/set_injector_power/Import(var/list/json)
..(json)
injector = json["injector"]
state = text2num(json["state"])
process()
/datum/automation/set_injector_power/process()
if(injector)
parent.send_signal(list ("tag" = injector, "power"=state))
parent.send_signal(list ("tag" = injector, "power" = state, "type" = "injector"))
return 0
GetText()
/datum/automation/set_injector_power/GetText()
return "Set injector <a href=\"?src=\ref[src];set_injector=1\">[fmtString(injector)]</a> power to <a href=\"?src=\ref[src];toggle_state=1\">[state ? "on" : "off"]</a>."
Topic(href,href_list)
/datum/automation/set_injector_power/Topic(href,href_list)
if(href_list["toggle_state"])
state = !state
parent.updateUsrDialog()

2
code/modules/atmos_automation/implementation/scrubbers.dm
View File

@@ -64,7 +64,7 @@
/datum/automation/set_scrubber_power/process()
if(scrubber)
parent.send_signal(list ("tag" = scrubber, "sigtype"="command", "power"=state), RADIO_FROM_AIRALARM)
parent.send_signal(list ("tag" = scrubber, "sigtype"="command", "power" = state, "type" = "scrubber"), RADIO_FROM_AIRALARM)
/datum/automation/set_scrubber_power/GetText()
return "Set Scrubber <a href=\"?src=\ref[src];set_scrubber=1\">[fmtString(scrubber)]</a> power to <a href=\"?src=\ref[src];set_power=1\">[state ? "on" : "off"]</a>."

2
code/modules/atmos_automation/implementation/vent_pump.dm
View File

@@ -86,7 +86,7 @@
/datum/automation/set_vent_pump_power/process()
if(vent_pump)
parent.send_signal(list ("tag" = vent_pump, "power"=state), filter = (mode ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM))
parent.send_signal(list ("tag" = vent_pump, "power" = state, "type" = "vent"), filter = (mode ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM))
/datum/automation/set_vent_pump_power/GetText()
return "Set <a href=\"?src=\ref[src];toggle_mode=1\">[mode ? "Dual-Port" : "Unary"]</a> vent pump <a href=\"?src=\ref[src];set_vent_pump=1\">[fmtString(vent_pump)]</a> power to <a href=\"?src=\ref[src];set_power=1\">[state ? "on" : "off"]</a>."

1
html/changelogs/PJB3005-muhAAC.yml
View File

@@ -2,3 +2,4 @@ author: PJB3005
delete-after: true
changes:
- bugfix: The AAC's vent pump mode & power automations can now interact with DP vents again.
- bugfix: The AAC's scrubber power automation will no longer toggle the power of vents with the same ID and frequency.