From fbc330c42f00656c872725ec1feb080e31b97ec7 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 4 Jun 2024 19:44:32 -0700 Subject: [PATCH 1/2] small fixes and stuff --- code/game/objects/items/pamphlets.dm | 4 ---- code/game/objects/structures/vulture_spotter.dm | 5 ++++- code/modules/projectiles/guns/boltaction.dm | 16 ++++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index 763d78bd6ea6..495fada71198 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -200,10 +200,6 @@ to_chat(user, SPAN_WARNING("You know this already!")) return FALSE - if(user.job != JOB_SQUAD_MARINE) - to_chat(user, SPAN_WARNING("Only squad riflemen can use this.")) - return FALSE - if(user.has_used_pamphlet && !bypass_pamphlet_limit) to_chat(user, SPAN_WARNING("You've already used a pamphlet!")) return FALSE diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm index 4d8e5d06749b..dc341edf0446 100644 --- a/code/game/objects/structures/vulture_spotter.dm +++ b/code/game/objects/structures/vulture_spotter.dm @@ -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) diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index 16ccb3438e23..a1b8705240a4 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -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 @@ -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"] From b5ab01ef4af51a3ce9b2c42924a9aec591b2261d Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 4 Jun 2024 19:58:33 -0700 Subject: [PATCH 2/2] slight walking back --- code/game/objects/items/pamphlets.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index 495fada71198..027ea796c73b 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -200,6 +200,10 @@ to_chat(user, SPAN_WARNING("You know this already!")) return FALSE + if(!(user.job in JOB_SQUAD_ROLES_LIST)) + to_chat(user, SPAN_WARNING("Only squad riflemen can use this.")) + return FALSE + if(user.has_used_pamphlet && !bypass_pamphlet_limit) to_chat(user, SPAN_WARNING("You've already used a pamphlet!")) return FALSE