[READY] The not so great but pretty alright ammo simplifcation (#9831)

2025-12-11 10:43:20 +00:00 · 2025-01-15 07:28:18 -06:00
parent a6da9bf9bf
commit d0ebe164ac
24 changed files with 2712 additions and 184 deletions
--- a/code/datums/autolathe/arms_ch.dm
+++ b/code/datums/autolathe/arms_ch.dm
@@ -72,6 +72,7 @@
 	path =/obj/item/flamethrower/full
 	hidden = 1

+// anti material rifle rounds
 /datum/category_item/autolathe/arms/rifle_145
 	name = "14.5mm round"
 	path = /obj/item/ammo_casing/a145
@@ -81,6 +82,8 @@
 	name = "14.5mm round (sabot)"
 	path = /obj/item/ammo_casing/a145/highvel
 	hidden = 1
+
+// foam darts
 /datum/category_item/autolathe/arms/foamdart
 	name = "foam dart"
 	path = /obj/item/ammo_casing/afoam_dart
@@ -90,3 +93,247 @@
 	name = "riot foam dart"
 	path = /obj/item/ammo_casing/afoam_dart/riot
 	hidden = 1
+
+/datum/category_item/autolathe/arms/foambox
+	name = "box of foam darts"
+	path = /obj/item/ammo_magazine/ammo_box/foam
+	hidden = 0
+
+/datum/category_item/autolathe/arms/foamboxriot
+	name = "box of riot foam darts"
+	path = /obj/item/ammo_magazine/ammo_box/foam/riot
+	hidden = 1
+
+// Revolver speedloaders
+/datum/category_item/autolathe/arms/speedloader_357
+	name = "speedloader (.357)"
+	path =/obj/item/ammo_magazine/s357
+	hidden = 1
+
+/datum/category_item/autolathe/arms/speedloader_38
+	name = "speedloader (.38)"
+	path =/obj/item/ammo_magazine/s38
+	hidden = 1
+
+/datum/category_item/autolathe/arms/speedloader_38r
+	name = "speedloader (.38 rubber)"
+	path =/obj/item/ammo_magazine/s38/rubber
+
+/datum/category_item/autolathe/arms/speedloader_45
+	name = "speedloader (.45)"
+	path = /obj/item/ammo_magazine/s45
+	hidden = 1
+
+/datum/category_item/autolathe/arms/speedloader_45r
+	name = "speedloader (.45 rubber)"
+	path = /obj/item/ammo_magazine/s45/rubber
+
+// 10mm
+/datum/category_item/autolathe/arms/b10mm
+	name = "ammo box (10mm)"
+	path = /obj/item/ammo_magazine/ammo_box/b10mm
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b10mm/practice
+	name = "ammo box (10mm practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b10mm/practice
+
+/datum/category_item/autolathe/arms/b10mm/rubber
+	name = "ammo box (10mm rubber)"
+	path = /obj/item/ammo_magazine/ammo_box/b10mm/rubber
+
+/datum/category_item/autolathe/arms/b10mm/emp
+	name = "ammo box (10mm haywire)"
+	path = /obj/item/ammo_magazine/ammo_box/b10mm/emp
+	hidden = 1
+
+// .44
+
+/datum/category_item/autolathe/arms/b44
+	name = "ammo box (.44)"
+	path = /obj/item/ammo_magazine/ammo_box/b44
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b44/rubber
+	name = "ammo box (.44 rubber)"
+	path = /obj/item/ammo_magazine/ammo_box/b44/rubber
+
+// .45
+
+/datum/category_item/autolathe/arms/b45
+	name = "ammo box (.45)"
+	path = /obj/item/ammo_magazine/ammo_box/b45
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b45/practice
+	name = "ammo box (.45 Practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b45/practice
+
+/datum/category_item/autolathe/arms/b45/ap
+	name = "ammo box (.45 AP)"
+	path = /obj/item/ammo_magazine/ammo_box/b45/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b45/hp
+	name = "ammo box (.45 HP)"
+	path = /obj/item/ammo_magazine/ammo_box/b45/hp
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b45/rubber
+	name = "ammo box (.45 rubber)"
+	path = /obj/item/ammo_magazine/ammo_box/b45/rubber
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b45/emp
+	name = "ammo box (.45 haywire)"
+	path = /obj/item/ammo_magazine/ammo_box/b45/emp
+	hidden = 1
+
+//12g
+/datum/category_item/autolathe/arms/b12g
+	name = "ammo box (12 gauge slug)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/pellet
+	name = "ammo box (12 gauge buckshot)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/pellet
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/beanbag
+	name = "ammo box (12 gauge beanbag)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/beanbag
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/stunshell
+	name = "ammo box (12 gauge stun)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/emp
+	name = "ammo box (12 gauge EMP)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/beanbag
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/flechette
+	name = "ammo box (12 gauge flechette)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/flechette
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b12g/practice
+	name = "ammo box (12 gauge practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/practice
+
+/datum/category_item/autolathe/arms/b12g/blank
+	name = "ammo box (12 gauge blank)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/blank
+
+/datum/category_item/autolathe/arms/b12g/flash
+	name = "ammo box (12 gauge flash)"
+	path = /obj/item/ammo_magazine/ammo_box/b12g/flash
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b762
+	name = "ammo box (7.62mm)"
+	path = /obj/item/ammo_magazine/ammo_box/b762
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b762/hp
+	name = "ammo box (7.62mm HP)"
+	path = /obj/item/ammo_magazine/ammo_box/b762/hp
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b762/ap
+	name = "ammo box (7.62mm AP)"
+	path = /obj/item/ammo_magazine/ammo_box/b762/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b762/practice
+	name = "ammo box (7.62mm practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b762/practice
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b762/hunter
+	name = "ammo box (7.62mm hunter)"
+	path = /obj/item/ammo_magazine/ammo_box/b762/hunter
+	hidden = 0
+
+/datum/category_item/autolathe/arms/b545
+	name = "ammo box (5.45mm)"
+	path = /obj/item/ammo_magazine/ammo_box/b545
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/ap
+	name = "ammo box (5.45mm AP)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/hp
+	name = "ammo box (5.45mm HP)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/hp
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/practice
+	name = "ammo box (5.45mm practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/practice
+
+/datum/category_item/autolathe/arms/b545/hunter
+	name = "ammo box (5.45mm hunter)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/hunter
+
+/datum/category_item/autolathe/arms/b545/blank
+	name = "ammo box (5.45mm blank)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/blank
+
+/datum/category_item/autolathe/arms/b545/large
+	name = "large ammo box (5.45mm)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/large
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/large/ap
+	name = "large ammo box (5.45mm AP)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/large/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/large/hp
+	name = "large ammo box (5.45mm HP)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/large/hp
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b545/large/practice
+	name = "large ammo box (5.45mm practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/large/practice
+
+/datum/category_item/autolathe/arms/b545/large/hunter
+	name = "large ammo box (5.45mm hunter)"
+	path = /obj/item/ammo_magazine/ammo_box/b545/large/hunter
+	hidden = 1
+
+//9mm
+/datum/category_item/autolathe/arms/b9mm
+	name = "ammo box (9mm)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b9mm/practice
+	name = "ammo box (9mm practice)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm/practice
+
+/datum/category_item/autolathe/arms/b9mm/ap
+	name = "ammo box (9mm AP)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b9mm/hp
+	name = "ammo box (9mm HP)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm/hp
+	hidden = 1
+
+/datum/category_item/autolathe/arms/b9mm/rubber
+	name = "ammo box (9mm rubber)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm/rubber
+
+/datum/category_item/autolathe/arms/b9mm/flash
+	name = "ammo box (9mm flash)"
+	path = /obj/item/ammo_magazine/ammo_box/b9mm/flash
+	hidden = 1