diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm index 49664272fa0..f711f46b54e 100644 --- a/code/modules/projectiles/boxes_magazines/external/lmg.dm +++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm @@ -31,4 +31,4 @@ /obj/item/ammo_box/magazine/mm712x82/update_icon_state() . = ..() - icon_state = "a762-[round(ammo_count(), 10)]" + icon_state = "a762-[min(round(ammo_count(), 10), 50)]" //Min is used to prevent high capacity magazines from attempting to get sprites with larger capacities diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 9d3da094f20..73777a622b1 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -11,21 +11,21 @@ /obj/item/ammo_box/magazine/m10mm/fire name = "pistol magazine (10mm incendiary)" - icon_state = "9x19pI-8" + icon_state = "9x19pI" base_icon_state = "9x19pI" desc = "A gun magazine. Loaded with rounds which ignite the target." ammo_type = /obj/item/ammo_casing/c10mm/fire /obj/item/ammo_box/magazine/m10mm/hp name = "pistol magazine (10mm HP)" - icon_state = "9x19pH-8" + icon_state = "9x19pH" base_icon_state = "9x19pH" desc= "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing." ammo_type = /obj/item/ammo_casing/c10mm/hp /obj/item/ammo_box/magazine/m10mm/ap name = "pistol magazine (10mm AP)" - icon_state = "9x19pA-8" + icon_state = "9x19pA" base_icon_state = "9x19pA" desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets." ammo_type = /obj/item/ammo_casing/c10mm/ap @@ -51,25 +51,22 @@ multiple_sprite_use_base = TRUE /obj/item/ammo_box/magazine/m9mm/fire - //name = "pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original - name = "pistol magazine (9x25mm incendiary)" // SKYRAT EDIT: Calibre rename - icon_state = "9x19pI-8" + name = "pistol magazine (9mm incendiary)" + icon_state = "9x19pI" base_icon_state = "9x19pI" desc = "A gun magazine. Loaded with rounds which ignite the target." ammo_type = /obj/item/ammo_casing/c9mm/fire /obj/item/ammo_box/magazine/m9mm/hp - //name = "pistol magazine (9mm HP)" // SKYRAT EDIT: Original - name = "pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename - icon_state = "9x19pH-8" + name = "pistol magazine (9mm HP)" + icon_state = "9x19pH" base_icon_state = "9x19pH" desc= "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing." ammo_type = /obj/item/ammo_casing/c9mm/hp /obj/item/ammo_box/magazine/m9mm/ap - //name = "pistol magazine (9mm AP)" // SKYRAT EDIT: Original - name = "pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename - icon_state = "9x19pA-8" + name = "pistol magazine (9mm AP)" + icon_state = "9x19pA" base_icon_state = "9x19pA" desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets." ammo_type = /obj/item/ammo_casing/c9mm/ap diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index c7846419043..a4d9bacad89 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -8,7 +8,7 @@ /obj/item/ammo_box/magazine/m10mm/rifle/update_icon_state() . = ..() - icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]" + icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]" /obj/item/ammo_box/magazine/m556 name = "toploader magazine (5.56mm)" diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index f9b7a4fe83a..398df79771a 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -13,25 +13,25 @@ /obj/item/ammo_box/magazine/m12g/stun name = "shotgun magazine (12g taser slugs)" - icon_state = "m12gs" + base_icon_state = "m12gs" ammo_type = /obj/item/ammo_casing/shotgun/stunslug /obj/item/ammo_box/magazine/m12g/slug name = "shotgun magazine (12g slugs)" - icon_state = "m12gb" //this may need an unique sprite + base_icon_state = "m12gsl" ammo_type = /obj/item/ammo_casing/shotgun /obj/item/ammo_box/magazine/m12g/dragon name = "shotgun magazine (12g dragon's breath)" - icon_state = "m12gf" + base_icon_state = "m12gf" ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath /obj/item/ammo_box/magazine/m12g/bioterror name = "shotgun magazine (12g bioterror)" - icon_state = "m12gt" + base_icon_state = "m12gt" ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror /obj/item/ammo_box/magazine/m12g/meteor name = "shotgun magazine (12g meteor slugs)" - icon_state = "m12gbc" + base_icon_state = "m12gbc" ammo_type = /obj/item/ammo_casing/shotgun/meteorslug diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index f45494f7c90..a4e2489bdfa 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -56,7 +56,7 @@ /obj/item/ammo_box/magazine/smgm9mm name = "SMG magazine (9mm)" - icon_state = "smg9mm-42" + icon_state = "smg9mm" base_icon_state = "smg9mm" ammo_type = /obj/item/ammo_casing/c9mm caliber = CALIBER_9MM @@ -64,7 +64,7 @@ /obj/item/ammo_box/magazine/smgm9mm/update_icon_state() . = ..() - icon_state = "[base_icon_state]-[ammo_count() ? 42 : 0]" + icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]" /obj/item/ammo_box/magazine/smgm9mm/ap name = "SMG magazine (Armour Piercing 9mm)" diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm index f972461de8a..7503cd032f6 100644 --- a/code/modules/projectiles/boxes_magazines/external/toy.dm +++ b/code/modules/projectiles/boxes_magazines/external/toy.dm @@ -5,14 +5,14 @@ /obj/item/ammo_box/magazine/toy/smg name = "foam force SMG magazine" - icon_state = "smg9mm-42" + icon_state = "smg9mm" base_icon_state = "smg9mm" ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 20 /obj/item/ammo_box/magazine/toy/smg/update_icon_state() . = ..() - icon_state = "[base_icon_state]-[ammo_count() ? 42 : 0]" + icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]" /obj/item/ammo_box/magazine/toy/smg/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi index dedbeb7a7d0..90ea778c6a4 100644 Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ