Merge pull request #12353 from GhostActual/Ammo_Boxes

Ammo Boxes

code/modules/projectiles/guns/energy/laser_vr.dm

@@ -127,35 +127,6 @@
 	cut_overlays()
 	update_mode()
 
-/////////////////////////////////////////////////////
-//////////////////// Custom Ammo ////////////////////
-/////////////////////////////////////////////////////
-//---------------- Beams ----------------
-/obj/item/projectile/beam/eluger
-	name = "laser beam"
-	icon_state = "xray"
-	light_color = "#00FF00"
-	muzzle_type = /obj/effect/projectile/muzzle/xray
-	tracer_type = /obj/effect/projectile/tracer/xray
-	impact_type = /obj/effect/projectile/impact/xray
-
-/obj/item/projectile/beam/imperial
-	name = "laser beam"
-	fire_sound = 'sound/weapons/mandalorian.ogg'
-	icon_state = "darkb"
-	light_color = "#8837A3"
-	muzzle_type = /obj/effect/projectile/muzzle/darkmatter
-	tracer_type = /obj/effect/projectile/tracer/darkmatter
-	impact_type = /obj/effect/projectile/impact/darkmatter
-
-/obj/item/projectile/beam/stun/kin21
-	name = "kinh21 stun beam"
-	icon_state = "omnilaser"
-	light_color = "#0000FF"
-	muzzle_type = /obj/effect/projectile/muzzle/laser_omni
-	tracer_type = /obj/effect/projectile/tracer/laser_omni
-	impact_type = /obj/effect/projectile/impact/laser_omni
-
 //Gun Locking Mechanism
 /obj/item/weapon/gun/energy/locked
 	req_access = list(access_armory) //for toggling safety

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

@@ -415,7 +415,7 @@
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/m762
-	allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762m)
+	allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762/ext)
 	projectile_type = /obj/item/projectile/bullet/rifle/a762
 
 	one_handed_penalty = 45
@@ -429,7 +429,7 @@
 	..()
 	if(istype(ammo_magazine,/obj/item/ammo_magazine/m762))
 		icon_state = "bullpup-small"
-	else if(istype(ammo_magazine,/obj/item/ammo_magazine/m762m))
+	else if(istype(ammo_magazine,/obj/item/ammo_magazine/m762/ext))
 		icon_state = "bullpup"
 	else
 		item_state = "bullpup-empty"

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

@@ -78,7 +78,7 @@
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	ammo_type = /obj/item/ammo_casing/a45/rubber
-	max_shells = 7
+	max_shells = 6
 
 
 /obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()

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

@@ -12,8 +12,8 @@
 	slot_flags = SLOT_BACK
 	//fire_sound = 'sound/weapons/rifleshot.ogg'
 	load_method = MAGAZINE // ToDo: Make it so MAGAZINE, SPEEDLOADER and SINGLE_CASING can all be used on the same gun.
-	magazine_type = /obj/item/ammo_magazine/m762garand
-	allowed_magazines = list(/obj/item/ammo_magazine/m762garand)
+	magazine_type = /obj/item/ammo_magazine/m762enbloc
+	allowed_magazines = list(/obj/item/ammo_magazine/m762enbloc)
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/garand_ping.ogg'