rifles!!!1

fixes descs


lathemags


oops i forgot a mag


holy shit hitting / is not that hard


Update code/modules/projectiles/ammunition/boxes.dm

Co-authored-by: Jux <68120725+juxjux9930@users.noreply.github.com>
Update code/modules/projectiles/ammunition/boxes.dm

Co-authored-by: Jux <68120725+juxjux9930@users.noreply.github.com>
Update code/modules/projectiles/ammunition/boxes.dm

Co-authored-by: Jux <68120725+juxjux9930@users.noreply.github.com>

code/datums/supplypacks/security.dm

@@ -224,20 +224,37 @@
 	access = access_security
 
 /singleton/hierarchy/supply_pack/security/bullpupammo
-	name = "Ammunition - military rifle"
+	name = "Ammunition - heavy bullpup rifle"
 	contains = list(/obj/item/ammo_magazine/mil_rifle = 4)
 	cost = 60
 	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "military rifle ammunition crate"
+	containername = "heavy bullpup rifle ammunition crate"
 	access = access_security
 	security_level = SUPPLY_SECURITY_HIGH
 
 /singleton/hierarchy/supply_pack/security/bullpupammopractice
-	name = "Ammunition - military rifle practice"
+	name = "Ammunition - heavy bullpup rifle practice"
 	contains = list(/obj/item/ammo_magazine/mil_rifle/practice = 8)
 	cost = 30
 	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "military rifle practice ammunition crate"
+	containername = "heavy bullpup practice ammunition crate"
+	access = access_security
+
+/singleton/hierarchy/supply_pack/security/lightbullpupammo
+	name = "Ammunition - light bullpup rifle"
+	contains = list(/obj/item/ammo_magazine/mil_rifle/light = 4)
+	cost = 40
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "light bullpup ammunition crate"
+	access = access_security
+	security_level = SUPPLY_SECURITY_HIGH
+
+/singleton/hierarchy/supply_pack/security/lightbullpupammopractice
+	name = "Ammunition - light bullpup rifle practice"
+	contains = list(/obj/item/ammo_magazine/mil_rifle/light/practice = 4)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "light bullpup practice ammunition crate"
 	access = access_security
 
 /singleton/hierarchy/supply_pack/security/forensics //Not access-restricted so PIs can use it.

code/modules/fabrication/designs/general/designs_arms_ammo.dm

@@ -84,10 +84,14 @@
 	name = "ammunition (rifle magazine)"
 	path = /obj/item/ammo_magazine/rifle
 
-/datum/fabricator_recipe/arms_ammo/hidden/magazine_carbine
-	name = "ammunition (military rifle)"
+/datum/fabricator_recipe/arms_ammo/hidden/magazine_bullpupheavy
+	name = "ammunition (heavy bullpup rifle)"
 	path = /obj/item/ammo_magazine/mil_rifle
 
+/datum/fabricator_recipe/arms_ammo/hidden/magazine_bullpuplight
+	name = "ammunition (light bullpup rifle)"
+	path = /obj/item/ammo_magazine/mil_rifle/light
+
 /datum/fabricator_recipe/arms_ammo/hidden/shotgun
 	name = "ammunition (slug, shotgun)"
 	path = /obj/item/ammo_casing/shotgun

code/modules/projectiles/ammunition/boxes.dm

@@ -316,7 +316,7 @@
 
 /obj/item/ammo_magazine/mil_rifle
 	name = "assault rifle magazine"
-	icon_state = "bullup"
+	icon_state = "bullpup"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
 	caliber = CALIBER_RIFLE_MILITARY
@@ -332,6 +332,19 @@
 	labels = list("practice")
 	ammo_type = /obj/item/ammo_casing/rifle/military/practice
 
+/obj/item/ammo_magazine/mil_rifle/light
+	icon_state = "bullpup_light"
+	caliber = CALIBER_RIFLE
+	ammo_type = /obj/item/ammo_casing/rifle
+	max_ammo = 20
+
+/obj/item/ammo_magazine/mil_rifle/light/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/mil_rifle/light/practice
+	labels = list("practice")
+	ammo_type = /obj/item/ammo_casing/rifle/practice
+
 /obj/item/ammo_magazine/caps
 	name = "speed loader"
 	desc = "A cheap plastic speed loader for some kind of revolver."

code/modules/projectiles/ammunition/bullets.dm

@@ -138,6 +138,11 @@
 	icon_state = "riflecasing"
 	spent_icon = "riflecasing-spent"
 
+/obj/item/ammo_casing/rifle/practice
+	desc = "A rifle practice bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/practice
+	icon_state = "riflecasing_p"
+
 /obj/item/ammo_casing/shell
 	name = "shell casing"
 	desc = "An antimaterial shell casing."

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

@@ -168,7 +168,7 @@
 
 /obj/item/gun/projectile/automatic/bullpup_rifle
 	name = "bullpup assault rifle"
-	desc = "The Haephestus Z8 is one of the oldest weapons currently in service by the SCGDF. Despite it's age, it still remains the de-facto main rifle of the SCG Army, due to it's ease of handling, cheap production costs, reliability, and plentiful surplus stock."
+	desc = "The Hephaestus Industries Z8 is one of the oldest weapons currently in service with the SCGDF. Despite its age, it still remains the de-facto main rifle of the SCG Army, due to its ease of handling, cheap production costs, reliability, and plentiful surplus stock."
 	icon = 'icons/obj/guns/bullpup_rifle.dmi'
 	icon_state = "carbine"
 	item_state = "z8carbine"
@@ -243,13 +243,13 @@
 
 /obj/item/gun/projectile/automatic/bullpup_rifle/light
 	name = "light bullpup assault rifle"
-	desc = "The standard-issue rifle of the SCGDF. The Z9 Pitbull is the modern answer to violence's question. It has been given a blued finish with a Sol yellow stripe on its stock for easy identification of its owner."
+	desc = "The standard-issue rifle of the SCGDF, the Z9 Pitbull is the modern answer to violence's question. It has been given a blued finish with a Sol yellow stripe on its stock for easy identification of its owner."
 	icon = 'icons/obj/guns/bullpup_rifle_light.dmi'
 	item_state = "z9carbine"
 	caliber = CALIBER_RIFLE
 	ammo_type = /obj/item/ammo_casing/rifle
-	magazine_type = /obj/item/ammo_magazine/rifle
-	allowed_magazines = /obj/item/ammo_magazine/rifle
+	magazine_type = /obj/item/ammo_magazine/mil_rifle/light
+	allowed_magazines = /obj/item/ammo_magazine/mil_rifle/light
 	one_hand_penalty = 6 //Slightly lighter than the Z8. Still don't try it.
 	wielded_item_state = "z9carbine-wielded"
 	firemodes = list( //Two round bursts. More accurate than the Z8 due to less maximum dispersion. More delay between shots, however, so slower.

code/modules/projectiles/projectile/bullets.dm

@@ -253,6 +253,9 @@
 /obj/item/projectile/bullet/pistol/practice
 	damage = 5
 
+/obj/item/projectile/bullet/rifle/practice
+	damage = 5
+
 /obj/item/projectile/bullet/rifle/military/practice
 	damage = 5