diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index dd5fa22a86ad..fb0de25e83f6 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -345,17 +345,27 @@ pixel_x = 8; pixel_y = 6 }, -/obj/item/ammo_box/magazine/illestren_a850r{ - pixel_x = 8; - pixel_y = 2 - }, /obj/item/ammo_box/c38_box{ pixel_x = -6; pixel_y = 1 }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8 + }, /obj/item/ammo_box/magazine/illestren_a850r{ pixel_x = 8; - pixel_y = -2 + pixel_y = -4 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = -6 }, /turf/open/floor/wood/ebony, /area/ship/storage) @@ -2016,9 +2026,10 @@ pixel_x = -7 }, /obj/item/gun/ballistic/revolver/montagne, -/obj/item/ammo_box/c38/match, -/obj/item/ammo_box/c38/match, /obj/item/storage/backpack/satchel/leather, +/obj/item/ammo_box/c45_speedloader, +/obj/item/ammo_box/c45_speedloader, +/obj/item/ammo_box/c45, /turf/open/floor/wood/mahogany, /area/ship/bridge) "zH" = ( diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index c194ea84daea..7b02bd6b19d3 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -238,8 +238,8 @@ /obj/item/storage/toolbox/ammo/a850r/PopulateContents() name = "ammo can (8x50mmR)" icon_state = "ammobox_850" - for(var/i in 1 to 7) - new /obj/item/ammo_box/magazine/illestren_a850r(src) + for(var/i in 1 to 4) + new /obj/item/ammo_box/c8x50mm_box(src) /obj/item/storage/toolbox/ammo/a762_40/PopulateContents() name = "ammo can (7.62x40mm CLIP)" diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index c58035ef95fc..fbd5ddd214dc 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -402,9 +402,9 @@ /obj/item/ammo_box/c8x50mm_box name = "ammo box (8x50mm)" desc = "A box of standard 8x50mm ammo." - icon_state = "8x50mm" + icon_state = "8x50mmbox" ammo_type = /obj/item/ammo_casing/a8_50r - max_ammo = 50 + max_ammo = 20 /obj/item/ammo_box/ferropelletbox name = "ammo box (ferromagnetic pellets)" @@ -429,7 +429,7 @@ /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" + desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration.." + icon_state = "8x50mmbox-hp" ammo_type = /obj/item/ammo_casing/a8_50rhp max_ammo = 20 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 2078c7e25cd4..7149896332b2 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ