Merge pull request #4750 from VOREStation/upstream-merge-5886

[MIRROR] Introduces caseless ammo, and a caseless rifle

code/modules/projectiles/ammunition/magazines.dm

@@ -188,6 +188,21 @@
 	name = "speedloader (.45 AP)"
 	ammo_type = /obj/item/ammo_casing/a45/ap
 
+///////// 5mm Caseless /////////
+
+/obj/item/ammo_magazine/m5mmcaseless
+	name = "prototype rifle magazine (5mm caseless)"
+	ammo_type = /obj/item/ammo_casing/a5mmcaseless
+	icon_state = "caseless-mag"
+	caliber = "5mm caseless"
+	mag_type = MAGAZINE
+	max_ammo = 30
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m5mmcaseless/stun
+	icon_state = "caseless-mag-alt"
+	ammo_type = /obj/item/ammo_casing/a5mmcaseless/stun
+
 ///////// 9mm /////////
 
 /obj/item/ammo_magazine/m9mm

code/modules/projectiles/ammunition/rounds.dm

@@ -52,7 +52,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
 
 /*
- * .50 Action Express
+ * .44
  */
 
 /obj/item/ammo_casing/a44
@@ -322,6 +322,22 @@
 	desc = "A 5.45mm hunting bullet casing."
 	projectile_type = /obj/item/projectile/bullet/rifle/a545/hunter
 
+/*
+ * 5mm Caseless
+ */
+
+/obj/item/ammo_casing/a5mmcaseless
+	desc = "A 5mm solid phoron caseless round."
+	caliber = "5mm caseless"
+	icon_state = "casing" // Placeholder. Should probably be purple.
+	projectile_type = /obj/item/projectile/bullet/pistol // Close enough to be comparable.
+	matter = list(DEFAULT_WALL_MATERIAL = 180)
+	caseless = 1
+
+/obj/item/ammo_casing/a5mmcaseless/stun
+	desc = "A 5mm solid phoron caseless stun round."
+	projectile_type = /obj/item/projectile/energy/electrode // Maybe nerf this considering there's 30 rounds in a mag.
+
 /*
  * Misc
  */