From ccc80105f0a0652e8fd50e29877411d738ec3b7c Mon Sep 17 00:00:00 2001
From: simb11 <84613249+simb11@users.noreply.github.com>
Date: Wed, 4 Sep 2024 16:22:15 +0200
Subject: [PATCH] 111

---
 code/datums/uplinks_items.dm                  |  2 +-
 .../modes_gameplays/nuclear/pinpointer.dm     | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/code/datums/uplinks_items.dm b/code/datums/uplinks_items.dm
index 3953d284456..4e87b514cba 100644
--- a/code/datums/uplinks_items.dm
+++ b/code/datums/uplinks_items.dm
@@ -752,7 +752,7 @@
 	category = "Devices and Tools"
 
 /datum/uplink_item/device_tools/pinpointer
-	name = "Advanced Pinpointer"
+	name = "Improved Pinpointer"
 	desc = "A artisanally modified pinpointer for searching for items that your employers are interested in."
 	item = /obj/item/weapon/pinpointer/highriskitems
 	cost = 2
diff --git a/code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm b/code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm
index f1791db7ff1..514f0c61406 100644
--- a/code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm
@@ -248,19 +248,24 @@
 /obj/item/weapon/pinpointer/highriskitems
 	desc = "A pinpointer designed and configured to search for specific items using a network of quantum signals."
 	origin_tech = "programming=5;bluespace=5"
+	item_action_types = list(/datum/action/item_action/hands_free/toggle_pinpointer_mode)
 
-/obj/item/weapon/pinpointer/highriskitems/verb/toggle_mode()
-	set category = "Object"
-	set name = "Toggle Pinpointer Target"
-	set src in view(1)
+/datum/action/item_action/hands_free/toggle_pinpointer_mode
+	name = "Toggle pinpointer"
+
+/datum/action/item_action/hands_free/toggle_pinpointer_mode/Activate()
+	var/obj/item/weapon/pinpointer/highriskitems/P = target
+	P.toggle_mode()
+
+/obj/item/weapon/pinpointer/highriskitems/proc/toggle_mode()
 	reset_target()
 
 	var/datum/objective/steal/itemlist
 	itemlist = itemlist // To supress a 'variable defined but not used' error.
-	var/targetitem = input("Select item to search for.", "Item Mode Select","") as null|anything in itemlist.possible_items
+	var/targetitem = input("Select item to search for.", "Item Mode Select","") as null|anything in itemlist::possible_items
 	if(!targetitem)
 		return
-	var/obj/item/item_path = itemlist.possible_items[targetitem]
+	var/obj/item/item_path = itemlist::possible_items[targetitem]
 	for(var/obj/item/I in global.possible_items_for_steal)
 		if(!istype(I, item_path))
 			continue
@@ -274,9 +279,6 @@
 		return
 	to_chat(usr, "You set the pinpointer to locate [targetitem]")
 
-	if(mode && target)
-		RegisterSignal(target, list(COMSIG_PARENT_QDELETING), PROC_REF(reset_target))
-
 	return attack_self(usr)
 
 /obj/item/weapon/pinpointer/highriskitems/process()