Skip to content

Returns BC to the Marine arsenal and removes wield delay from EB #10

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

Open
Ireuldiz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Returns BC to the Marine arsenal and removes wield delay from EB #10

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
3311487
Returns BC to the Marine arsenal and removes wield delay from EB
Ireuldiz Oct 25, 2023
be09113
Merge branch 'master' into attachments
Ireuldiz Oct 28, 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: 11 additions & 0 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,6 +84,17 @@
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: 1 addition & 0 deletions 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 @@ -341,6 +341,7 @@
/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: 1 addition & 0 deletions 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 @@ -315,6 +315,7 @@
/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
1 change: 0 additions & 1 deletion code/modules/projectiles/gun_attachables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ 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