From 902a6afce4862f8b41c7a756fca0985ff567614c Mon Sep 17 00:00:00 2001 From: SmokedCyprinid <204276915+SmokedCyprinid@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:56:45 -0400 Subject: [PATCH] Auto-toggle Aimed Shot and Spot Target in hands --- code/game/objects/items/devices/binoculars.dm | 8 +++++++- code/modules/projectiles/guns/specialist/sniper.dm | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index 247c63aab59c..747254d008dd 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -540,7 +540,13 @@ COOLDOWN_START(designator, spotting_cooldown, designator.spotting_cooldown_delay) return TRUE - +/obj/item/device/binoculars/range/designator/spotter/equipped(mob/living/user, slot) + . = ..() + //Toggle Spot Target on equip in hands. Avoids toggle in pockets + if(slot == WEAR_R_HAND || slot == WEAR_L_HAND) + var /datum/action/toggling_action = locate(/datum/action/item_action/specialist/spotter_target) in user.actions + if(toggling_action) + toggling_action.action_activate() //ADVANCED LASER DESIGNATER, was used for WO. /obj/item/device/binoculars/designator name = "advanced laser designator" // Make sure they know this will kill people in the desc below. diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index facc137e3c9e..62623142c45d 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -247,7 +247,13 @@ break return blocked - +/obj/item/weapon/gun/rifle/sniper/equipped(mob/living/user, slot) + . = ..() + //Toggle Aimed Shot on equip in hands. Skips back and armour slot equips + if(slot == WEAR_R_HAND || slot == WEAR_L_HAND) + var /datum/action/toggling_action = locate(/datum/action/item_action/specialist/aimed_shot) in user.actions + if(toggling_action) + toggling_action.action_activate() // Snipers may enable or disable their laser tracker at will. /datum/action/item_action/specialist/toggle_laser