From c30502ac580319da13a086699a7d13dc2e990edf Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 5 Aug 2023 16:04:44 -0700 Subject: [PATCH] Revert "ammo economy rework" This reverts commit ccc6fffe81a279e1cccc251aa22aabc870c21793. --- code/datums/supply_packs/ammo.dm | 2 ++ code/datums/supply_packs/weapons.dm | 13 +++++++++++++ .../vending/vendor_types/crew/pilot_officer.dm | 12 ++++++++---- .../vending/vendor_types/crew/vehicle_crew.dm | 2 ++ .../vending/vendor_types/intelligence_officer.dm | 2 ++ .../vending/vendor_types/requisitions.dm | 6 ++++++ .../vendor_types/squad_prep/squad_engineer.dm | 2 ++ .../vendor_types/squad_prep/squad_leader.dm | 2 ++ .../vendor_types/squad_prep/squad_medic.dm | 2 ++ .../vendor_types/squad_prep/squad_prep.dm | 4 ++++ .../vendor_types/squad_prep/squad_rifleman.dm | 2 ++ .../vending/vendor_types/squad_prep/squad_tl.dm | 2 ++ code/game/objects/items/storage/backpack.dm | 2 +- .../structures/crates_lockers/largecrate.dm | 4 ++-- .../modules/projectiles/ammo_boxes/ammo_boxes.dm | 5 +++-- .../projectiles/ammo_boxes/handful_boxes.dm | 1 + .../projectiles/ammo_boxes/magazine_boxes.dm | 16 ++++++++++++++++ 17 files changed, 70 insertions(+), 9 deletions(-) diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 59dfea6c6696..092bf92ecd4e 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -395,6 +395,7 @@ /obj/item/ammo_magazine/rifle, /obj/item/ammo_magazine/rifle, /obj/item/ammo_magazine/rifle, + /obj/item/ammo_magazine/rifle/extended, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/incendiary, /obj/item/ammo_magazine/rifle/m4ra/incendiary, @@ -409,6 +410,7 @@ /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, + /obj/item/ammo_magazine/smg/m39/extended, /obj/item/ammo_magazine/smg/m39/ap, /obj/item/ammo_magazine/smg/m39/ap, /obj/item/ammo_magazine/revolver, diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index ff47cdfe9f3a..a28e0c7191ce 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -86,6 +86,19 @@ group = "Weapons" /datum/supply_packs/gun + contains = list( + /obj/item/weapon/gun/rifle/m41aMK1, + /obj/item/weapon/gun/rifle/m41aMK1, + /obj/item/ammo_magazine/rifle/m41aMK1, + /obj/item/ammo_magazine/rifle/m41aMK1, + ) + name = "M41A MK1 Rifle Crate (x2 MK1, x2 magazines)" + cost = 40 + containertype = /obj/structure/closet/crate/weapon + containername = "M41A MK1 Rifle Crate" + group = "Weapons" + +/datum/supply_packs/gun/heavyweapons contains = list( /obj/item/storage/box/guncase/lmg, /obj/item/storage/box/guncase/lmg, diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 86c8b8542783..231e02bb5118 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -65,11 +65,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - + list("ARMOR (CHOOSE 1)", 0, null, null, null), list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -133,7 +133,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), @@ -151,8 +153,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("ARMOR (CHOOSE 1)", 0, null, null, null), list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), @@ -221,7 +223,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 6f479c33d8c3..023bbe390bfc 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -367,8 +367,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M40 HEDP Grenade", 10, /obj/item/explosive/grenade/high_explosive, null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index f68190a2ec41..829c542f6b26 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -26,7 +26,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list( list("PRIMARY AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, 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 8ba9cedd5c54..f85657e887a8 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -36,6 +36,7 @@ list("MOU-53 Shotgun", round(scale * 2), /obj/item/storage/box/guncase/mou53, VENDOR_ITEM_REGULAR), list("XM88 Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR), list("M41AE2 Heavy Pulse Rifle", round(scale * 2.5), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), + list("M41A Pulse Rifle MK1", round(scale * 3), /obj/item/storage/box/guncase/m41aMK1, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR), list("M2C Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR), list("M240 Incinerator Unit", round(scale * 2), /obj/item/storage/box/guncase/flamer, VENDOR_ITEM_REGULAR), @@ -235,6 +236,9 @@ list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10.5), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine (9mm)", round(scale * 2), /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), + list("EXTENDED AMMUNITION", -1, null, null), + list("M39 Extended Magazine (10x20mm)", round(scale * 9.5) + 3, /obj/item/ammo_magazine/smg/m39/extended, VENDOR_ITEM_REGULAR), + list("M41A MK2 Extended Magazine (10x24mm)", round(scale * 8.1), /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", -1, null, null), list("M56 Battery", 4, /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR), @@ -249,6 +253,8 @@ list("SU-6 Smartpistol Magazine (.45)", round(scale * 12,8), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank", round(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), list("M41AE2 Box Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR), + list("M41A MK1 Magazine (10x24mm)", round(scale * 4.5), /obj/item/ammo_magazine/rifle/m41aMK1, VENDOR_ITEM_REGULAR), + list("M41A MK1 AP Magazine (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/rifle/m41aMK1/ap, VENDOR_ITEM_REGULAR), list("M56D Drum Magazine", round(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 78b3cbfbe5c9..05784ec3c161 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -42,7 +42,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index e4a6e580c00d..fdfdabd8335e 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -73,7 +73,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("SPECIAL AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank (Napthal)", 3, /obj/item/ammo_magazine/flamer_tank, null, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank (B-Gel)", 3, /obj/item/ammo_magazine/flamer_tank/gellied, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 9607f3d76c27..532c8e58dd02 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -63,7 +63,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, 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 d5c8bb74a5a3..9775c20cac33 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 @@ -177,6 +177,10 @@ list("M39 AP Magazine (10x20mm)", round(scale * 3), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), + list("EXTENDED AMMUNITION", -1, null, null), + list("M39 Extended Magazine (10x20mm)", round(scale * 1.8), /obj/item/ammo_magazine/smg/m39/extended, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", round(scale * 1.9), /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), + list("SPECIAL AMMUNITION", -1, null, null), list("M56 Smartgun Drum", 1, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 1188cf66a53b..543288c71706 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -64,7 +64,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 944a9c43627c..4311a3982c86 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -5,7 +5,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR), list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 53c3d2e0f2b4..e36225177d91 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -410,7 +410,7 @@ throw_range = 0 xeno_types = null var/base_icon_state = "ammo_pack" - var/move_delay_mult = 0.6 + var/move_delay_mult = 0.4 /obj/item/storage/backpack/marine/ammo_rack/update_icon() . = ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 2a37e72470b2..2393b5df8265 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -194,12 +194,12 @@ /obj/item/ammo_magazine/pistol, /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/rifle, - /obj/item/ammo_magazine/rifle, + /obj/item/ammo_magazine/rifle/extended, /obj/item/ammo_magazine/shotgun, /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/ammo_magazine/shotgun/flechette, /obj/item/ammo_magazine/smg/m39, - /obj/item/ammo_magazine/smg/m39, + /obj/item/ammo_magazine/smg/m39/extended, ) /obj/structure/largecrate/random/mini/med diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index e08c48260ab6..69179a209f8b 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -45,7 +45,7 @@ /obj/item/ammo_box/proc/deploy_ammo_box(mob/user, turf/T) user.drop_held_item() - + //---------------------FIRE HANDLING PROCS /obj/item/ammo_box/flamer_fire_act(severity, datum/cause_data/flame_cause_data) if(burning) @@ -260,9 +260,10 @@ /obj/item/ammo_box/rounds name = "\improper rifle ammunition box (10x24mm)" - desc = "A 10x24mm ammunition box. Used to refill M41A MK1, MK2, M4RA and M41AE2 HPR magazines." + desc = "A 10x24mm ammunition box. Used to refill M41A MK1, MK2, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back." icon_state = "base_m41" item_state = "base_m41" + flags_equip_slot = SLOT_BACK var/overlay_gun_type = "_rounds" //used for ammo type color overlay var/overlay_content = "_reg" var/default_ammo = /datum/ammo/bullet/rifle diff --git a/code/modules/projectiles/ammo_boxes/handful_boxes.dm b/code/modules/projectiles/ammo_boxes/handful_boxes.dm index 76f11ba4b5aa..28eab8463011 100644 --- a/code/modules/projectiles/ammo_boxes/handful_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/handful_boxes.dm @@ -4,6 +4,7 @@ /obj/item/ammo_box/magazine/shotgun name = "\improper shotgun shell box (Slugs x 100)" icon_state = "base_slug" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "" overlay_gun_type = "_shells" overlay_content = "_slug" diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index a9cd76fd025c..ff90a6659fb2 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -2,6 +2,7 @@ /obj/item/ammo_box/magazine/ap name = "\improper magazine box (AP M41A x 10)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_ap" overlay_content = "_ap" magazine_type = /obj/item/ammo_magazine/rifle/ap @@ -11,6 +12,7 @@ /obj/item/ammo_box/magazine/le name = "\improper magazine box (LE M41A x 10)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_le" overlay_content = "_le" magazine_type = /obj/item/ammo_magazine/rifle/le @@ -20,6 +22,7 @@ /obj/item/ammo_box/magazine/ext name = "\improper magazine box (Ext M41A x 8)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_ext" num_of_magazines = 8 magazine_type = /obj/item/ammo_magazine/rifle/extended @@ -29,6 +32,7 @@ /obj/item/ammo_box/magazine/incen name = "\improper magazine box (Incen M41A x 10)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_incen" overlay_content = "_incen" magazine_type = /obj/item/ammo_magazine/rifle/incendiary @@ -38,6 +42,7 @@ /obj/item/ammo_box/magazine/explosive name = "\improper magazine box (Explosive M41A x 10)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_expl" overlay_content = "_expl" magazine_type = /obj/item/ammo_magazine/rifle/explosive @@ -47,6 +52,7 @@ /obj/item/ammo_box/magazine/heap name = "magazine box (HEAP M41A x 10)" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_heap" overlay_content = "_heap" magazine_type = /obj/item/ammo_magazine/rifle/heap @@ -59,6 +65,7 @@ /obj/item/ammo_box/magazine/m39 name = "\improper magazine box (M39 x 12)" icon_state = "base_m39" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_gun_type = "_m39" overlay_content = "_hv" @@ -119,6 +126,7 @@ /obj/item/ammo_box/magazine/m4ra name = "\improper magazine box (M4RA x 16)" icon_state = "base_m4ra" + flags_equip_slot = SLOT_BACK overlay_gun_type = "_m4ra" num_of_magazines = 16 magazine_type = /obj/item/ammo_magazine/rifle/m4ra @@ -167,6 +175,7 @@ /obj/item/ammo_box/magazine/l42a name = "\improper magazine box (L42A x 16)" icon_state = "base_l42" + flags_equip_slot = SLOT_BACK overlay_gun_type = "_l42" num_of_magazines = 16 magazine_type = /obj/item/ammo_magazine/rifle/l42a @@ -225,6 +234,7 @@ /obj/item/ammo_box/magazine/M16 name = "\improper magazine box (M16 x 12)" icon_state = "base_m16" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_gun_type = "_m16" num_of_magazines = 12 @@ -249,6 +259,7 @@ /obj/item/ammo_box/magazine/m4a3 name = "\improper magazine box (M4A3 x 16)" icon_state = "base_m4a3" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_gun_type = "_m4a3" num_of_magazines = 16 @@ -280,6 +291,7 @@ /obj/item/ammo_box/magazine/m44 name = "\improper speed loaders box (M44 x 16)" icon_state = "base_m44" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_m44_reg" overlay_gun_type = "_m44" overlay_content = "_speed" @@ -310,6 +322,7 @@ /obj/item/ammo_box/magazine/su6 name = "\improper magazine box (SU-6 x 16)" icon_state = "base_su6" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_gun_type = "_su6" num_of_magazines = 16 @@ -323,6 +336,7 @@ /obj/item/ammo_box/magazine/mod88 name = "\improper magazine box (88 Mod 4 AP x 16)" icon_state = "base_mod88" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_ap" overlay_gun_type = "_mod88" overlay_content = "_ap" @@ -337,6 +351,7 @@ /obj/item/ammo_box/magazine/vp78 name = "\improper magazine box (VP78 x 16)" icon_state = "base_vp78" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_gun_type = "_vp78" num_of_magazines = 16 @@ -350,6 +365,7 @@ /obj/item/ammo_box/magazine/type71 name = "\improper magazine box (Type71 x 10)" icon_state = "base_type71" + flags_equip_slot = SLOT_BACK overlay_ammo_type = "_type71_reg" overlay_gun_type = "_type71" overlay_content = "_type71_reg"