Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

This commit is contained in:
LetterJay
2017-12-16 13:08:50 -06:00
committed by GitHub
parent 715960b324
commit 7af461539f
756 changed files with 10062 additions and 11368 deletions
@@ -17,7 +17,7 @@
var/target_state = AIRLOCK_STATE_CLOSED
var/sensor_pressure = null
/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal)
/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param)
var/receive_tag = signal.data["tag"]
if(!receive_tag)
return
@@ -68,17 +68,19 @@
state = AIRLOCK_STATE_CLOSED
process_again = 1
else
post_signal(new /datum/signal(list(
"tag" = interior_door_tag,
"command" = "secure_close"
)))
var/datum/signal/signal = new
signal.data["tag"] = interior_door_tag
signal.data["command"] = "secure_close"
post_signal(signal)
else
if(memory["pump_status"] != "off")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"power" = 0,
"sigtype" = "command"
)))
"sigtype"="command"
)
post_signal(signal)
if(AIRLOCK_STATE_PRESSURIZE)
if(target_state < state)
@@ -87,15 +89,16 @@
state = AIRLOCK_STATE_INOPEN
process_again = 1
else
post_signal(new /datum/signal(list(
"tag" = interior_door_tag,
"command" = "secure_open"
)))
var/datum/signal/signal = new
signal.data["tag"] = interior_door_tag
signal.data["command"] = "secure_open"
post_signal(signal)
else
var/datum/signal/signal = new(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"sigtype" = "command"
))
"sigtype"="command"
)
if(memory["pump_status"] == "siphon")
signal.data["stabalize"] = 1
else if(memory["pump_status"] != "release")
@@ -111,27 +114,29 @@
state = AIRLOCK_STATE_DEPRESSURIZE
process_again = 1
else
post_signal(new /datum/signal(list(
"tag" = interior_door_tag,
"command" = "secure_close"
)))
var/datum/signal/signal = new
signal.data["tag"] = interior_door_tag
signal.data["command"] = "secure_close"
post_signal(signal)
else if(target_state < state)
if(memory["exterior_status"] == "closed")
state = AIRLOCK_STATE_PRESSURIZE
process_again = 1
else
post_signal(new /datum/signal(list(
"tag" = exterior_door_tag,
"command" = "secure_close"
)))
var/datum/signal/signal = new
signal.data["tag"] = exterior_door_tag
signal.data["command"] = "secure_close"
post_signal(signal)
else
if(memory["pump_status"] != "off")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"power" = 0,
"sigtype" = "command"
)))
"sigtype"="command"
)
post_signal(signal)
if(AIRLOCK_STATE_DEPRESSURIZE)
var/target_pressure = ONE_ATMOSPHERE*0.05
@@ -143,10 +148,10 @@
if(memory["exterior_status"] == "open")
state = AIRLOCK_STATE_OUTOPEN
else
post_signal(new /datum/signal(list(
"tag" = exterior_door_tag,
"command" = "secure_open"
)))
var/datum/signal/signal = new
signal.data["tag"] = exterior_door_tag
signal.data["command"] = "secure_open"
post_signal(signal)
else if(target_state < state)
state = AIRLOCK_STATE_CLOSED
process_again = 1
@@ -154,10 +159,12 @@
state = AIRLOCK_STATE_CLOSED
process_again = 1
else
var/datum/signal/signal = new(list(
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.data = list(
"tag" = airpump_tag,
"sigtype" = "command"
))
"sigtype"="command"
)
if(memory["pump_status"] == "release")
signal.data["purge"] = 1
else if(memory["pump_status"] != "siphon")
@@ -174,17 +181,19 @@
state = AIRLOCK_STATE_CLOSED
process_again = 1
else
post_signal(new /datum/signal(list(
"tag" = exterior_door_tag,
"command" = "secure_close"
)))
var/datum/signal/signal = new
signal.data["tag"] = exterior_door_tag
signal.data["command"] = "secure_close"
post_signal(signal)
else
if(memory["pump_status"] != "off")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"power" = 0,
"sigtype" = "command"
)))
"sigtype"="command"
)
post_signal(signal)
memory["sensor_pressure"] = sensor_pressure
memory["processing"] = state != target_state
@@ -200,7 +209,7 @@
name = "airlock console"
density = FALSE
frequency = FREQ_AIRLOCK_CONTROL
frequency = 1449
power_channel = ENVIRON
// Setup parameters only
@@ -284,4 +293,4 @@
</div>
[state_options]"}
return output
return output
@@ -11,7 +11,7 @@
/datum/computer/file/embedded_program/proc/receive_user_command(command)
/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal)
/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param)
return null
/datum/computer/file/embedded_program/process()
@@ -43,9 +43,13 @@
/obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line)
return 0
/obj/machinery/embedded_controller/receive_signal(datum/signal/signal)
if(istype(signal) && program)
program.receive_signal(signal)
/obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param)
if(!signal || signal.encryption)
return
if(program)
program.receive_signal(signal, receive_method, receive_param)
//spawn(5) program.process() //no, program.process sends some signals and machines respond and we here again and we lag -rastaf0
/obj/machinery/embedded_controller/Topic(href, href_list)
if(..())
@@ -5,27 +5,34 @@
/datum/computer/file/embedded_program/simple_vent_controller/receive_user_command(command)
switch(command)
if("vent_inactive")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"sigtype" = "command",
"power" = 0
)))
"sigtype"="command"
)
signal.data["power"] = 0
post_signal(signal)
if("vent_pump")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.data = list(
"tag" = airpump_tag,
"sigtype" = "command",
"stabalize" = 1,
"power" = 1
)))
"sigtype"="command"
)
signal.data["stabalize"] = 1
signal.data["power"] = 1
post_signal(signal)
if("vent_clear")
post_signal(new /datum/signal(list(
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.data = list(
"tag" = airpump_tag,
"sigtype" = "command",
"purge" = 1,
"power" = 1
)))
"sigtype"="command"
)
signal.data["purge"] = 1
signal.data["power"] = 1
post_signal(signal)
/datum/computer/file/embedded_program/simple_vent_controller/process()
return 0
@@ -38,7 +45,7 @@
name = "vent controller"
density = FALSE
frequency = FREQ_ATMOS_CONTROL
frequency = 1229
power_channel = ENVIRON
// Setup parameters only