funny ammo

code/controllers/subsystem/traumas.dm

@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(traumas)
 						/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver,
 						/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
 						/obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
-						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
+						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm712x82, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
 						/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,
 						/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited,
 						/obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate,

code/modules/cargo/exports/weapons.dm

@@ -332,7 +332,7 @@
 /datum/export/weapon/l6sawammo
 	cost = 60
 	unit_name = "L6 SAW ammo box"
-	export_types = list(/obj/item/ammo_box/magazine/mm195x129)
+	export_types = list(/obj/item/ammo_box/magazine/mm712x82)
 	include_subtypes = TRUE
 
 /datum/export/weapon/rocket

code/modules/projectiles/ammunition/ballistic/lmg.dm

@@ -1,36 +1,28 @@
-// 1.95x129mm (SAW)
+// 7.12x82mm (SAW)
 
-/obj/item/ammo_casing/mm195x129
+/obj/item/ammo_casing/mm712x82
-	name = "1.95x129mm bullet casing"
+	name = "7.12x82mm bullet casing"
-	desc = "A 1.95x129mm bullet casing."
+	desc = "A 7.12x82mm bullet casing."
 	icon_state = "762-casing"
-	caliber = "mm195129"
+	caliber = "mm71282"
-	projectile_type = /obj/item/projectile/bullet/mm195x129
+	projectile_type = /obj/item/projectile/bullet/mm712x82
 
-/obj/item/ammo_casing/mm195x129/ap
+/obj/item/ammo_casing/mm712x82/ap
-	name = "1.95x129mm armor-piercing bullet casing"
+	name = "7.12x82mm armor-piercing bullet casing"
-	desc = "A 1.95x129mm bullet casing designed with a hardened-tipped core to help penetrate armored targets."
+	desc = "A 7.12x82mm bullet casing designed with a hardened-tipped core to help penetrate armored targets."
-	projectile_type = /obj/item/projectile/bullet/mm195x129_ap
+	projectile_type = /obj/item/projectile/bullet/mm712x82_ap
 
-/obj/item/ammo_casing/mm195x129/hollow
+/obj/item/ammo_casing/mm712x82/hollow
-	name = "1.95x129mm hollow-point bullet casing"
+	name = "7.12x82mm hollow-point bullet casing"
-	desc = "A 1.95x129mm bullet casing designed to cause more damage to unarmored targets."
+	desc = "A 7.12x82mm bullet casing designed to cause more damage to unarmored targets."
-	projectile_type = /obj/item/projectile/bullet/mm195x129_hp
+	projectile_type = /obj/item/projectile/bullet/mm712x82_hp
 
-/obj/item/ammo_casing/mm195x129/incen
+/obj/item/ammo_casing/mm712x82/incen
-	name = "1.95x129mm incendiary bullet casing"
+	name = "7.12x82mm incendiary bullet casing"
-	desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames."
+	desc = "A 7.12x82mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames."
-	projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129
+	projectile_type = /obj/item/projectile/bullet/incendiary/mm712x82
 
 /obj/item/ammo_casing/mm712x82/match
 	name = "7.12x82mm match bullet casing"
 	desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this."
-	projectile_type = /obj/item/projectile/bullet/mm712x82_match
+	projectile_type = /obj/item/projectile/bullet/mm712x82/match
-
-/obj/item/projectile/bullet/mm712x82_match
-	name = "7.12x82mm match bullet"
-	damage = 40
-	ricochets_max = 2
-	ricochet_chance = 60
-	ricochet_auto_aim_range = 4
-	ricochet_incidence_leeway = 35

code/modules/projectiles/boxes_magazines/external/lmg.dm

@@ -1,23 +1,23 @@
-/obj/item/ammo_box/magazine/mm195x129
+/obj/item/ammo_box/magazine/mm712x82
-	name = "box magazine (1.95x129mm)"
+	name = "box magazine (7.12x82mm)"
 	icon_state = "a762-50"
-	ammo_type = /obj/item/ammo_casing/mm195x129
+	ammo_type = /obj/item/ammo_casing/mm712x82
-	caliber = "mm195129"
+	caliber = "mm71282"
 	max_ammo = 50
 
-/obj/item/ammo_box/magazine/mm195x129/hollow
+/obj/item/ammo_box/magazine/mm712x82/hollow
-	name = "box magazine (Hollow-Point 1.95x129mm)"
+	name = "box magazine (Hollow-Point 7.12x82mm)"
-	ammo_type = /obj/item/ammo_casing/mm195x129/hollow
+	ammo_type = /obj/item/ammo_casing/mm712x82/hollow
 
-/obj/item/ammo_box/magazine/mm195x129/ap
+/obj/item/ammo_box/magazine/mm712x82/ap
-	name = "box magazine (Armor Penetrating 1.95x129mm)"
+	name = "box magazine (Armor Penetrating 7.12x82mm)"
-	ammo_type = /obj/item/ammo_casing/mm195x129/ap
+	ammo_type = /obj/item/ammo_casing/mm712x82/ap
 
-/obj/item/ammo_box/magazine/mm195x129/incen
+/obj/item/ammo_box/magazine/mm712x82/incen
-	name = "box magazine (Incendiary 1.95x129mm)"
+	name = "box magazine (Incendiary 7.12x82mm)"
-	ammo_type = /obj/item/ammo_casing/mm195x129/incen
+	ammo_type = /obj/item/ammo_casing/mm712x82/incen
 
-/obj/item/ammo_box/magazine/mm195x129/update_icon()
+/obj/item/ammo_box/magazine/mm712x82/update_icon()
 	..()
 	icon_state = "a762-[round(ammo_count(),10)]"
 

code/modules/projectiles/guns/ballistic/automatic.dm

@@ -296,13 +296,13 @@
 
 /obj/item/gun/ballistic/automatic/l6_saw
 	name = "\improper L6 SAW"
-	desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+	desc = "A heavily modified 7.12x82mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
 	fire_sound = "sound/weapons/lmgshot.ogg"
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = 0
-	mag_type = /obj/item/ammo_box/magazine/mm195x129
+	mag_type = /obj/item/ammo_box/magazine/mm712x82
 	weapon_weight = WEAPON_HEAVY
 	var/cover_open = FALSE
 	can_suppress = FALSE

code/modules/projectiles/projectile/bullets/lmg.dm

@@ -21,22 +21,22 @@
 /obj/item/projectile/bullet/syndicate_turret
 	damage = 20
 
-// 1.95x129mm (SAW)
+// 7.12x82mm (SAW)
 
-/obj/item/projectile/bullet/mm195x129
+/obj/item/projectile/bullet/mm712x82
-	name = "1.95x129mm bullet"
+	name = "7.12x82mm bullet"
 	damage = 40
 	armour_penetration = 5
 	wound_bonus = -50
 	wound_falloff_tile = 0
 
-/obj/item/projectile/bullet/mm195x129_ap
+/obj/item/projectile/bullet/mm712x82_ap
-	name = "1.95x129mm armor-piercing bullet"
+	name = "7.12x82mm armor-piercing bullet"
 	damage = 40
 	armour_penetration = 75
 
-/obj/item/projectile/bullet/mm195x129_hp
+/obj/item/projectile/bullet/mm712x82_hp
-	name = "1.95x129mm hollow-point bullet"
+	name = "7.12x82mm hollow-point bullet"
 	damage = 50
 	armour_penetration = -60
 	sharpness = SHARP_EDGED
@@ -44,7 +44,15 @@
 	bare_wound_bonus = 30
 	wound_falloff_tile = -8
 
-/obj/item/projectile/bullet/incendiary/mm195x129
+/obj/item/projectile/bullet/incendiary/mm712x82
-	name = "1.95x129mm incendiary bullet"
+	name = "7.12x82mm incendiary bullet"
 	damage = 20
 	fire_stacks = 3
+
+/obj/item/projectile/bullet/mm712x82/match
+	name = "7.12x82mm match bullet"
+	damage = 40
+	ricochets_max = 2
+	ricochet_chance = 60
+	ricochet_auto_aim_range = 4
+	ricochet_incidence_leeway = 35

code/modules/tcg/pack_nuclear.dm

@@ -59,7 +59,7 @@
 
 /datum/tcg_card/pack_nuclear/l6saw
 	name = "L6 Saw LMG"
-	desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+	desc = "A heavily modified 7.12x82mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
 	rules = "After equipped unit dies, this card goes to the bottom of draw deck"
 	icon_state = "l6saw"
 

code/modules/uplink/uplink_items/uplink_ammo.dm

@@ -209,29 +209,29 @@
 	purchasable_from = UPLINK_NUKE_OPS
 
 /datum/uplink_item/ammo/machinegun/basic
-	name = "1.95x129mm Box Magazine"
+	name = "7.12x82mm Box Magazine"
-	desc = "A 50-round magazine of 1.95x129mm ammunition for use with the L6 SAW. \
+	desc = "A 50-round magazine of 7.12x82mm ammunition for use with the L6 SAW. \
 			By the time you need to use this, you'll already be standing on a pile of corpses"
-	item = /obj/item/ammo_box/magazine/mm195x129
+	item = /obj/item/ammo_box/magazine/mm712x82
 
 /datum/uplink_item/ammo/machinegun/ap
-	name = "1.95x129mm (Armor Penetrating) Box Magazine"
+	name = "7.12x82mm (Armor Penetrating) Box Magazine"
-	desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with special properties \
+	desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with special properties \
 			to puncture even the most durable armor."
-	item = /obj/item/ammo_box/magazine/mm195x129/ap
+	item = /obj/item/ammo_box/magazine/mm712x82/ap
 	cost = 9
 
 /datum/uplink_item/ammo/machinegun/hollow
-	name = "1.95x129mm (Hollow-Point) Box Magazine"
+	name = "7.12x82mm (Hollow-Point) Box Magazine"
-	desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
+	desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
 			with the unarmored masses of crew."
-	item = /obj/item/ammo_box/magazine/mm195x129/hollow
+	item = /obj/item/ammo_box/magazine/mm712x82/hollow
 
 /datum/uplink_item/ammo/machinegun/incen
-	name = "1.95x129mm (Incendiary) Box Magazine"
+	name = "7.12x82mm (Incendiary) Box Magazine"
-	desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; tipped with a special flammable \
+	desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; tipped with a special flammable \
 			mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
-	item = /obj/item/ammo_box/magazine/mm195x129/incen
+	item = /obj/item/ammo_box/magazine/mm712x82/incen
 
 /datum/uplink_item/ammo/rocket
 	purchasable_from = UPLINK_NUKE_OPS

code/modules/uplink/uplink_items/uplink_dangerous.dm

@@ -213,7 +213,7 @@
 /datum/uplink_item/dangerous/machinegun
 	name = "L6 Squad Automatic Weapon"
 	desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
-			This deadly weapon has a massive 50-round magazine of devastating 1.95x129mm ammunition."
+			This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition."
 	item = /obj/item/gun/ballistic/automatic/l6_saw
 	cost = 18
 	surplus = 0