Skip to content

Commit

Permalink
Attachment nerfs and removals (#4122)
Browse files Browse the repository at this point in the history
# About the pull request

This PR:

Removes the barrel charger from vendors

Removes all benefits other than wield delay mod from the angled grip

Adds wield delay to the extended barrel

# Explain why it's good for the game

Barrel charger is a straight damage increase and rather silly to work
around given how burst works bypassing real fire rate concerns. If you
know, you know. Horrible idea, I am amazed it's been around this long.

Angled grip had zero downside. Now it still has zero downside but isn't
also a ton of accuracy buffs on top of the god-tier lower wield delay.

Extended barrel had zero downside. Now it has a downside.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow
balance: Removed the barrel charger from vendors
balance: Removed all benefits other than wield delay mod from the angled
grip
balance: Added wield delay to extended barrel
/:cl:
  • Loading branch information
morrowwolf authored Aug 8, 2023
1 parent 973714a commit f3fc60e
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 27 deletions.
11 changes: 0 additions & 11 deletions code/datums/supply_packs/attachments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,6 @@
containername = "extended barrel attachment crate"
group = "Attachments"

/datum/supply_packs/muzzle_heavy
name = "barrel charger attachment crate (x2)"
contains = list(
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/heavy_barrel,
)
cost = 30
containertype = /obj/structure/closet/crate
containername = "heavy barrel attachment crate"
group = "Attachments"

/datum/supply_packs/muzzle_compensator
name = "compensator attachment crate (x6)"
contains = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
list("Underbarrel Flamethrower", 15, /obj/item/attachable/attached_gun/flamer, null, VENDOR_ITEM_REGULAR),

list("BARREL ATTACHMENTS", 0, null, null, null),
list("Barrel Charger", 25, /obj/item/attachable/heavy_barrel, null, VENDOR_ITEM_RECOMMENDED),
list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR),
list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 15, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@
/obj/structure/machinery/cm_vending/sorted/attachments/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
list("Barrel Charger", round(scale * 2.5), /obj/item/attachable/heavy_barrel, VENDOR_ITEM_REGULAR),
list("Extended Barrel", round(scale * 6.5), /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("M5 Bayonet", round(scale * 10.5), /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", round(scale * 6.5), /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
/obj/structure/machinery/cm_vending/sorted/attachments/squad/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
list("Barrel Charger", round(scale * 0.9), /obj/item/attachable/heavy_barrel, VENDOR_ITEM_REGULAR),
list("Extended Barrel", round(scale * 2.5), /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", round(scale * 2.5), /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", round(scale * 2.5), /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),
Expand Down
14 changes: 2 additions & 12 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ Defined in conflicts.dm of the #defines folder.
icon_state = "ebarrel"
attach_icon = "ebarrel_a"
hud_offset_mod = -3
wield_delay_mod = WIELD_DELAY_FAST

/obj/item/attachable/extended_barrel/New()
..()
Expand Down Expand Up @@ -2522,10 +2523,9 @@ Defined in conflicts.dm of the #defines folder.
accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_3
scatter_unwielded_mod = SCATTER_AMOUNT_TIER_10


/obj/item/attachable/angledgrip
name = "angled grip"
desc = "An angled foregrip that improves weapon ergonomics and offers less recoil, and faster wielding time. \nHowever, it also increases weapon size."
desc = "An angled foregrip that improves weapon ergonomics resulting in faster wielding time. \nHowever, it also increases weapon size."
icon = 'icons/obj/items/weapons/guns/attachments/under.dmi'
icon_state = "angledgrip"
attach_icon = "angledgrip_a"
Expand All @@ -2534,16 +2534,6 @@ Defined in conflicts.dm of the #defines folder.
slot = "under"
pixel_shift_x = 20

/obj/item/attachable/angledgrip/New()
..()
recoil_mod = -RECOIL_AMOUNT_TIER_4
accuracy_mod = HIT_ACCURACY_MULT_TIER_1
accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_1
scatter_mod = -SCATTER_AMOUNT_TIER_10
scatter_unwielded_mod = SCATTER_AMOUNT_TIER_10



/obj/item/attachable/gyro
name = "gyroscopic stabilizer"
desc = "A set of weights and balances to stabilize the weapon when fired with one hand. Slightly decreases firing speed."
Expand Down
1 change: 0 additions & 1 deletion maps/map_files/New_Varadero/New_Varadero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,6 @@
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
},
/obj/item/attachable/heavy_barrel,
/obj/structure/window/reinforced,
/turf/open/floor/strata{
color = "#5e5d5d";
Expand Down

0 comments on commit f3fc60e

Please sign in to comment.