module things, jfc

code/modules/projectiles/ammunition/_ammunition.dm

@@ -21,6 +21,9 @@
 	var/heavy_metal = TRUE
 	var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal
 
+/obj/item/ammo_casing/spent
+	name = "spent bullet casing"
+	BB = null
 
 /obj/item/ammo_casing/Initialize()
 	. = ..()
@@ -34,7 +37,7 @@
 /obj/item/ammo_casing/update_icon()
 	..()
 	icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
-	desc = "[initial(desc)][BB ? "" : " This one is spent"]"
+	desc = "[initial(desc)][BB ? "" : " This one is spent."]"
 
 //proc to magically refill a casing with a new projectile
 /obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!).

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

@@ -92,10 +92,12 @@
 	variance = 35
 
 /obj/item/ammo_casing/shotgun/laserslug
-	name = "laser slug"
-	desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package."
+	name = "scatter laser shell"
+	desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a scatter laser weapon in a ballistic package."
 	icon_state = "lshell"
-	projectile_type = /obj/item/projectile/beam/laser
+	projectile_type = /obj/item/projectile/beam/weak
+	pellets = 6
+	variance = 35
 
 /obj/item/ammo_casing/shotgun/techshell
 	name = "unloaded technological shell"

code/modules/projectiles/ammunition/caseless/misc.dm

@@ -8,15 +8,15 @@
 	throw_speed = 3
 
 /obj/item/ammo_casing/caseless/laser
- 	name = "laser casing"
- 	desc = "You shouldn't be seeing this."
- 	caliber = "laser"
- 	icon_state = "s-casing-live"
- 	projectile_type = /obj/item/projectile/beam
- 	fire_sound = 'sound/weapons/laser.ogg'
- 	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
+	name = "laser casing"
+	desc = "You shouldn't be seeing this."
+	caliber = "laser"
+	icon_state = "s-casing-live"
+	projectile_type = /obj/item/projectile/beam
+	fire_sound = 'sound/weapons/laser.ogg'
+	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
 
 /obj/item/ammo_casing/caseless/laser/gatling
-	projectile_type = /obj/item/projectile/beam/weak
+	projectile_type = /obj/item/projectile/beam/weak/penetrator
 	variance = 0.8
 	click_cooldown_override = 1

code/modules/projectiles/ammunition/energy/gravity.dm

@@ -1,36 +1,29 @@
-/obj/item/ammo_casing/energy/gravityrepulse
+/obj/item/ammo_casing/energy/gravity
+	e_cost = 0
+	fire_sound = 'sound/weapons/wave.ogg'
+	select_name = "gravity"
+	delay = 50
+	var/obj/item/gun/energy/gravity_gun/gun
+
+/obj/item/ammo_casing/energy/gravity/Initialize(mapload)
+	if(istype(loc,/obj/item/gun/energy/gravity_gun))
+		gun = loc
+	. = ..()
+
+/obj/item/ammo_casing/energy/gravity/Destroy()
+	gun = null
+	. = ..()
+
+/obj/item/ammo_casing/energy/gravity/repulse
 	projectile_type = /obj/item/projectile/gravityrepulse
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "repulse"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-/obj/item/ammo_casing/energy/gravityrepulse/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
-
-/obj/item/ammo_casing/energy/gravityattract
+/obj/item/ammo_casing/energy/gravity/attract
 	projectile_type = /obj/item/projectile/gravityattract
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "attract"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-
-/obj/item/ammo_casing/energy/gravityattract/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
-
-/obj/item/ammo_casing/energy/gravitychaos
+/obj/item/ammo_casing/energy/gravity/chaos
 	projectile_type = /obj/item/projectile/gravitychaos
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "chaos"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-/obj/item/ammo_casing/energy/gravitychaos/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
+

code/modules/projectiles/ammunition/special/magic.dm

@@ -38,8 +38,8 @@
 /obj/item/ammo_casing/magic/arcane_barrage
 	projectile_type = /obj/item/projectile/magic/arcane_barrage
 
-/obj/item/ammo_casing/magic/chaos/newshot()
-	..()
-
 /obj/item/ammo_casing/magic/honk
 	projectile_type = /obj/item/projectile/bullet/honker
+
+/obj/item/ammo_casing/magic/locker
+	projectile_type = /obj/item/projectile/magic/locker