diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index f4b3ca39beae..93c0e04dfc2c 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -8,66 +8,52 @@ /datum/supply_pack/ammo/co9mm_mag name = "9mm Commander Magazine Crate" - desc = "Contains three 9mm magazines for the standard-issue Commander pistol, each containing ten rounds." - contains = list(/obj/item/ammo_box/magazine/co9mm, - /obj/item/ammo_box/magazine/co9mm, - /obj/item/ammo_box/magazine/co9mm) - cost = 1500 + desc = "Contains a 9mm magazine for the standard-issue Commander pistol, containing ten rounds." + contains = list(/obj/item/ammo_box/magazine/co9mm,) + cost = 500 /datum/supply_pack/ammo/m45_mag name = ".45 ACP Candor Magazine Crate" - desc = "Contains three .45 ACP magazines for the Candor pistol, each containing eight rounds." - contains = list(/obj/item/ammo_box/magazine/m45, - /obj/item/ammo_box/magazine/m45, - /obj/item/ammo_box/magazine/m45) - cost = 1500 + desc = "Contains a .45 ACP magazine for the Candor pistol, containing eight rounds." + contains = list(/obj/item/ammo_box/magazine/m45) + cost = 500 /datum/supply_pack/ammo/m45_speedloader name = ".45 ACP Speedloader Crate" - desc = "Contains four .45 ACP speedloaders for revolvers, each containing six rounds." - contains = list(/obj/item/ammo_box/c45_speedloader, - /obj/item/ammo_box/c45_speedloader, - /obj/item/ammo_box/c45_speedloader, - /obj/item/ammo_box/c45_speedloader) - cost = 1500 + desc = "Contains a .45 ACP speedloader for revolvers, containing six rounds." + contains = list(/obj/item/ammo_box/c45_speedloader) + cost = 400 /datum/supply_pack/ammo/c38_mag name = ".38 Speedloader Crate" - desc = "Contains four .38 speedloaders for revolvers, each containing six rounds." - contains = list(/obj/item/ammo_box/c38, - /obj/item/ammo_box/c38, - /obj/item/ammo_box/c38, - /obj/item/ammo_box/c38) - cost = 1500 + desc = "Contains a .38 speedloader for revolvers, containing six rounds." + contains = list(/obj/item/ammo_box/c38) + cost = 350 /datum/supply_pack/ammo/m10mm_mag name = "10mm Stechkin Magazine Crate" - desc = "Contains three 10mm magazines for the stechkin pistol, each containing eight rounds." - contains = list(/obj/item/ammo_box/magazine/m10mm, - /obj/item/ammo_box/magazine/m10mm, - /obj/item/ammo_box/magazine/m10mm) - cost = 1500 + desc = "Contains a 10mm magazine for the stechkin pistol, containing eight rounds." + contains = list(/obj/item/ammo_box/magazine/m10mm) + cost = 500 /datum/supply_pack/ammo/a357_mag name = ".357 Speedloader Crate" - desc = "Contains two .357 speedloaders for revolvers, each containing seven rounds." + desc = "Contains a .357 speedloader for revolvers, containing seven rounds." contains = list(/obj/item/ammo_box/a357, /obj/item/ammo_box/a357) cost = 1500 /datum/supply_pack/ammo/mag_556mm name = "5.56 Pistole C Magazine Crate" - desc = "Contains two 5.56mm magazines for the Pistole C, each containing twelve rounds." - contains = list(/obj/item/ammo_box/magazine/pistol556mm, - /obj/item/ammo_box/magazine/pistol556mm) - cost = 1500 + desc = "Contains a 5.56mm magazine for the Pistole C, containing twelve rounds." + contains = list(/obj/item/ammo_box/magazine/pistol556mm) + cost = 750 /datum/supply_pack/ammo/fms_mag name = "Ferromagnetic Slug Magazine Crate" - desc = "Contains two ferromagnetic slug magazines for the Model H pistol, each containing ten rounds." - contains = list(/obj/item/ammo_box/magazine/modelh, - /obj/item/ammo_box/magazine/modelh) - cost = 1500 + desc = "Contains a ferromagnetic slug magazine for the Model H pistol, containing ten rounds." + contains = list(/obj/item/ammo_box/magazine/modelh) + cost = 750 /* Shotgun ammo @@ -91,7 +77,7 @@ /datum/supply_pack/ammo/winchester_ammo name = "Flaming Arrow and Detective Special .38 Ammo Boxes" - desc = "Contains two 30 round ammo boxes for refilling .38 weapons." + desc = "Contains a 30 round ammo boxes for refilling .38 weapons." cost = 500 contains = list(/obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box) @@ -119,11 +105,9 @@ /datum/supply_pack/ammo/wt550_ammo name = "WT-550 Auto Rifle Ammo Crate" - desc = "Contains three 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads." - cost = 2250 - contains = list(/obj/item/ammo_box/magazine/wt550m9, - /obj/item/ammo_box/magazine/wt550m9, - /obj/item/ammo_box/magazine/wt550m9) + desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads." + cost = 750 + contains = list(/obj/item/ammo_box/magazine/wt550m9) /datum/supply_pack/ammo/cool_wt550_ammo name = "WT-550 Auto Rifle Exotic Ammo Crate" @@ -134,10 +118,9 @@ /datum/supply_pack/ammo/smgm45ammo name = ".45 Cobra Ammo Crate" - desc = "Contains two .45 magazines for the Cobra-20, each containing 24 rounds." - cost = 1500 - contains = list(/obj/item/ammo_box/magazine/smgm45, - /obj/item/ammo_box/magazine/smgm45) + desc = "Contains a .45 magazine for the Cobra-20, containing 24 rounds." + cost = 750 + contains = list(/obj/item/ammo_box/magazine/smgm45) /* Rifle ammo @@ -145,54 +128,45 @@ /datum/supply_pack/ammo/gal308_ammo name = "CM-GAL .308 Magazine Crate" - desc = "Contains two .308 CM-GAL magazines for the CM-GAL rifle, each containing ten rounds." - contains = list(/obj/item/ammo_box/magazine/gal, - /obj/item/ammo_box/magazine/gal,) - cost = 2500 + desc = "Contains a .308 CM-GAL magazine for the CM-GAL rifle, containing ten rounds." + contains = list(/obj/item/ammo_box/magazine/gal) + cost = 1000 /datum/supply_pack/ammo/gar_ammo name = "GAR Ferromagnetic Lance Magazine Crate" - desc = "Contains two ferromagnetic lance magazines for the GAR rifle, each containing thirty two rounds." - contains = list(/obj/item/ammo_box/magazine/gar, - /obj/item/ammo_box/magazine/gar) - cost = 2000 + desc = "Contains a ferromagnetic lance magazine for the GAR rifle, containing thirty two rounds." + contains = list(/obj/item/ammo_box/magazine/gar) + cost = 1000 /datum/supply_pack/ammo/claris_ammo name = "Claris Ferromagnetic Pellet Speedloader Crate" - desc = "Contains two ferromagnetic pellet speedloaders for the Claris rifle, each containing twenty two rounds." - contains = list(/obj/item/ammo_box/amagpellet_claris, - /obj/item/ammo_box/amagpellet_claris) - cost = 2000 + desc = "Contains a ferromagnetic pellet speedloader for the Claris rifle, containing twenty two rounds." + contains = list(/obj/item/ammo_box/amagpellet_claris) + cost = 1000 /datum/supply_pack/ammo/ebr_ammo name = "M514 EBR .308 Magazine Crate" - desc = "Contains two .308 magazines for the M514 EBR rifle, each containing ten rounds." - contains = list(/obj/item/ammo_box/magazine/ebr, - /obj/item/ammo_box/magazine/ebr) - cost = 2000 + desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds." + contains = list(/obj/item/ammo_box/magazine/ebr) + cost = 1000 /datum/supply_pack/ammo/skm_ammo name = "SKM 7.62x40mm CLIP Magazine Crate" - desc = "Contains two 7.62x40mm magazines for the SKM rifles, each containing twenty rounds." - contains = list(/obj/item/ammo_box/magazine/skm_762_40, - /obj/item/ammo_box/magazine/skm_762_40) - cost = 2000 + desc = "Contains a 7.62x40mm magazine for the SKM rifles, containing twenty rounds." + contains = list(/obj/item/ammo_box/magazine/skm_762_40) + cost = 1000 /datum/supply_pack/ammo/p16_ammo name = "P-16 5.56mm Magazine Crate" - desc = "Contains two 5.56mm magazines for the P-16 rifle, each containing thirty rounds." - contains = list(/obj/item/ammo_box/magazine/p16, - /obj/item/ammo_box/magazine/p16) - cost = 2000 + desc = "Contains a 5.56mm magazine for the P-16 rifle, containing thirty rounds." + contains = list(/obj/item/ammo_box/magazine/p16) + cost = 1000 /datum/supply_pack/ammo/a850r_ammo name = "8x50mmR En Bloc Clip Crate" - desc = "Contains four 8x50mmR en bloc clips for rifles like the illestren rifle, each containing five rounds." - contains = list(/obj/item/ammo_box/magazine/illestren_a850r, - /obj/item/ammo_box/magazine/illestren_a850r, - /obj/item/ammo_box/magazine/illestren_a850r, - /obj/item/ammo_box/magazine/illestren_a850r) - cost = 1000 + desc = "Contains a 8x50mmR en bloc clips for rifles like the illestren rifle, containing five rounds." + contains = list(/obj/item/ammo_box/magazine/illestren_a850r) + cost = 250 /datum/supply_pack/ammo/g36_ammo name = "G-36 5.56mm Magazine Crate" @@ -217,126 +191,144 @@ /datum/supply_pack/ammo/c556mmHITP_ammo_box name = "5.56 Caseless Ammo Box Crate" - desc = "Contains two fifty-round 5.56mm caseless boxes for SolGov sidearms like the Pistole C, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c556mmHITP, - /obj/item/ammo_box/c556mmHITP) - cost = 500 + desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C." + contains = list(/obj/item/ammo_box/c556mmHITP) + cost = 250 /datum/supply_pack/ammo/c45_ammo_box name = ".45 Ammo Box Crate" - desc = "Contains two fifty-round .45 boxes for pistols and SMGs like the M1911 or the C-20r, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c45, - /obj/item/ammo_box/c45) - cost = 500 + desc = "Contains a fifty-round .45 box for pistols and SMGs like the M1911 or the C-20r." + contains = list(/obj/item/ammo_box/c45) + cost = 250 /datum/supply_pack/ammo/c10mm_ammo_box name = "10mm Ammo Box Crate" - desc = "Contains two fifty-round 10mm boxes for pistols and SMGs like the Stechkin or the SkM-44(k), for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c10mm, - /obj/item/ammo_box/c10mm) - cost = 500 + desc = "Contains a fifty-round 10mm box for pistols and SMGs like the Stechkin or the SkM-44(k)." + contains = list(/obj/item/ammo_box/c10mm) + cost = 250 /datum/supply_pack/ammo/c9mm_ammo_box name = "9mm Ammo Box Crate" - desc = "Contains two fifty-round 9mm boxes for pistols and SMGs such as the Commander or Saber, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c9mm, - /obj/item/ammo_box/c9mm) - cost = 500 + desc = "Contains a fifty-round 9mm box for pistols and SMGs such as the Commander or Saber." + contains = list(/obj/item/ammo_box/c9mm) + cost = 250 /datum/supply_pack/ammo/a308_ammo_box name = "308 Ammo Box Crate" - desc = "Contains one thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S." + desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S." contains = list(/obj/item/ammo_box/a308) cost = 500 /datum/supply_pack/ammo/c9mmap_ammo_box name = "9mm AP Ammo Box Crate" - desc = "Contains two fifty-round 9mm boxes loaded with armor piercing ammo, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c9mm/ap, - /obj/item/ammo_box/c9mm/ap) - cost = 1000 + desc = "Contains a fifty-round 9mm box loaded with armor piercing ammo." + contains = list(/obj/item/ammo_box/c9mm/ap) + cost = 500 /datum/supply_pack/ammo/c556mmHITPap_ammo_box name = "5.56 caseless AP Ammo Box Crate" - desc = "Contains two fifty-round 5.56mm caseless boxes loaded with armor piercing ammo, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c556mmHITP/ap, - /obj/item/ammo_box/c556mmHITP/ap) - cost = 1000 + desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo." + contains = list(/obj/item/ammo_box/c556mmHITP/ap) + cost = 500 /datum/supply_pack/ammo/c45ap_ammo_box name = ".45 AP Ammo Box Crate" - desc = "Contains two fifty-round .45 boxes loaded with armor piercing ammo, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c45/ap, - /obj/item/ammo_box/c45/ap) - cost = 1000 + desc = "Contains a fifty-round .45 box loaded with armor piercing ammo." + contains = list(/obj/item/ammo_box/c45/ap) + cost = 500 /datum/supply_pack/ammo/c10mmap_ammo_box name = "10mm AP Ammo Box Crate" - desc = "Contains two fifty-round 10mm boxes loaded with armor piercing ammo, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c10mm/ap, - /obj/item/ammo_box/c10mm/ap) - cost = 1000 + desc = "Contains a fifty-round 10mm box loaded with armor piercing ammo." + contains = list(/obj/item/ammo_box/c10mm/ap) + cost = 500 /datum/supply_pack/ammo/c9mmhp_ammo_box name = "9mm HP Ammo Box Crate" - desc = "Contains two fifty-round 9mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c9mm/hp, - /obj/item/ammo_box/c9mm/hp) - cost = 1000 + desc = "Contains a fifty-round 9mm box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/ammo_box/c9mm/hp) + cost = 500 /datum/supply_pack/ammo/c10mmhp_ammo_box name = "10mm HP Ammo Box Crate" - desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c10mm/hp, - /obj/item/ammo_box/c10mm/hp) - cost = 1000 + desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/ammo_box/c10mm/hp) + cost = 500 /datum/supply_pack/ammo/c45hp_ammo_box name = ".45 HP Ammo Box Crate" - desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c45/hp, - /obj/item/ammo_box/c45/hp) - cost = 1000 + desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/ammo_box/c45/hp) + cost = 500 /datum/supply_pack/ammo/c556mmhitphp_ammo_box name = "5.56 Caseless HP Ammo Box Crate" - desc = "Contains two fifty-round 5.56mm caseless boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c556mmHITP/hp, - /obj/item/ammo_box/c556mmHITP/hp) - cost = 1000 + desc = "Contains a fifty-round 5.56mm caseless box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/ammo_box/c556mmHITP/hp) + cost = 500 /datum/supply_pack/ammo/c9mmrubber_ammo_box name = "9mm Rubber Ammo Box Crate" - desc = "Contains two fifty-round 9mm boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c9mm/rubbershot, - /obj/item/ammo_box/c9mm/rubbershot) - cost = 500 + desc = "Contains a fifty-round 9mm box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/ammo_box/c9mm/rubbershot) + cost = 250 /datum/supply_pack/ammo/c10mmrubber_ammo_box name = "10mm Rubber Ammo Box Crate" - desc = "Contains two fifty-round 10mm boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c10mm/rubbershot, - /obj/item/ammo_box/c10mm/rubbershot) - cost = 500 + desc = "Contains a fifty-round 10mm box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/ammo_box/c10mm/rubbershot) + cost = 250 /datum/supply_pack/ammo/c45mmrubber_ammo_box name = ".45 Rubber Ammo Box Crate" - desc = "Contains two fifty-round .45 boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c45/rubbershot, - /obj/item/ammo_box/c45/rubbershot) - cost = 500 + desc = "Contains a fifty-round .45 box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/ammo_box/c45/rubbershot) + cost = 250 /datum/supply_pack/ammo/c556HITPrubber_ammo_box name = "5.56 Caseless Rubber Ammo Box Crate" - desc = "Contains two fifty-round 5.56 caseless boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds." - contains = list(/obj/item/ammo_box/c556mmHITP/rubbershot, - /obj/item/ammo_box/c556mmHITP/rubbershot) - cost = 500 + desc = "Contains a fifty-round 5.56 caseless box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/ammo_box/c556mmHITP/rubbershot) + cost = 250 /datum/supply_pack/ammo/guncell name = "Weapon Cell Crate" - desc = "Contains three weapon cells, compatible with laser guns." - contains = list(/obj/item/stock_parts/cell/gun, - /obj/item/stock_parts/cell/gun, - /obj/item/stock_parts/cell/gun) - cost = 1500 + desc = "Contains a weapon cell, compatible with laser guns." + contains = list(/obj/item/stock_parts/cell/gun) + cost = 500 + +/datum/supply_pack/ammo/c46x30mm_boxcrate + name = "4.6x30mm Ammo Box Crate" + desc = "Contains a fifty-round 4.6x30mm box for PDWs such as the WT-550." + contains = list(/obj/item/ammo_box/c46x30mm_box) + cost = 250 + +/datum/supply_pack/ammo/c8x50mm_boxcrate + name = "8x50mm Ammo Box Crate" + desc = "Contains a twenty-round 8x50mm ammo box for rifles such as the Illestren." + contains = list(/obj/item/ammo_box/c8x50mm_box) + cost = 250 + +/datum/supply_pack/ammo/c8x50mm_boxhp_boxcrate + name = "8x50mm Hollow Point Crate" + desc = "Contains a twenty-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/ammo_box/c8x50mmhp_box) + cost = 500 + +/datum/supply_pack/ammo/ferropelletboxcrate + name = "Ferromagnetic Pellet Box Crate" + desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris." + contains = list(/obj/item/ammo_box/ferropelletbox) + cost = 250 + +/datum/supply_pack/ammo/ferroslugboxcrate + name = "Ferromagnetic Slug Box Crate" + desc = "Contains a twenty-round ferromagnetic slug for gauss guns such as the Model-H." + contains = list(/obj/item/ammo_box/ferroslugbox) + cost = 250 + +/datum/supply_pack/ammo/ferrolanceboxcrate + name = "Ferromagnetic Lance Box Crate" + desc = "Contains a fifty-round box for high-powered gauss guns such as the GAR assault rifle." + contains = list(/obj/item/ammo_box/ferrolancebox) + cost = 250 diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 20ecf5011423..832129c7dcc5 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -7,6 +7,14 @@ caliber = "8x50mmR" projectile_type = /obj/projectile/bullet/a8_50r +/obj/item/ammo_casing/a8_50rhp + name = "8x50mmR hollow point bullet casing" + desc = "A 8x50mmR hollow point bullet casing." + icon_state = "rifle-brass-hollow" + caliber = "8x50mmR" + projectile_type = /obj/projectile/bullet/a8_50rhp + + // 8x58mm Caseless (SSG-669C) /obj/item/ammo_casing/caseless/a858 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 0ca9796eefcb..c58035ef95fc 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -391,3 +391,45 @@ custom_materials = list(/datum/material/iron = 15000) w_class = WEIGHT_CLASS_TINY instant_load = TRUE + +/obj/item/ammo_box/c46x30mm_box + name = "ammo box (4.6x30mm)" + desc = "A box of standard 4.6x30mm ammo." + icon_state = "4.6x30mmbox" + ammo_type = /obj/item/ammo_casing/c46x30mm + max_ammo = 50 + +/obj/item/ammo_box/c8x50mm_box + name = "ammo box (8x50mm)" + desc = "A box of standard 8x50mm ammo." + icon_state = "8x50mm" + ammo_type = /obj/item/ammo_casing/a8_50r + max_ammo = 50 + +/obj/item/ammo_box/ferropelletbox + name = "ammo box (ferromagnetic pellets)" + desc = "A box of ferromagnetic pellets." + icon_state = "ferropelletsbox" + ammo_type = /obj/item/ammo_casing/caseless/gauss + max_ammo = 50 + +/obj/item/ammo_box/ferroslugbox + name = "ammo box (ferromagnetic slugs)" + desc = "A box of standard ferromagnetic slugs." + icon_state = "ferroslugsbox" + ammo_type = /obj/item/ammo_casing/caseless/gauss/slug + max_ammo = 20 + +/obj/item/ammo_box/ferrolancebox + name = "ammo box (ferromagnetic lances)" + desc = "A box of standard ferromagnetic lances." + icon_state = "ferrolancesbox" + ammo_type = /obj/item/ammo_casing/caseless/gauss/lance + max_ammo = 50 + +/obj/item/ammo_box/c8x50mmhp_box + name = "ammo box (8x50mm)" + desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of ." + icon_state = "8x50mm-hp" + ammo_type = /obj/item/ammo_casing/a8_50rhp + max_ammo = 20 diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 2cad4160adae..2fd208812a2c 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -31,6 +31,12 @@ damage = 35 armour_penetration = 40 +/obj/projectile/bullet/a8_50rhp + name = "8x50mmR bullet" + speed = 0.3 + damage = 55 + armour_penetration = 0 + // .300 Magnum (Smile Rifle) /obj/projectile/bullet/a300 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 022be8bcedd3..2078c7e25cd4 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ