progress

code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-heavy_sidearm.dm

@@ -19,22 +19,32 @@
 //* Magazines *//
 
 /obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm
-	name = "ammo magazine (NT-7.5-LR)"
-	icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/rifle-heavy-ammo.dmi'
-	icon_state = "magazine"
-	base_icon_state = "magazine"
+	name = "ammo magazine (NT-9-LR)"
+	icon = 'icons/content/factions/corporations/nanotrasen/items/guns/expeditionary/sidearm-heavy-ammo.dmi'
 	rendering_system = GUN_RENDERING_DISABLED
 	ammo_caliber = /datum/ammo_caliber/nt_expeditionary/heavy_sidearm
 	ammo_max = 5
 	ammo_preload = /obj/item/ammo_casing/nt_expeditionary/heavy_sidearm
 
-/obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm/update_overlays()
+/obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm/speedloader
+	name = "speedloader (NT-9-LR)"
+	icon_state = "speedloader-1"
+	base_icon_state = "speedloader"
+
+/obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm/speedloader/update_icon(updates)
+	cut_overlays()
 	. = ..()
 	#warn impl; overlay via "[base_icon_state]-[casing.magazine_state]", shift -2, -2
 
 /obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm/pistol
+	name = "pistol magazine (NT-9-LR)"
+	icon_state = "magazine-5"
+	base_icon_state = "magazine"
 
 /obj/item/ammo_magazine/nt_expeditionary/heavy_sidearm/smg
+	name = "smg magazine (NT-9-LR)"
+	icon_state = "smg-1"
+	base_icon_state = "smg"
 
 #warn impl all
 

code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_rifle.dm

@@ -28,10 +28,19 @@
 	ammo_max = 5
 	ammo_preload = /obj/item/ammo_casing/nt_expeditionary/light_rifle
 
-/obj/item/ammo_magazine/nt_expeditionary/light_rifle/update_overlays()
+/obj/item/ammo_magazine/nt_expeditionary/light_rifle/speedloader
+
+/obj/item/ammo_magazine/nt_expeditionary/light_rifle/speedloader/update_icon(updates)
+	cut_overlays()
 	. = ..()
 	#warn impl; overlay via "[base_icon_state]-[casing.magazine_state]", shift -2, -2
 
+/obj/item/ammo_magazine/nt_expeditionary/light_rifle/magazine
+
+/obj/item/ammo_magazine/nt_expeditionary/light_rifle/magazine/extended
+
+/obj/item/ammo_magazine/nt_expeditionary/light_rifle/magazine/drum
+
 //* Projectiles *//
 
 /obj/projectile/bullet/nt_expeditionary/light_rifle

code/game/content/factions/corporations/nanotrasen/items/guns/nt_expeditionary-light_sidearm.dm

@@ -28,7 +28,10 @@
 	ammo_max = 5
 	ammo_preload = /obj/item/ammo_casing/nt_expeditionary/light_sidearm
 
-/obj/item/ammo_magazine/nt_expeditionary/light_sidearm/update_overlays()
+/obj/item/ammo_magazine/nt_expeditionary/light_sidearm/speedloader
+
+/obj/item/ammo_magazine/nt_expeditionary/light_sidearm/speedloader/update_icon(updates)
+	cut_overlays()
 	. = ..()
 	#warn impl; overlay via "[base_icon_state]-[casing.magazine_state]", shift -2, -2
 

code/modules/projectiles/ammunition/ammo_magazine.dm

@@ -93,8 +93,10 @@
 	//* Rendering
 	/// use default rendering system
 	/// in state mode, we will be "[base_icon_state]-[count]", from 0 to count (0 for empty)
-	/// in segements mode, we will repeatedly add "[base_icon_state]-ammo" with given offsets.
-	/// overlay mode is not supported
+	/// in segments mode, we will repeatedly add "[base_icon_state]-ammo" with given offsets.
+	///
+	/// * overlays moade is not supported;
+	///   todo: in overlays mode, we should be "[base_icon_state]-[count]" from 0 to count, overlaid, while we have ammo
 	var/rendering_system = GUN_RENDERING_DISABLED
 	/// number of states
 	var/rendering_count = 0