From de4b485dd42a73ed46f8cc76d9f5262582137511 Mon Sep 17 00:00:00 2001
From: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Date: Fri, 20 Mar 2020 08:25:41 +0100
Subject: [PATCH] =?UTF-8?q?Assemblies,=20TTV=20and=20Electropack=20now=20r?=
 =?UTF-8?q?equire=20you=20to=20hold=20them=20i=E2=80=A6=20(#49987)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Electropack status fix

* Hands check

* Cleanup

* TTV and assemblies hands state
---
 code/game/objects/items/devices/radio/electropack.dm | 12 +-----------
 code/game/objects/items/devices/transfer_valve.dm    |  2 +-
 code/modules/assembly/infrared.dm                    |  2 +-
 code/modules/assembly/proximity.dm                   |  2 +-
 code/modules/assembly/signaler.dm                    |  2 +-
 code/modules/assembly/timer.dm                       |  2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f617e8dc300..de4623298cb 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -85,14 +85,8 @@
 	frequency = new_frequency
 	SSradio.add_object(src, frequency, RADIO_SIGNALER)
 
-/obj/item/electropack/ui_status(mob/user)
-	var/mob/living/carbon/C = user
-	if(C?.back == src)
-		return UI_CLOSE
-	return ..()
-
 /obj/item/electropack/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "electropack", name, ui_x, ui_y, master_ui, state)
@@ -111,10 +105,6 @@
 	if(..())
 		return
 
-	var/mob/living/carbon/C = usr
-	if(C?.back == src)
-		return
-
 	switch(action)
 		if("power")
 			on = !on
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index a30a22b6777..6258d0d41c6 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -194,7 +194,7 @@
 	return
 
 /obj/item/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "transfer_valve", name, ui_x, ui_y, master_ui, state)
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 23de27399b5..4cbd667f600 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -189,7 +189,7 @@
 	return UI_CLOSE
 
 /obj/item/assembly/infra/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "infrared_emitter", name, ui_x, ui_y, master_ui, state)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index b9684f73fd5..2bc4c3e19fc 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -116,7 +116,7 @@
 	return UI_CLOSE
 
 /obj/item/assembly/prox_sensor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "proximity_sensor", name, ui_x, ui_y, master_ui, state)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index d67c8a85bf9..7da4fb7bbc9 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -70,7 +70,7 @@
 	return UI_CLOSE
 
 /obj/item/assembly/signaler/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "signaler", name, ui_x, ui_y, master_ui, state)
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index c43fb260aad..6dda7ff00e0 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -91,7 +91,7 @@
 	return UI_CLOSE
 
 /obj/item/assembly/timer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "timer", name, ui_x, ui_y, master_ui, state)