Misc gun tweaks

code/modules/projectiles/ammunition/boxes.dm

@@ -109,7 +109,7 @@
 	initial_ammo = 0
 
 /obj/item/ammo_magazine/a556
-	name = "magazine (5.56)"
+	name = "magazine (5.56mm)"
 	icon_state = "5.56"
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE

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

@@ -34,6 +34,7 @@ obj/item/weapon/gun/energy/laser/retro
 	force = 5
 	slot_flags = SLOT_BELT
 	origin_tech = null
+	charge_cost = 200 //to compensate a bit for self-recharging
 	self_recharge = 1
 
 

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

@@ -49,7 +49,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/sts35
 	name = "\improper STS-35 automatic rifle"
-	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier. Uses 7.62mm rounds. It is unmarked."
+	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
 	icon_state = "arifle"
 	item_state = "shotgun"
 	w_class = 4
@@ -99,6 +99,9 @@
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/a556
+	auto_eject = 1
+	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
+	
 	var/use_launcher = 0
 	var/obj/item/weapon/gun/launcher/grenade/underslung/launcher
 

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

@@ -43,7 +43,7 @@
 	name = "combat shotgun"
 	icon_state = "cshotgun"
 	origin_tech = "combat=5;materials=2"
-	max_shells = 8
+	max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8.
 	ammo_type = /obj/item/ammo_casing/shotgun