Merge remote-tracking branch 'citadel/master' into projectiles_2

code/modules/projectiles/boxes_magazines/_box_magazine.dm

@@ -113,7 +113,7 @@
 
 /obj/item/ammo_box/update_icon()
 	. = ..()
-	desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
+	desc = "[initial(desc)] There [stored_ammo.len == 1 ? "is" : "are"] [stored_ammo.len] shell\s left!"
 	for (var/material in bullet_cost)
 		var/material_amount = bullet_cost[material]
 		material_amount = (material_amount*stored_ammo.len) + base_cost[material]

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -121,3 +121,51 @@
 	icon_state = "foambox_riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 	custom_materials = list(/datum/material/iron = 50000)
+
+//Shotgun clips
+/obj/item/ammo_box/shotgun
+	name = "stripper clip (shotgun shells)"
+	desc = "A stripper clip, designed to help with loading a shotgun slightly faster."
+	icon = 'icons/obj/ammo.dmi'
+	icon_state = "shotgunclip"
+	caliber = "shotgun" // slapped in to allow shell mix n match
+	ammo_type = /obj/item/ammo_casing/shotgun
+	max_ammo = 4
+	var/pixeloffsetx = 4
+	start_empty = TRUE
+
+/obj/item/ammo_box/shotgun/update_overlays()
+	. = ..()
+	if(stored_ammo.len)
+		var/offset = -4
+		for(var/A in stored_ammo)
+			var/obj/item/ammo_casing/shotgun/C = A
+			offset += pixeloffsetx
+			var/mutable_appearance/shell_overlay = mutable_appearance(icon, "[initial(C.icon_state)]-clip")
+			shell_overlay.pixel_x += offset
+			shell_overlay.appearance_flags = RESET_COLOR
+			. += shell_overlay
+
+/obj/item/ammo_box/shotgun/loaded
+	start_empty = FALSE
+
+/obj/item/ammo_box/shotgun/loaded/rubbershot
+	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+
+/obj/item/ammo_box/shotgun/loaded/buckshot
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/shotgun/loaded/beanbag
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+
+/obj/item/ammo_box/shotgun/loaded/stunslug
+	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
+
+/obj/item/ammo_box/shotgun/loaded/techshell
+	ammo_type = /obj/item/ammo_casing/shotgun/techshell
+
+/obj/item/ammo_box/shotgun/loaded/incendiary
+	ammo_type = /obj/item/ammo_casing/shotgun/incendiary
+
+/obj/item/ammo_box/shotgun/loaded/dart
+	ammo_type = /obj/item/ammo_casing/shotgun/dart

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

@@ -331,8 +331,7 @@
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
 	..()
 	if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
-		var/obj/item/stack/cable_coil/C = A
-		if(C.use(10))
+		if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC))
 			slot_flags = ITEM_SLOT_BACK
 			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
 			slung = TRUE