From 8fc4e4e7db36884d288bd09007672925c465b2ea Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Tue, 11 Feb 2014 00:14:58 +1300 Subject: [PATCH] Minor tweaks and fixes for airlock equipment - Fixed DP vent pumps not changing direction - Made airlock_sensor more versatile (and backwards compatible with old airlock code) - Added airlock_sensor and access_button airlock subtypes for easier mapping --- .../components/binary_devices/dp_vent_pump.dm | 4 ++-- code/game/machinery/airlock_control.dm | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index f7de10c2a9..ac451871dc 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -154,8 +154,8 @@ if("power_toggle" in signal.data) on = !on - if("set_direction" in signal.data) - pump_direction = text2num(signal.data["set_direction"]) + if("direction" in signal.data) + pump_direction = text2num(signal.data["direction"]) if("checks" in signal.data) pressure_checks = text2num(signal.data["checks"]) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index ae60ec8cb3..6496faade0 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -124,7 +124,8 @@ obj/machinery/airlock_sensor var/id_tag var/master_tag - var/frequency = 1449 + var/frequency = 1379 + var/command = "cycle" var/datum/radio_frequency/radio_connection @@ -145,7 +146,7 @@ obj/machinery/airlock_sensor/attack_hand(mob/user) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal signal.data["tag"] = master_tag - signal.data["command"] = "cycle" + signal.data["command"] = command radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) @@ -183,7 +184,11 @@ obj/machinery/airlock_sensor/New() set_frequency(frequency) +obj/machinery/airlock_sensor/airlock_interior + command = "cycle_interior" +obj/machinery/airlock_sensor/airlock_exterior + command = "cycle_exterior" obj/machinery/access_button icon = 'icons/obj/airlock_machines.dmi' @@ -238,4 +243,12 @@ obj/machinery/access_button/New() ..() if(radio_controller) - set_frequency(frequency) \ No newline at end of file + set_frequency(frequency) + +obj/machinery/access_button/airlock_interior + frequency = 1379 + command = "cycle_interior" + +obj/machinery/access_button/airlock_exterior + frequency = 1379 + command = "cycle_exterior" \ No newline at end of file