diff --git a/code/datums/emergency_calls/supplies.dm b/code/datums/emergency_calls/supplies.dm index e562680eca..9df32de234 100644 --- a/code/datums/emergency_calls/supplies.dm +++ b/code/datums/emergency_calls/supplies.dm @@ -74,8 +74,8 @@ new /obj/item/attachable/stock/tactical(W) if(6) new /obj/item/weapon/gun/rifle/lmg(W) - new /obj/item/ammo_magazine/rifle/lmg(W) - new /obj/item/ammo_magazine/rifle/lmg(W) + new /obj/item/ammo_magazine/hpr_box(W) + new /obj/item/ammo_magazine/hpr_box(W) new /obj/item/attachable/verticalgrip (W) if(7) new /obj/item/weapon/gun/rifle/l42a(W) diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 164511c25c..8b5462dfbd 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -276,8 +276,8 @@ /datum/supply_packs/ammo_hpr contains = list( - /obj/item/ammo_magazine/rifle/lmg, - /obj/item/ammo_magazine/rifle/lmg, + /obj/item/ammo_magazine/hpr_box, + /obj/item/ammo_magazine/hpr_box, ) name = "M41AE2 HPR Magazines crate (HPR ammo box x2)" cost = 20 @@ -287,8 +287,8 @@ /datum/supply_packs/ammo_hpr_holo contains = list( - /obj/item/ammo_magazine/rifle/lmg/holo_target, - /obj/item/ammo_magazine/rifle/lmg/holo_target, + /obj/item/ammo_magazine/hpr_box/holo_target, + /obj/item/ammo_magazine/hpr_box/holo_target, ) name = "M41AE2 HPR Holo-Target Magazines crate (HPR HT ammo box x2)" cost = 30 @@ -412,7 +412,7 @@ /obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1/ap, /obj/item/ammo_magazine/rifle/m4ra, - /obj/item/ammo_magazine/rifle/lmg, + /obj/item/ammo_magazine/hpr_box, /obj/item/ammo_magazine/pistol, /obj/item/ammo_magazine/pistol, /obj/item/ammo_magazine/pistol, diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index d8907911e9..225c6c684e 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -457,10 +457,10 @@ if(80 to 82) crate = new /obj/structure/closet/crate/ammo(T) choosemax = rand(2, 3) - randomitems = list(/obj/item/ammo_magazine/rifle/lmg/holo_target, - /obj/item/ammo_magazine/rifle/lmg/holo_target, - /obj/item/ammo_magazine/rifle/lmg, - /obj/item/ammo_magazine/rifle/lmg, + randomitems = list(/obj/item/ammo_magazine/hpr_box/holo_target, + /obj/item/ammo_magazine/hpr_box/holo_target, + /obj/item/ammo_magazine/hpr_box, + /obj/item/ammo_magazine/hpr_box, ) if(83 to 86) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 3591a7caec..0298abf8bb 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -242,13 +242,13 @@ list("M44 Heavy Speed Loader (.44)", round(scale * 10.5), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), list("M44 Marksman Speed Loader (.44)", round(scale * 5.7), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine (9mm)", round(scale * 2), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR), - list("M41AE2 Holo Target Rounds (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/rifle/lmg/holo_target, VENDOR_ITEM_REGULAR), + list("M41AE2 Holo Target Rounds (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/hpr_box/holo_target, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARM AMMUNITION", -1, null, null), list("VP78 Magazine", round(scale * 11.2), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), 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("M41AE2 Box Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/hpr_box, 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), diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 36149138a6..3f32e51568 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -497,7 +497,7 @@ /obj/item/storage/pouch/magazine/large/pmc_lmg/fill_preset_inventory() for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/lmg(src) + new /obj/item/ammo_magazine/hpr_box(src) /obj/item/storage/pouch/magazine/large/pmc_sniper/fill_preset_inventory() for(var/i = 1 to storage_slots) diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 61c20e8faa..007f985fbb 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -60,13 +60,13 @@ name = "\improper M41AE2 heavy pulse rifle case" desc = "A plastic hard weapon case containing the M41AE2 Heavy Pulse Rifle and three magazines." storage_slots = 4 - can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg) + can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/hpr_box) /obj/item/storage/box/guncase/lmg/fill_preset_inventory() new /obj/item/weapon/gun/rifle/lmg(src) - new /obj/item/ammo_magazine/rifle/lmg(src) - new /obj/item/ammo_magazine/rifle/lmg(src) - new /obj/item/ammo_magazine/rifle/lmg(src) + new /obj/item/ammo_magazine/hpr_box(src) + new /obj/item/ammo_magazine/hpr_box(src) + new /obj/item/ammo_magazine/hpr_box(src) //------------ /obj/item/storage/box/guncase/m41aMK1 diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 6058ae93ec..944f5e41e3 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -384,8 +384,8 @@ /obj/item/storage/box/kit/heavy_support/fill_preset_inventory() new /obj/item/weapon/gun/rifle/lmg(src) - new /obj/item/ammo_magazine/rifle/lmg(src) - new /obj/item/ammo_magazine/rifle/lmg/holo_target(src) + new /obj/item/ammo_magazine/hpr_box(src) + new /obj/item/ammo_magazine/hpr_box/holo_target(src) new /obj/item/attachable/bipod(src) new /obj/item/stack/folding_barricade/three(src) new /obj/item/clothing/glasses/welding(src) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 0308c8d9e3..d33f4482cf 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -95,9 +95,9 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) spawn_merc_weapon(new_human,1,6) - spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg, new_human, 0, 5) //HPR mini-spec - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) + spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/hpr_box, new_human, 0, 5) //HPR mini-spec + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/holo_target, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/holo_target, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) /datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_shotgunner(mob/living/carbon/human/new_human) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index b868b608d1..f4860287fa 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1240,7 +1240,7 @@ unload_sound = 'sound/weapons/handling/hpr_unload.ogg' fire_sound = "gun_pulse" aim_slowdown = SLOWDOWN_ADS_LMG - current_mag = /obj/item/ammo_magazine/rifle/lmg + current_mag = /obj/item/ammo_magazine/hpr_box attachable_allowed = list( /obj/item/attachable/suppressor, /obj/item/attachable/reddot, diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm index 87568c9532..3c15e83f1f 100644 --- a/code/modules/projectiles/magazines/misc.dm +++ b/code/modules/projectiles/magazines/misc.dm @@ -16,6 +16,36 @@ gun_type = /obj/item/weapon/gun/minigun w_class = SIZE_MEDIUM +//------------------------------------------------------- +//M41AE2 HEAVY PULSE RIFLE + +/obj/item/ammo_magazine/hpr_box + name = "\improper M41AE2 ammo box (10x24mm)" + desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle." + icon_state = "m41ae2" + max_rounds = 300 + gun_type = /obj/item/weapon/gun/rifle/lmg + flags_magazine = AMMUNITION_CANNOT_REMOVE_BULLETS|AMMUNITION_REFILLABLE|AMMUNITION_SLAP_TRANSFER + ammo_band_icon = "+m41ae2_band" + ammo_band_icon_empty = "+m41ae2_band_e" + w_class = SIZE_MEDIUM + reload_delay = 5 + +/obj/item/ammo_magazine/hpr_box/holo_target + name = "\improper M41AE2 ammo box (10x24mm holo-target)" + desc = "A semi-rectangular box of holo-target rounds for the M41AE2 Heavy Pulse Rifle." + default_ammo = /datum/ammo/bullet/rifle/holo_target + max_rounds = 300 + ammo_band_color = AMMO_BAND_COLOR_HOLOTARGETING + +/obj/item/ammo_magazine/hpr_box/heap + name = "\improper M41AE2 HEAP ammo box (10x24mm)" + desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle. This one contains the standard Armor-Piercing explosive tipped round of the USCM." + default_ammo = /datum/ammo/bullet/rifle/heap + max_rounds = 300 + gun_type = /obj/item/weapon/gun/rifle/lmg + ammo_band_color = AMMO_BAND_COLOR_HEAP + //M60 /obj/item/ammo_magazine/m60 diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 1515bb8985..d18471c47f 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -294,36 +294,6 @@ gun_type = /obj/item/weapon/gun/rifle/ar10 w_class = SIZE_MEDIUM -//------------------------------------------------------- -//M41AE2 HEAVY PULSE RIFLE - -/obj/item/ammo_magazine/rifle/lmg - name = "\improper M41AE2 ammo box (10x24mm)" - desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle." - icon_state = "m41ae2" - max_rounds = 300 - gun_type = /obj/item/weapon/gun/rifle/lmg - flags_magazine = AMMUNITION_CANNOT_REMOVE_BULLETS|AMMUNITION_REFILLABLE|AMMUNITION_SLAP_TRANSFER - ammo_band_icon = "+m41ae2_band" - ammo_band_icon_empty = "+m41ae2_band_e" - w_class = SIZE_MEDIUM - reload_delay = 5 - -/obj/item/ammo_magazine/rifle/lmg/holo_target - name = "\improper M41AE2 ammo box (10x24mm holo-target)" - desc = "A semi-rectangular box of holo-target rounds for the M41AE2 Heavy Pulse Rifle." - default_ammo = /datum/ammo/bullet/rifle/holo_target - max_rounds = 300 - ammo_band_color = AMMO_BAND_COLOR_HOLOTARGETING - -/obj/item/ammo_magazine/rifle/lmg/heap - name = "\improper M41AE2 HEAP ammo box (10x24mm)" - desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle. This one contains the standard Armor-Piercing explosive tipped round of the USCM." - default_ammo = /datum/ammo/bullet/rifle/heap - max_rounds = 300 - gun_type = /obj/item/weapon/gun/rifle/lmg - ammo_band_color = AMMO_BAND_COLOR_HEAP - //------------------------------------------------------- //UPP TYPE 71 RIFLE diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index f5aef4f430..200b75430e 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -245,8 +245,8 @@ list("M2C Box Magazine", 0, /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank", 1, /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), list("M41A MK1 Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/m41aMK1, VENDOR_ITEM_REGULAR), - list("M41AE2 Box Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR), - list("M41AE2 Holo Target Rounds (10x24mm)", 0, /obj/item/ammo_magazine/rifle/lmg/holo_target, VENDOR_ITEM_REGULAR), + list("M41AE2 Box Magazine (10x24mm)", 0, /obj/item/ammo_magazine/hpr_box, VENDOR_ITEM_REGULAR), + list("M41AE2 Holo Target Rounds (10x24mm)", 0, /obj/item/ammo_magazine/hpr_box/holo_target, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), list("M44 Marksman Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine (9mm)", 0, /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR), diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index a196e2f20c..c67d6fa67b 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -50725,7 +50725,7 @@ dir = 4 }, /obj/structure/closet/crate/ammo, -/obj/item/ammo_magazine/rifle/lmg/holo_target, +/obj/item/ammo_magazine/hpr_box/holo_target, /obj/item/weapon/gun/rifle/lmg{ current_mag = null },