TGS Test Merge (#6685)

code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm

@@ -33,6 +33,7 @@
 
 /obj/item/ammo_magazine/a5_7mm
 	ammo_caliber = /datum/ammo_caliber/a5_7mm
+	ammo_preload = /obj/item/ammo_casing/a5_7mm
 
 /obj/item/ammo_magazine/a5_7mm/nt_les
 	name = "magazine (5.7x28mm)"

code/modules/projectiles/ammunition/calibers/special/dart.dm

@@ -6,12 +6,13 @@
 /obj/item/ammo_casing/dart/chemdart
 	name = "chemical dart"
 	desc = "A casing containing a small hardened, hollow dart."
-	icon_state = "dartcasing"
+	icon_state = "dart"
 	caliber = /datum/ammo_caliber/dart
 	projectile_type = /obj/projectile/bullet/chemdart
 
 /obj/item/ammo_casing/dart/chemdart/small
 	name = "short chemical dart"
+	icon_state = "dartsmall"
 	desc = "A casing containing a small hardened, hollow dart."
 	projectile_type = /obj/projectile/bullet/chemdart/small
 
@@ -21,6 +22,7 @@
 	name = "dart cartridge"
 	desc = "A rack of hollow darts."
 
+	icon = 'icons/modules/projectiles/magazines/darts.dmi'
 	icon_state = "darts-5"
 	base_icon_state = "darts"
 	rendering_system = GUN_RENDERING_STATES
@@ -30,7 +32,7 @@
 	origin_tech = list(TECH_MATERIAL = 2)
 	magazine_type = MAGAZINE_TYPE_NORMAL
 	ammo_caliber = /datum/ammo_caliber/dart
-	ammo_type = /obj/item/ammo_casing/dart/chemdart
+	ammo_preload = /obj/item/ammo_casing/dart/chemdart
 	ammo_max = 5
 
 /obj/item/ammo_magazine/chemdart/small
@@ -43,7 +45,7 @@
 	rendering_count = 3
 
 	origin_tech = list(TECH_MATERIAL = 2)
-	ammo_type = /obj/item/ammo_casing/dart/chemdart/small
+	ammo_preload = /obj/item/ammo_casing/dart/chemdart/small
 	ammo_max = 3
 
 //* Projectiles *//