From 18b3d72f372f7d884fe69facad649f3886144d53 Mon Sep 17 00:00:00 2001 From: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:57:45 -0500 Subject: [PATCH] Small changes --- code/modules/awaymissions/loot_vr.dm | 5 ++--- .../projectiles/ammunition/ammo_boxes.dm | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 0e150d2e446..4569c0aec87 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -145,7 +145,6 @@ prob(8);/obj/item/weapon/gun/projectile/automatic/c20r,\ prob(8);/obj/item/weapon/gun/projectile/automatic/stg,\ prob(8);/obj/item/weapon/melee/energy/sword,\ - /* prob(8);/obj/item/weapon/gun/projectile/automatic/m41a,\ */ prob(7);/obj/item/weapon/gun/energy/captain,\ prob(7);/obj/item/weapon/gun/energy/sniperrifle,\ prob(7);/obj/item/weapon/gun/projectile/automatic/p90,\ @@ -197,10 +196,10 @@ prob(4);/obj/item/ammo_magazine/m9mmt/rubber,\ prob(4);/obj/item/ammo_magazine/m10mm,\ prob(4);/obj/item/ammo_magazine/m9mmp90,\ - /* prob(4);/obj/item/ammo_magazine/m14,\ - prob(4);/obj/item/ammo_magazine/m14/large,\*/ prob(4);/obj/item/ammo_magazine/m545/ext, prob(4);/obj/item/ammo_magazine/m762,\ + prob(4);/obj/item/ammo_magazine/ammo_box/b762/surplus/hunter,\ + prob(4);/obj/item/ammo_magazine/ammo_box/b762/surplus,\ prob(4);/obj/item/ammo_magazine/m545/ext,\ prob(3);/obj/item/ammo_magazine/ammo_box/b10mm/emp,\ prob(3);/obj/item/ammo_magazine/ammo_box/b10mm,\ diff --git a/code/modules/projectiles/ammunition/ammo_boxes.dm b/code/modules/projectiles/ammunition/ammo_boxes.dm index 7a9b0fbb154..012f10cb557 100644 --- a/code/modules/projectiles/ammunition/ammo_boxes.dm +++ b/code/modules/projectiles/ammunition/ammo_boxes.dm @@ -419,7 +419,7 @@ max_ammo = 8 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b762/blank +/obj/item/ammo_magazine/ammo_box/b762/surplus/blank name = "ammo wrap (7.62mm blank)" desc = "A paper wrap of 7.62mm blank rounds" icon_state = "paper_wrap" @@ -429,6 +429,16 @@ max_ammo = 8 multiple_sprites = 1 +/obj/item/ammo_magazine/ammo_box/b762/surplus/hunter + name = "ammo wrap (7.62mm hunter)" + desc = "A paper wrap of 7.62mm hunter rounds" + icon_state = "paper_wrap" + caliber = "7.62mm" + ammo_type = /obj/item/ammo_casing/a762/hunter + matter = list(MAT_STEEL = 1600) + max_ammo = 8 + multiple_sprites = 1 + /* * 5.45mm */ @@ -493,7 +503,7 @@ max_ammo = 30 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b545 +/obj/item/ammo_magazine/ammo_box/b545/large name = "ammo box (5.45mm)" desc = "A steel box of 5.45mm rounds" icon_state = "boxhrifle" @@ -503,7 +513,7 @@ max_ammo = 100 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b545/ap +/obj/item/ammo_magazine/ammo_box/b545/large/ap name = "ammo box (5.45mm AP)" desc = "A steel box of 5.45mm armor-piercing rounds" icon_state = "boxhrifle-ap" @@ -513,7 +523,7 @@ max_ammo = 100 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b545/hp +/obj/item/ammo_magazine/ammo_box/b545/large/hp name = "ammo box (5.45mm HP)" desc = "A steel box of 5.45mm hollow-point rounds" icon_state = "boxhrifle-hp" @@ -523,7 +533,7 @@ max_ammo = 100 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b545/practice +/obj/item/ammo_magazine/ammo_box/b545/large/practice name = "ammo box (5.45mm practice)" desc = "A steel box of 5.45mm practice rounds" icon_state = "boxhrifle-practice" @@ -533,7 +543,7 @@ max_ammo = 100 multiple_sprites = 1 -/obj/item/ammo_magazine/ammo_box/b545/hunter +/obj/item/ammo_magazine/ammo_box/b545/large/hunter name = "ammo box (5.45mm hunter)" desc = "A steel box of 5.45mm hunter rounds" icon_state = "boxhrifle-hunter"