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

Attachment nerfs and removals #4122

Merged
merged 3 commits into from
Aug 8, 2023
Merged

Attachment nerfs and removals #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40ed092
Initial
morrowwolf Aug 6, 2023
6f59007
EB switcheroo
morrowwolf Aug 6, 2023
1f929e7
Update gun_attachables.dm
morrowwolf Aug 8, 2023
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
11 changes: 0 additions & 11 deletions code/datums/supply_packs/attachments.dm
View file
Open in desktop
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
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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