From 40ed092476adba29099f4bf3efdff3f3e222d932 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 6 Aug 2023 07:28:15 -0400 Subject: [PATCH 1/3] Initial --- code/datums/supply_packs/attachments.dm | 11 ----------- .../vendor_types/crew/commanding_officer.dm | 1 - .../machinery/vending/vendor_types/requisitions.dm | 1 - .../vending/vendor_types/squad_prep/squad_prep.dm | 1 - code/modules/projectiles/gun_attachables.dm | 14 ++------------ maps/map_files/New_Varadero/New_Varadero.dmm | 1 - 6 files changed, 2 insertions(+), 27 deletions(-) diff --git a/code/datums/supply_packs/attachments.dm b/code/datums/supply_packs/attachments.dm index 2a812e94cfc1..b685e5c3c37f 100644 --- a/code/datums/supply_packs/attachments.dm +++ b/code/datums/supply_packs/attachments.dm @@ -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( diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index 3d6a48b45daa..fac4182ea5fe 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -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), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index f85657e887a8..cdf64368c8d4 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -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), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 4f10d956ee3c..28cc72a1708e 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -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), diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 2a77a6ba6a68..be6a8bebdef4 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -371,8 +371,9 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/extended_barrel/New() ..() - accuracy_mod = HIT_ACCURACY_MULT_TIER_4 + accuracy_mod = HIT_ACCURACY_MULT_TIER_2 velocity_mod = AMMO_SPEED_TIER_1 + delay_mod = FIRE_DELAY_TIER_10 /obj/item/attachable/heavy_barrel name = "barrel charger" @@ -2522,7 +2523,6 @@ 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." @@ -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." diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 20558b48ac32..4488d13b9bc7 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -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"; From 6f59007254efbd5074d9dbc44e377b2f68861c39 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 6 Aug 2023 08:36:04 -0400 Subject: [PATCH 2/3] EB switcheroo --- code/modules/projectiles/gun_attachables.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index be6a8bebdef4..bb89db3f30d5 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -368,12 +368,12 @@ 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() ..() - accuracy_mod = HIT_ACCURACY_MULT_TIER_2 + accuracy_mod = HIT_ACCURACY_MULT_TIER_4 velocity_mod = AMMO_SPEED_TIER_1 - delay_mod = FIRE_DELAY_TIER_10 /obj/item/attachable/heavy_barrel name = "barrel charger" From 1f929e7d21d1139a94f2e8b8cdbbe3ec6c3a2425 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Mon, 7 Aug 2023 22:51:10 -0400 Subject: [PATCH 3/3] Update gun_attachables.dm --- code/modules/projectiles/gun_attachables.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index bb89db3f30d5..7f6e01045745 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2525,7 +2525,7 @@ Defined in conflicts.dm of the #defines folder. /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"