Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
Zonespace27 committed Sep 20, 2023
1 parent 1715ef9 commit fc9551b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/structures/vulture_spotter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@
user.pixel_y = 0

/// Handler for when the scope is being attached to the tripod
/obj/structure/vulture_spotter_tripod/proc/on_scope_attach(mob/user, obj/item/scope)
/obj/structure/vulture_spotter_tripod/proc/on_scope_attach(mob/user, obj/item/device/vulture_spotter_scope/scope)
if(scope_attached)
return

if(istype(scope, /obj/item/vulture_spotter_scope/skillless))
if(istype(scope, /obj/item/device/vulture_spotter_scope/skillless))
skillless = TRUE

user.visible_message(SPAN_NOTICE("[user] attaches [scope] to [src]."), SPAN_NOTICE("You attach [scope] to [src]."))
Expand Down
13 changes: 11 additions & 2 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1217,9 +1217,9 @@ Defined in conflicts.dm of the #defines folder.
/// If the gun should experience scope drift
var/scope_drift = TRUE
/// % chance for the scope to drift on process with a spotter using their scope
var/spotted_drift_chance = 33
var/spotted_drift_chance = 25
/// % chance for the scope to drift on process without a spotter using their scope
var/unspotted_drift_chance = 100
var/unspotted_drift_chance = 90
/// If the scope should use do_afters for adjusting and moving the sight
var/slow_use = TRUE
/// Cooldown for interacting with the scope's adjustment or position
Expand Down Expand Up @@ -3244,6 +3244,8 @@ Defined in conflicts.dm of the #defines folder.
attachment_action_type = /datum/action/item_action/toggle
var/initial_mob_dir = NORTH // the dir the mob faces the moment it deploys the bipod
var/bipod_deployed = FALSE
/// If this should anchor the user while in use
var/heavy_bipod = FALSE

/obj/item/attachable/bipod/New()
..()
Expand Down Expand Up @@ -3309,6 +3311,9 @@ Defined in conflicts.dm of the #defines folder.
if(G.flags_gun_features & GUN_SUPPORT_PLATFORM)
G.remove_firemode(GUN_FIREMODE_AUTOMATIC)

if(heavy_bipod)
user.anchored = FALSE

if(!QDELETED(G))
playsound(user,'sound/items/m56dauto_rotate.ogg', 55, 1)
update_icon()
Expand Down Expand Up @@ -3348,6 +3353,9 @@ Defined in conflicts.dm of the #defines folder.
if(G.flags_gun_features & GUN_SUPPORT_PLATFORM)
G.add_firemode(GUN_FIREMODE_AUTOMATIC)

if(heavy_bipod)
user.anchored = TRUE

else
to_chat(user, SPAN_NOTICE("You retract [src]."))
undeploy_bipod(G)
Expand Down Expand Up @@ -3396,6 +3404,7 @@ Defined in conflicts.dm of the #defines folder.
desc = "A set of rugged telescopic poles to keep a weapon stabilized during firing."
icon_state = "bipod_m60"
attach_icon = "vulture_bipod"
heavy_bipod = TRUE

/obj/item/attachable/burstfire_assembly
name = "burst fire assembly"
Expand Down

0 comments on commit fc9551b

Please sign in to comment.