Gun update 2018: mk II (#5010)

-removes the shotgun magazines, moving their sprites to the boxes instead
-shotguns boxes should now all have eight shotgun shells, up from seven
-added incendiary and emp shotgun shells boxes
-added the baindolier, a belt that can hold up to 16 shotgun slugs
-fixed a bug with unloading the pocket rifle
-added empty sprites for the uzi and a different loaded gyro pistol icon
-updates some gun related merchant lists a bit
-adds the weapon suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11486

code/modules/projectiles/ammunition/boxes.dm

@@ -452,4 +452,13 @@
 	mag_type = MAGAZINE
 	caliber = "a762"
 	ammo_type = /obj/item/ammo_casing/a762
-	max_ammo = 1000
+	max_ammo = 1000
+
+/obj/item/ammo_magazine/leyon
+	name = "ammo clip (10mm)"
+	icon_state = "10mmclip"
+	ammo_type = /obj/item/ammo_casing/t40
+	caliber = "10mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 1800)
+	max_ammo = 5
+	multiple_sprites = 1

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

@@ -34,6 +34,10 @@
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	ammo_type = /obj/item/ammo_casing/c45
 
+/obj/item/weapon/gun/projectile/automatic/mini_uzi/update_icon()
+	..()
+	icon_state = (ammo_magazine)? "mini-uzi" : "mini-uzi-e"
+
 /obj/item/weapon/gun/projectile/automatic/c20r
 	name = "submachine gun"
 	desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 10mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."

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

@@ -275,3 +275,22 @@
 	var/obj/item/ammo_casing/ammo = ammo_type
 	caliber = initial(ammo.caliber)
 	. = ..()
+
+/obj/item/weapon/gun/projectile/leyon
+	name = "10mm pistol"
+	desc = "The Leyon LCC Everyman is a small pistol that holds five shots and is loaded with a stripper clip, popular for self-defense on Mars. Uses 10mm rounds."
+	icon_state = "leyon"
+	caliber = "10mm"
+	w_class = 2
+	ammo_type = /obj/item/ammo_casing/t40
+	max_shells = 5
+	origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1)
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	load_method = SINGLE_CASING|SPEEDLOADER
+
+/obj/item/weapon/gun/projectile/leyon/update_icon()
+	..()
+	if(loaded.len)
+		icon_state = "leyon"
+	else
+		icon_state = "leyon-e"

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

@@ -99,6 +99,12 @@
 		return
 	..()
 
+/obj/item/weapon/gun/projectile/contender/unload_ammo(mob/user, var/allow_dump=1)
+	if(!retracted_bolt)
+		to_chat(user, "<span class='notice'>You can't unload \the [src] without cycling the bolt.</span>")
+		return
+	..()
+
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/vintage
 	name = "\improper vintage bolt action rifle"
 	desc = "An extremely old-looking rifle. Words you can't read are stamped on the gun. Doesn't look like it'll take any modern rounds."