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

2025-12-10 10:12:45 +00:00 · 2025-01-15 07:28:18 -06:00
parent a6da9bf9bf
commit d0ebe164ac
24 changed files with 2712 additions and 184 deletions
--- a/modular_chomp/code/modules/datums/supplypacks/munitions.dm
+++ b/modular_chomp/code/modules/datums/supplypacks/munitions.dm
@@ -6,10 +6,10 @@
 			/obj/item/clothing/accessory/holster/hip,
 			/obj/item/clothing/accessory/badge/sheriff,
 			/obj/item/clothing/accessory/cowboy_vest,
-			/obj/item/ammo_magazine/s45lc = 2,
+			/obj/item/ammo_magazine/s45 = 2,
 			)
 	cost = 134 // yee haw, also damn you serdy for making me want to add this.
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Cowboy Crate"
 	access = access_armory
-	contraband = 1
+	contraband = 1
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/syndimobs.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/syndimobs.dm
@@ -291,7 +291,7 @@
 	var/explosion_delay_upper	= 1 SECONDS	// Upper bound.


-	loot_list = list(/obj/item/gun/projectile/automatic/serdy/type901 = 1)
+	loot_list = list(/obj/item/gun/projectile/automatic/z8 = 1)

 	projectiletype = /obj/item/projectile/bullet/rifle/a545
 	projectilesound = 'sound/weapons/serdy/type901.ogg'
--- a/modular_chomp/code/modules/projectiles/guns/bullet.dm
+++ b/modular_chomp/code/modules/projectiles/guns/bullet.dm
@@ -1,6 +1,8 @@
 /obj/item/projectile/bullet
 	damage = 25 //seems many bullets use this value for some reason

+/* Old balance stuff, check the modular_chomp/zBallisticPort folder for the new stuff
+
 //These are projectiles that do not have damage defined anywhere. Gonna follow laser weapons sorta with a extra kick, 25/35/60
 /obj/item/projectile/bullet/a38 //These projectiles are used but dont exist, revolvers were super underpowered forever
 	damage = 25 //.38 pretty bwoomp
@@ -167,3 +169,4 @@
 /obj/item/projectile/bullet/pellet/fragment/strong
 	damage = 7
 */
+*/
--- a/modular_chomp/code/modules/projectiles/guns/projectile/ammunition/ammo_boxes.dm
+++ b/modular_chomp/code/modules/projectiles/guns/projectile/ammunition/ammo_boxes.dm
@@ -0,0 +1,59 @@
+/obj/item/ammo_magazine/ammo_box/b9mm
+	name = "ammo box (9mm)"
+	desc = "A box of 9mm rounds"
+	icon_state = "pistol_s"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm
+	matter = list(MAT_STEEL = 1500)
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/ammo_box/b9mm/practice
+	name = "ammo box (9mm practice)"
+	desc = "A box of 9mm practice rounds"
+	icon_state = "pistol_p"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm/practice
+	matter = list(MAT_STEEL = 1100)
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/ammo_box/b9mm/ap
+	name = "ammo box (9mm AP)"
+	desc = "A box of 9mm armor-piercing rounds"
+	icon_state = "pistol_ap"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+	matter = list(MAT_STEEL = 1200, MAT_PLASTEEL = 600)
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/ammo_box/b9mm/hp
+	name = "ammo box (9mm HP)"
+	desc = "A box of 9mm hollow-point rounds"
+	icon_state = "pistol_hp"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm/hp
+	matter = list(MAT_STEEL = 1100)
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/ammo_box/b9mm/rubber
+	name = "ammo box (9mm rubber)"
+	desc = "A box of 9mm rubber rounds"
+	icon_state = "pistol_r"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+	matter = list(MAT_STEEL = 1100, MAT_PLASTIC = 360)
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/ammo_box/b9mm/flash
+	name = "ammo box (9mm flash)"
+	desc = "A box of 9mm flash rounds"
+	icon_state = "pistol_r"
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm/flash
+	matter = list(MAT_STEEL = 1100)
+	max_ammo = 24
+	multiple_sprites = 1
--- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
+++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
--- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/magazines.dm
+++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/magazines.dm
@@ -0,0 +1,547 @@
+//This enables you to load mag to mag too. This includes from box to mag.
+/obj/item/ammo_magazine/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/ammo_magazine))
+		var/obj/item/ammo_magazine/L = W
+		if(L.caliber != caliber)
+			to_chat(user, span_warning("The ammo in [L] does not fit into [src]."))
+			return
+		if(!L.stored_ammo.len)
+			to_chat(user, span_warning("There's no more ammo [L]!"))
+			return
+		if(stored_ammo.len >= max_ammo)
+			to_chat(user, span_warning("[src] is full!"))
+			return
+		while(L.stored_ammo.len && stored_ammo.len < max_ammo)
+			var/obj/item/ammo_casing/AC = L.stored_ammo[1] //select the next casing.
+			L.stored_ammo -= AC //Remove this casing from loaded list of the clip.
+			AC.forceMove(src)
+			stored_ammo.Insert(1, AC) //add it to the head of our magazine's list
+		L.update_icon()
+	..()
+
+/obj/item/ammo_magazine/asval
+	name = "AS-Val magazine(9mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "asval"
+	max_ammo = 20
+	mag_type = MAGAZINE
+	caliber = "9mm"
+	matter = list(MAT_STEEL = 1000)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a9mm
+
+/obj/item/ammo_magazine/asval/ap
+	name = "AS-Val magazine(9mm armor-piercing)"
+	matter = list(MAT_STEEL = 1200)
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+
+/obj/item/ammo_magazine/asval/rubber
+	name = "AS-Val magazine(9mm less-lethal)"
+	icon_state = "asvalrubber"
+	matter = list(MAT_STEEL = 1000)
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+/obj/item/ammo_magazine/akm
+	name = "AKM magazine (7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "762mag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = "7.62mm"
+	matter = list(MAT_STEEL = 1600)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/akm/ap
+	name = "AKM magazine (7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 2000)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/akm/hp
+	name = "AKM magazine (7.62mm hollow-point)"
+	matter = list(MAT_STEEL = 2000)
+	ammo_type = /obj/item/ammo_casing/a762/hp
+
+/obj/item/ammo_magazine/akm/rubber
+	name = "AKM magazine (7.62mm less-lethal)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "762rubbermag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = "7.62mm"
+	matter = list(MAT_STEEL = 1200)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a762/rubber
+
+/obj/item/ammo_magazine/ak74
+	name = "AK74 magazine (5.45mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "545bake"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = "5.45mm"
+	matter = list(MAT_STEEL = 1400)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a545
+
+/obj/item/ammo_magazine/ak74/ap
+	name = "AK74 magazine (5.45mm armor-piercing)"
+	matter = list(MAT_STEEL = 1800)
+	ammo_type = /obj/item/ammo_casing/a545/ap
+
+/obj/item/ammo_magazine/ak74/hp
+	name = "AK74 magazine (5.45mm hollow-point)"
+	matter = list(MAT_STEEL = 1800)
+	ammo_type = /obj/item/ammo_casing/a545/hp
+
+/obj/item/ammo_magazine/ak74/rubber
+	name = "AK74 magazine (5.45mm less-lethal)"
+	icon_state = "545bakerubber"
+	matter = list(MAT_STEEL = 1200)
+	ammo_type = /obj/item/ammo_casing/a545/rubber
+
+/obj/item/ammo_magazine/ak74/plum
+	icon_state = "545plum"
+
+/obj/item/ammo_magazine/ak74/plum/rubber
+	name = "AK74 magazine (5.45mm less-lethal)"
+	icon_state = "545plumrubber"
+	matter = list(MAT_STEEL = 1200)
+	ammo_type = /obj/item/ammo_casing/a545/rubber
+
+/obj/item/ammo_magazine/m16
+	name = "M16 magazine (5.56mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "556mag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = "5.56mm"
+	matter = list(MAT_STEEL = 1400)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a556
+
+/obj/item/ammo_magazine/m16/ap
+	name = "M16 magazine (5.56mm armor-piercing)"
+	matter = list(MAT_STEEL = 1700)
+	ammo_type = /obj/item/ammo_casing/a556/ap
+
+/obj/item/ammo_magazine/m16/rubber
+	name = "M16 magazine (5.56mm less-lethal)"
+	icon_state = "556rubbermag"
+	matter = list(MAT_STEEL = 1700)
+	ammo_type = /obj/item/ammo_casing/a556/rubber
+
+
+/obj/item/ammo_magazine/m16/hp
+	name = "M16 magazine (5.56mm hollow-point)"
+	matter = list(MAT_STEEL = 1700)
+	ammo_type = /obj/item/ammo_casing/a556/hp
+
+/obj/item/ammo_magazine/m16/patriot
+	name = "Patriot magazine (5.56mm)"
+	matter = list(MAT_STEEL = 5000)
+	max_ammo = 100
+	icon_state = "patriotmag"
+
+/obj/item/ammo_magazine/m41
+	name = "M41A magazine (10x24mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "m41mag"
+	max_ammo = 40
+	mag_type = MAGAZINE
+	caliber = "10x24mm"
+	matter = list(MAT_STEEL = 10000)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a10x24
+
+/obj/item/ammo_magazine/m41/rubber
+	name = "M41A magazine (10x24mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "m41rubbermag"
+	max_ammo = 40
+	matter = list(MAT_STEEL = 7000)
+	ammo_type = /obj/item/ammo_casing/a10x24/rubber
+
+/obj/item/ammo_magazine/t12
+	name = "T-12 magazine (10x24mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "t12"
+	max_ammo = 40
+	mag_type = MAGAZINE
+	caliber = "10x24mm"
+	matter = list(MAT_STEEL = 10000)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a10x24
+
+/obj/item/ammo_magazine/clip/sks
+	name = "Ammo clip(7.62mm)"
+	icon_state = "gclip"
+	max_ammo = 10
+	caliber = "7.62mm"
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 400)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/clip/sks/ap
+	name = "Ammo clip(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 700)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/clip/mosin
+	name = "Ammo clip(7.62mm)"
+	icon_state = "clip_rifle"
+	max_ammo = 5
+	caliber = "7.62mm"
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 300)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/clip/mosin/ap
+	name = "Ammo clip(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 600)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/type901
+	name = "Type-901 magazine(7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "762mag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 2400)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/type901/ap
+	name = "Type-901 magazine(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 3000)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/ar10
+	name = "AR-10 magazine(7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "t12"
+	max_ammo = 20
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 1800)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/ar10/ap
+	name = "AR-10 magazine(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 2400)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/fal
+	name = "FAL magazine(7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "t12"
+	max_ammo = 20
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 1800)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/fal/ap
+	name = "FAL magazine(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 2400)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/awp
+	name = "AWP magazine(.338 Lapua)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = ".338"
+	icon_state = "awp"
+	max_ammo = 5
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 2400)
+	ammo_type = /obj/item/ammo_casing/a338
+
+/obj/item/ammo_magazine/awp/ap
+	name = "AWP magazine(.338 Lapua armor-piercing)"
+	matter = list(MAT_STEEL = 3000)
+	ammo_type = /obj/item/ammo_casing/a338/ap
+
+/obj/item/ammo_magazine/hectate
+	name = "Hectate II magazine(.50 BMG)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = ".50 BMG"
+	icon_state = "hectate"
+	max_ammo = 7
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 4000)
+	ammo_type = /obj/item/ammo_casing/a50bmg
+
+/obj/item/ammo_magazine/hectate/ap
+	name = "Hectate II magazine(.50 BMG armor-piercing)"
+	matter = list(MAT_STEEL = 5000)
+	ammo_type = /obj/item/ammo_casing/a50bmg/ap
+
+/obj/item/ammo_magazine/ppsh
+	name = "PPSH-17b drum magazine(.45)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = ".45"
+	icon_state = "ppshmag"
+	max_ammo = 71
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 1500)
+	ammo_type = /obj/item/ammo_casing/a45
+
+/obj/item/ammo_magazine/plamya
+	name = "Plamya drum magazine(9mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "9mm"
+	icon_state = "plamyamag"
+	max_ammo = 50
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 2500)
+	ammo_type = /obj/item/ammo_casing/a9mm
+
+/obj/item/ammo_magazine/plamya/ap
+	name = "Plamya drum magazine(9mm armor-piercing)"
+	matter = list(MAT_STEEL = 3000)
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+
+/obj/item/ammo_magazine/plamya/rubber
+	name = "Plamya drum magazine(9mm less-lethal)"
+	matter = list(MAT_STEEL = 2000)
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+	icon_state = "plamyarubbermag"
+
+/obj/item/ammo_magazine/strela
+	name = "Strela magazine(12 gauge buckshot)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "12g"
+	icon_state = "strelamag"
+	max_ammo = 7
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 800)
+	ammo_type = /obj/item/ammo_casing/a12g/pellet
+
+/obj/item/ammo_magazine/strela/slug
+	name = "Strela magazine(12 gauge slug)"
+	ammo_type = /obj/item/ammo_casing/a12g
+
+/obj/item/ammo_magazine/molniya
+	name = "Molniya magazine box(7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "molniyamag"
+	max_ammo = 100
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 8000)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/molniya/ap
+	name = "Molniya magazine box(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 10000)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/kord
+	name = "Kord magazine box(12.7x108mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "12.7x108mm"
+	icon_state = "kordmag"
+	max_ammo = 100
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 20000)
+	ammo_type = /obj/item/ammo_casing/a127x108
+
+/obj/item/ammo_magazine/pkm
+	name = "PKM magazine box(7.62mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "molniyamag"
+	max_ammo = 100
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 8000)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/pkm/ap
+	name = "PKM magazine box(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 10000)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/rpd
+	name = "RPD Drum magazine(7.62mm)" //Lil side note. These mags don't work with the AK, because the rounds inside are actually on a belt, but they might still fit inside an AK and just break it? Couldn't find any more details on what happens if you try.
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "rpdmag"
+	max_ammo = 100
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 8000)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/rpd/ap
+	name = "PPD Drum magazine(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 10000)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/akm/drum
+	name = "RPK Drum magazine(7.62mm)" //These ARE interchangeable with AK magazines in the same caliber
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "7.62mm"
+	icon_state = "rpdmag"
+	max_ammo = 75
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 6000)
+	ammo_type = /obj/item/ammo_casing/a762
+
+/obj/item/ammo_magazine/akm/drum/ap
+	name = "RPK magazine box(7.62mm armor-piercing)"
+	matter = list(MAT_STEEL = 7500)
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/ssp4
+	name = "SSP4 magazine(10mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "10mm"
+	icon_state = "10mmmag"
+	max_ammo = 8
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 400)
+	ammo_type = /obj/item/ammo_casing/a10mm
+
+/obj/item/ammo_magazine/ssp4/rubber
+	name = "SSP4 magazine(10mm)"
+	ammo_type = /obj/item/ammo_casing/a10mm/rubber
+	icon_state = "10mmrubbermag"
+	matter = list(MAT_STEEL = 300)
+
+/obj/item/ammo_magazine/makarov
+	name = "Makarov magazine(9mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	caliber = "9mm"
+	icon_state = "9mmmag"
+	max_ammo = 8
+	mag_type = MAGAZINE
+	multiple_sprites = 1
+	matter = list(MAT_STEEL = 400)
+	ammo_type = /obj/item/ammo_casing/a9mm
+
+/obj/item/ammo_magazine/makarov/rubber
+	name = "Makarov magazine(9mm Makarov rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+	icon_state = "9mmrubbermag"
+
+/obj/item/ammo_magazine/m9mm/vp70
+	name = "VP70 magazine (9mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "9mmmag"
+	ammo_type = /obj/item/ammo_casing/a9mm
+	max_ammo = 18
+
+/obj/item/ammo_magazine/m9mm/vp70/ap
+	name = "VP70 magazine (9x19mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+
+/obj/item/ammo_magazine/m9mm/vp70/hp
+	name = "VP70 magazine (9x19mm hollow-point)"
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+
+/obj/item/ammo_magazine/m9mm/vp70/rubber
+	name = "VP70 magazine (9x19mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+	icon_state = "9mmrubbermag"
+
+/obj/item/ammo_magazine/m9mm/vp70/flash
+	name = "VP70 magazine (9x19mm flash)"
+	ammo_type = /obj/item/ammo_casing/a9mm/flash
+	icon_state = "9mmrubbermag"
+
+/obj/item/ammo_magazine/tp23s
+	name = "TP-23 TS magazine (.44 magnum)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "45mag"
+	max_ammo = 10
+	mag_type = MAGAZINE
+	caliber = ".44"
+	matter = list(MAT_STEEL = 800)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a44
+
+/obj/item/ammo_magazine/tp23s/rubber
+	name = "TP-23 TS magazine (.44 magnum less-lethal)"
+	ammo_type = /obj/item/ammo_casing/a44/rubber
+
+/obj/item/ammo_magazine/tp23s/highpower
+	name = "TP-23 TS magazine (.44 magnum +P)"
+	desc = "This will probably void your warranty... If you have one."
+	ammo_type = /obj/item/ammo_casing/a44/rifle
+
+/obj/item/ammo_magazine/tp23
+	name = "TP-23 magazine (.45 ACP)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "45mag"
+	max_ammo = 14
+	mag_type = MAGAZINE
+	caliber = ".45"
+	matter = list(MAT_STEEL = 800)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a45
+
+/obj/item/ammo_magazine/tp23/rubber
+	name = "TP-23 magazine (.45 ACP rubber)"
+	ammo_type = /obj/item/ammo_casing/a45/rubber
+
+/obj/item/ammo_magazine/tp23/flash
+	name = "TP-23 magazine (.45 ACP flash)"
+	ammo_type = /obj/item/ammo_casing/a45/flash
+
+/obj/item/ammo_magazine/tp23/hp
+	name = "TP-23 magazine (.45 ACP hollow-point)"
+	ammo_type = /obj/item/ammo_casing/a45/hp
+
+/obj/item/ammo_magazine/tp23/ap
+	name = "TP-23 magazine (.45 ACP armor piercing)"
+	ammo_type = /obj/item/ammo_casing/a45/ap
+
+/obj/item/ammo_magazine/tp23/emp
+	name = "TP-23 magazine (.45 ACP low-yield EMP)"
+	ammo_type = /obj/item/ammo_casing/a45/emp
+
+/obj/item/ammo_magazine/mp5mag
+	name = "mp5 magazine(9mm)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "mp5mag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = "9mm"
+	matter = list(MAT_STEEL = 800)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a9mm
+
+/obj/item/ammo_magazine/mp5mag/rubber
+	name = "mp5 magazine(9x19mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mm/rubber
+
+/obj/item/ammo_magazine/mp5mag/ap
+	name = "mp5 magazine(9x19mm AP)"
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+
+/obj/item/ammo_magazine/mp5mag/hp
+	name = "mp5 magazine(9x19mm HP)"
+	ammo_type = /obj/item/ammo_casing/a9mm/hp
+
+/obj/item/ammo_magazine/pitchmag
+	name = "pitchgun magazine(.44)"
+	icon = 'icons/obj/ammo_ch.dmi'
+	icon_state = "pitchmag"
+	max_ammo = 30
+	mag_type = MAGAZINE
+	caliber = ".44"
+	matter = list(MAT_STEEL = 800)
+	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a44
--- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/projectiles.dm
+++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/projectiles.dm
@@ -0,0 +1,149 @@
+//Bullets from z-ballistic ported over with simplified calibers, only porting whatever isnt inside of the base game
+
+//////////////////////////////////
+//								//
+//			CASINGS				//
+//								//
+//////////////////////////////////
+
+/obj/item/ammo_casing/a9x39
+	desc = "A 9x39mm round"
+	caliber = "9x39mm"
+	icon_state = "rifle-casing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a9x39
+
+/obj/item/ammo_casing/a9x39/ap
+	desc = "An armor piercing 9x39mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a9x39/ap
+
+/obj/item/ammo_casing/a9x39/rubber
+	desc = "A less-lethal 9x39mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a9x39/rubber
+
+/obj/item/ammo_casing/a762/rubber
+	desc = "A less-lethal 7.62mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a762/rubber
+
+/obj/item/ammo_casing/a545/rubber
+	desc = "A 5.45mm less-lethal bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a545/rubber
+
+/obj/item/ammo_casing/a556
+	desc = "A 5.56mm round"
+	caliber = "5.56mm"
+	icon_state = "rifle-casing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556
+
+/obj/item/ammo_casing/a556/ap
+	desc = "An armor piercing 5.56mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/ap
+
+/obj/item/ammo_casing/a556/hp
+	desc = "A hollow point 5.56mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/hp
+
+/obj/item/ammo_casing/a556/rubber
+	desc = "A less-lethal 5.56mm round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/rubber
+
+/obj/item/ammo_casing/a10x24
+	desc = "A 10x24mm caseless round"
+	caliber = "10x24mm"
+	icon_state = "rifle-casing"
+	caseless = 1
+	projectile_type = /obj/item/projectile/bullet/rifle/a10x24
+
+/obj/item/ammo_casing/a10x24/rubber
+	desc = "A less-lethal 10x24mm caseless round"
+	icon_state = "rifle-casing"
+	caseless = 1
+	projectile_type = /obj/item/projectile/bullet/rifle/a10x24/rubber
+
+/obj/item/ammo_casing/a338
+	desc = "A .338 Lapua round"
+	caliber = ".338"
+	icon_state = "lcasing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a338
+
+/obj/item/ammo_casing/a338/ap
+	desc = "An armor piercing .338 Lapua round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a338/ap
+
+/obj/item/ammo_casing/a50bmg
+	desc = "A .50 BMG round"
+	caliber = ".50 BMG"
+	icon_state = "lcasing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a145
+
+/obj/item/ammo_casing/a50bmg/ap
+	desc = "An armor piercing .50 BMG round"
+	projectile_type = /obj/item/projectile/bullet/rifle/a145
+
+/obj/item/ammo_casing/a127x108
+	desc = "A 12.7x108mm round. This looks scary."
+	caliber = "12.7x108mm"
+	icon_state = "lcasing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a127x108
+
+/obj/item/ammo_casing/a127x108/hv
+	desc = "A high velocity 12.7x108mm round"
+	caliber = "12.7x108mm"
+	icon_state = "lcasing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a145
+//////////////////////////////////
+//								//
+//			PROJECTILES			//
+//								//
+//////////////////////////////////
+/obj/item/projectile/bullet/rifle/a556 //5.56mm NATO
+	damage = 30
+	hud_state = "rifle"
+
+/obj/item/projectile/bullet/rifle/a556/ap
+	damage = 20
+	armor_penetration = 25
+	hud_state = "rifle_ap"
+
+/obj/item/projectile/bullet/rifle/a556/hp
+	damage = 40
+	hollow_point = TRUE
+	armor_penetration = -10
+	hud_state = "hivelo_iff"
+
+/obj/item/projectile/bullet/rifle/a556/rubber
+	armor_penetration = -10
+	damage = 15
+	agony = 60
+	embed_chance = 0
+	sharp = FALSE
+	check_armour = "melee"
+
+/obj/item/projectile/bullet/rifle/a10x24
+	damage = 30
+	hud_state = "rifle"
+
+/obj/item/projectile/bullet/rifle/a10x24/rubber
+	armor_penetration = -10
+	damage = 20
+	agony = 80
+	embed_chance = 0
+	sharp = FALSE
+	check_armour = "melee"
+
+/obj/item/projectile/bullet/rifle/a338
+	fire_sound = 'sound/weapons/ballistics/a762x54.ogg'
+	damage = 45
+	hitscan = 1
+	penetrating = 2
+	hud_state = "sniper_crude"
+
+/obj/item/projectile/bullet/rifle/a338/ap
+	armor_penetration = 50
+	hud_state = "sniper_supersonic"
+
+/obj/item/projectile/bullet/rifle/a127x108 //Bigass fuckoff LMG round, bigger than 50 BMG
+	fire_sound = 'sound/weapons/serdy/strela.ogg'
+	damage = 60
+	penetrating = 2
+	armor_penetration=30
+	hud_state = "sniper_fire"