From 3f6b8478ff598af368ece94a97c0343010f463fa Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 21 Apr 2019 17:06:34 +0200 Subject: [PATCH 1/4] Added atmos shortcut for pumps, volume pumps, filters and mixers --- .../components/binary_devices/pump.dm | 34 +++++++++++++++++++ .../components/binary_devices/volume_pump.dm | 34 +++++++++++++++++++ .../components/trinary_devices/filter.dm | 33 ++++++++++++++++++ .../components/trinary_devices/mixer.dm | 34 +++++++++++++++++++ 4 files changed, 135 insertions(+) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 9d21fece1521..cf0ff74e03ca 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -28,6 +28,40 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/binary/pump/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/pump/AICtrlClick() + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/pump/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/pump/AIAltClick() + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() + /obj/machinery/atmospherics/binary/pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index a64c94e7fc52..7480ea45eb5c 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -28,6 +28,40 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/binary/volume_pump/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/AICtrlClick() + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + transfer_rate = MAX_TRANSFER_RATE + update_icon() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/AIAltClick() + transfer_rate = MAX_TRANSFER_RATE + update_icon() + return ..() + /obj/machinery/atmospherics/binary/volume_pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 903f917e0c6e..d0f0075a3bf6 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -22,6 +22,39 @@ Filter types: var/frequency = 0 var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/trinary/filter/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/filter/AICtrlClick() + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/filter/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/filter/AIAltClick() + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() /obj/machinery/atmospherics/trinary/filter/Destroy() if(radio_controller) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 0c64804b6daf..7a962c3626ce 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -12,6 +12,40 @@ //node 3 is the outlet, nodes 1 & 2 are intakes +/obj/machinery/atmospherics/trinary/mixer/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/mixer/AICtrlClick() + on = !on + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/mixer/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() + +/obj/machinery/atmospherics/trinary/mixer/AIAltClick() + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + return ..() + /obj/machinery/atmospherics/trinary/mixer/flipped icon_state = "mmap" flipped = 1 From b00c44d701dbf2c2aa13115de89e2a26853a071a Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 21 Apr 2019 19:27:54 +0200 Subject: [PATCH 2/4] Added ability to rename devices with a pen, sanity checks, reduced code spaghetti --- .../components/binary_devices/pump.dm | 32 ++++++++++++----- .../components/binary_devices/volume_pump.dm | 32 ++++++++++++----- .../components/trinary_devices/filter.dm | 36 ++++++++++++++----- .../components/trinary_devices/mixer.dm | 36 ++++++++++++++----- 4 files changed, 100 insertions(+), 36 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index cf0ff74e03ca..5010fbb5dae5 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -36,13 +36,11 @@ Thus, the two variables affect pump operation are set in New(): return if(!ishuman(usr) && !issilicon(usr)) return - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/binary/pump/AICtrlClick() - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/binary/pump/AltClick(mob/living/user) @@ -53,15 +51,23 @@ Thus, the two variables affect pump operation are set in New(): return if(!ishuman(usr) && !issilicon(usr)) return - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() /obj/machinery/atmospherics/binary/pump/AIAltClick() - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() +/obj/machinery/atmospherics/binary/pump/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/binary/pump/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + /obj/machinery/atmospherics/binary/pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) @@ -237,7 +243,15 @@ Thus, the two variables affect pump operation are set in New(): update_icon() /obj/machinery/atmospherics/binary/pump/attackby(obj/item/W, mob/user, params) - if(!istype(W, /obj/item/wrench)) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the pump.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else if(!istype(W, /obj/item/wrench)) return ..() if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 7480ea45eb5c..ccdc2cb11b6c 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -36,13 +36,11 @@ Thus, the two variables affect pump operation are set in New(): return if(!ishuman(usr) && !issilicon(usr)) return - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/binary/volume_pump/AICtrlClick() - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/binary/volume_pump/AltClick(mob/living/user) @@ -53,15 +51,23 @@ Thus, the two variables affect pump operation are set in New(): return if(!ishuman(usr) && !issilicon(usr)) return - transfer_rate = MAX_TRANSFER_RATE - update_icon() + set_max() return ..() /obj/machinery/atmospherics/binary/volume_pump/AIAltClick() - transfer_rate = MAX_TRANSFER_RATE - update_icon() + set_max() return ..() +/obj/machinery/atmospherics/binary/volume_pump/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/binary/volume_pump/proc/set_max() + if(powered()) + transfer_rate = MAX_TRANSFER_RATE + update_icon() + /obj/machinery/atmospherics/binary/volume_pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) @@ -233,7 +239,15 @@ Thus, the two variables affect pump operation are set in New(): update_icon() /obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/W, mob/user, params) - if(!istype(W, /obj/item/wrench)) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the volume pump.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else if(!istype(W, /obj/item/wrench)) return ..() if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index d0f0075a3bf6..f3e8d5519da9 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -30,13 +30,11 @@ Filter types: return if(!ishuman(usr) && !issilicon(usr)) return - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/trinary/filter/AICtrlClick() - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/trinary/filter/AltClick(mob/living/user) @@ -47,15 +45,23 @@ Filter types: return if(!ishuman(usr) && !issilicon(usr)) return - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() /obj/machinery/atmospherics/trinary/filter/AIAltClick() - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() +/obj/machinery/atmospherics/trinary/filter/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/trinary/filter/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + /obj/machinery/atmospherics/trinary/filter/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) @@ -244,4 +250,16 @@ Filter types: . = TRUE update_icon() - SSnanoui.update_uis(src) \ No newline at end of file + SSnanoui.update_uis(src) + +/obj/machinery/atmospherics/trinary/filter/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the filter.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else + return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 7a962c3626ce..e8ae6d5a7577 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -20,13 +20,11 @@ return if(!ishuman(usr) && !issilicon(usr)) return - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/trinary/mixer/AICtrlClick() - on = !on - update_icon() + toggle() return ..() /obj/machinery/atmospherics/trinary/mixer/AltClick(mob/living/user) @@ -37,19 +35,27 @@ return if(!ishuman(usr) && !issilicon(usr)) return - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() /obj/machinery/atmospherics/trinary/mixer/AIAltClick() - target_pressure = MAX_OUTPUT_PRESSURE - update_icon() + set_max() return ..() /obj/machinery/atmospherics/trinary/mixer/flipped icon_state = "mmap" flipped = 1 +/obj/machinery/atmospherics/trinary/mixer/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/trinary/mixer/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + /obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0) if(flipped) icon_state = "m" @@ -210,4 +216,16 @@ . = TRUE update_icon() - SSnanoui.update_uis(src) \ No newline at end of file + SSnanoui.update_uis(src) + +/obj/machinery/atmospherics/trinary/mixer/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the mixer.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else + return ..() \ No newline at end of file From cc35fb8b0cc2a41b9e4f354b2cb582e7279b8423 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Mon, 22 Apr 2019 18:43:17 +0200 Subject: [PATCH 3/4] Code improvement --- code/ATMOSPHERICS/components/binary_devices/pump.dm | 5 +++-- code/ATMOSPHERICS/components/binary_devices/volume_pump.dm | 5 +++-- code/ATMOSPHERICS/components/trinary_devices/filter.dm | 5 +++-- code/ATMOSPHERICS/components/trinary_devices/mixer.dm | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 5010fbb5dae5..7705efeb7d8b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -29,6 +29,7 @@ Thus, the two variables affect pump operation are set in New(): var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/binary/pump/CtrlClick(mob/living/user) + ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -37,7 +38,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return toggle() - return ..() + return /obj/machinery/atmospherics/binary/pump/AICtrlClick() toggle() @@ -52,7 +53,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return set_max() - return ..() + return /obj/machinery/atmospherics/binary/pump/AIAltClick() set_max() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index ccdc2cb11b6c..b398aa1864f4 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -29,6 +29,7 @@ Thus, the two variables affect pump operation are set in New(): var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/binary/volume_pump/CtrlClick(mob/living/user) + ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -37,7 +38,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return toggle() - return ..() + return /obj/machinery/atmospherics/binary/volume_pump/AICtrlClick() toggle() @@ -52,7 +53,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return set_max() - return ..() + return /obj/machinery/atmospherics/binary/volume_pump/AIAltClick() set_max() diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index f3e8d5519da9..9bb0ca13a2be 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -23,6 +23,7 @@ Filter types: var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/trinary/filter/CtrlClick(mob/living/user) + ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -31,7 +32,7 @@ Filter types: if(!ishuman(usr) && !issilicon(usr)) return toggle() - return ..() + return /obj/machinery/atmospherics/trinary/filter/AICtrlClick() toggle() @@ -46,7 +47,7 @@ Filter types: if(!ishuman(usr) && !issilicon(usr)) return set_max() - return ..() + return /obj/machinery/atmospherics/trinary/filter/AIAltClick() set_max() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index e8ae6d5a7577..5682bd15b91f 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -13,6 +13,7 @@ //node 3 is the outlet, nodes 1 & 2 are intakes /obj/machinery/atmospherics/trinary/mixer/CtrlClick(mob/living/user) + ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -21,7 +22,7 @@ if(!ishuman(usr) && !issilicon(usr)) return toggle() - return ..() + return /obj/machinery/atmospherics/trinary/mixer/AICtrlClick() toggle() @@ -36,7 +37,7 @@ if(!ishuman(usr) && !issilicon(usr)) return set_max() - return ..() + return /obj/machinery/atmospherics/trinary/mixer/AIAltClick() set_max() From fa6a27e3a93c0eea7d59b677dac8a8b0debf5071 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Mon, 22 Apr 2019 18:49:30 +0200 Subject: [PATCH 4/4] Fixes invalid indentation --- code/ATMOSPHERICS/components/binary_devices/pump.dm | 3 +-- code/ATMOSPHERICS/components/binary_devices/volume_pump.dm | 3 +-- code/ATMOSPHERICS/components/trinary_devices/filter.dm | 3 +-- code/ATMOSPHERICS/components/trinary_devices/mixer.dm | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 7705efeb7d8b..df616bcfca6b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -29,7 +29,6 @@ Thus, the two variables affect pump operation are set in New(): var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/binary/pump/CtrlClick(mob/living/user) - ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -38,7 +37,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return toggle() - return + return ..() /obj/machinery/atmospherics/binary/pump/AICtrlClick() toggle() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index b398aa1864f4..723d9de4a498 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -29,7 +29,6 @@ Thus, the two variables affect pump operation are set in New(): var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/binary/volume_pump/CtrlClick(mob/living/user) - ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -38,7 +37,7 @@ Thus, the two variables affect pump operation are set in New(): if(!ishuman(usr) && !issilicon(usr)) return toggle() - return + return ..() /obj/machinery/atmospherics/binary/volume_pump/AICtrlClick() toggle() diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 9bb0ca13a2be..f4909849baf4 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -23,7 +23,6 @@ Filter types: var/datum/radio_frequency/radio_connection /obj/machinery/atmospherics/trinary/filter/CtrlClick(mob/living/user) - ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -32,7 +31,7 @@ Filter types: if(!ishuman(usr) && !issilicon(usr)) return toggle() - return + return ..() /obj/machinery/atmospherics/trinary/filter/AICtrlClick() toggle() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 5682bd15b91f..e7c91172e3bd 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -13,7 +13,6 @@ //node 3 is the outlet, nodes 1 & 2 are intakes /obj/machinery/atmospherics/trinary/mixer/CtrlClick(mob/living/user) - ..() if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -22,7 +21,7 @@ if(!ishuman(usr) && !issilicon(usr)) return toggle() - return + return ..() /obj/machinery/atmospherics/trinary/mixer/AICtrlClick() toggle()