Skip to content

Sniping and Spotting QoL #10896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 1, 2025
Merged

Sniping and Spotting QoL #10896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
902a6af
Auto-toggle Aimed Shot and Spot Target in hands
SmokedCyprinid Oct 17, 2025
2fc103b
Merge branch 'cmss13-devs:master' into sniping_qol
SmokedCyprinid Oct 18, 2025
50d0450
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 18, 2025
cfe3f32
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 22, 2025
cf65dff
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 25, 2025
e2fd94d
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 26, 2025
5a7e847
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 29, 2025
693cfa0
Merge branch 'master' into sniping_qol
SmokedCyprinid Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion code/game/objects/items/devices/binoculars.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 7 additions & 1 deletion code/modules/projectiles/guns/specialist/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down