Skip to content
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

Jump to bottom

Vulture Touchups & Fixes #6379

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Vulture Touchups & Fixes #6379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc330c
small fixes and stuff
Zonespace27 Jun 5, 2024
b5ab01e
slight walking back
Zonespace27 Jun 5, 2024
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
2 changes: 1 addition & 1 deletion code/game/objects/items/pamphlets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
to_chat(user, SPAN_WARNING("You know this already!"))
return FALSE

if(user.job != JOB_SQUAD_MARINE)
if(!(user.job in JOB_SQUAD_ROLES_LIST))
to_chat(user, SPAN_WARNING("Only squad riflemen can use this."))
return FALSE

Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/structures/vulture_spotter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,10 @@
unscope()
scope_attached = FALSE
desc = initial(desc) + " Though, it doesn't seem to have one attached yet."
new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle)
if(skillless)
new /obj/item/device/vulture_spotter_scope/skillless(get_turf(src), bound_rifle)
else
new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle)

/// Handler for user folding up the tripod, picking it up
/obj/structure/vulture_spotter_tripod/proc/fold_up(mob/user)
Expand Down
16 changes: 10 additions & 6 deletions code/modules/projectiles/guns/boltaction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,17 @@

/obj/item/weapon/gun/boltaction/vulture/update_icon()
..()
var/new_icon_state = src::icon_state
if(!current_mag)
new_icon_state += "_e"

icon_state = new_icon_state

if(!bolted)
overlays += "vulture_bolt_open"


/obj/item/weapon/gun/boltaction/vulture/set_gun_config_values() //check that these work
/obj/item/weapon/gun/boltaction/vulture/set_gun_config_values()
..()
set_fire_delay(FIRE_DELAY_TIER_VULTURE)
accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_7
Expand All @@ -192,13 +198,11 @@
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 24, "under_x" = 25, "under_y" = 14, "stock_x" = 11, "stock_y" = 15)

/obj/item/weapon/gun/boltaction/vulture/able_to_fire(mob/user)
. = ..()
if(!.)
return

if(!bypass_trait && !HAS_TRAIT(user, TRAIT_VULTURE_USER))
to_chat(user, SPAN_WARNING("You don't know how to use this!"))
return
return FALSE

return ..()

/obj/item/weapon/gun/boltaction/vulture/Fire(atom/target, mob/living/user, params, reflex, dual_wield)
var/obj/item/attachable/vulture_scope/scope = attachments["rail"]
Expand Down
Loading