Merge pull request #10014 from mwerezak/raider-gear

Fixes issues with equipping raiders, raider gun type

code/modules/customitems/item_spawning.dm

@@ -174,16 +174,8 @@
 	if(M.equip_to_appropriate_slot(newitem))
 		return newitem
 
-	if(istype(M.back,/obj/item/weapon/storage))
-		var/obj/item/weapon/storage/backpack = M.back
-		if(backpack.contents.len < backpack.storage_slots)
-			newitem.loc = M.back
-			return newitem
+	if(M.equip_to_storage(newitem))
+		return newitem
 
-	// Try to place it in any item that can store stuff, on the mob.
-	for(var/obj/item/weapon/storage/S in M.contents)
-		if (S.contents.len < S.storage_slots)
-			newitem.loc = S
-			return newitem
 	newitem.loc = get_turf(M.loc)
 	return newitem

code/modules/mob/inventory.dm

@@ -73,6 +73,21 @@ var/list/slot_equipment_priority = list( \
 
 	return 0
 
+/mob/proc/equip_to_storage(obj/item/newitem)
+	// Try put it in their backpack
+	if(istype(src.back,/obj/item/weapon/storage))
+		var/obj/item/weapon/storage/backpack = src.back
+		if(backpack.contents.len < backpack.storage_slots)
+			newitem.loc = src.back
+			return 1
+
+	// Try to place it in any item that can store stuff, on the mob.
+	for(var/obj/item/weapon/storage/S in src.contents)
+		if (S.contents.len < S.storage_slots)
+			newitem.loc = S
+			return 1
+	return 0
+
 //These procs handle putting s tuff in your hand. It's probably best to use these rather than setting l_hand = ...etc
 //as they handle all relevant stuff like adding it to the player's screen and updating their overlays.
 

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

@@ -164,3 +164,37 @@
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "silencer"
 	w_class = 2
+
+/obj/item/weapon/gun/projectile/pirate
+	name = "zipgun"
+	desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
+	icon_state = "sawnshotgun"
+	item_state = "sawnshotgun"
+	handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading
+	load_method = SINGLE_CASING
+	max_shells = 1 //literally just a barrel
+	
+	var/global/list/ammo_types = list(
+		/obj/item/ammo_casing/a357              = ".357",
+		/obj/item/ammo_casing/c9mmf             = "9mm",
+		/obj/item/ammo_casing/c45f              = ".45",
+		/obj/item/ammo_casing/a12mm             = "12mm",
+		/obj/item/ammo_casing/shotgun           = "12 gauge",
+		/obj/item/ammo_casing/shotgun           = "12 gauge",
+		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
+		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
+		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
+		/obj/item/ammo_casing/shotgun/beanbag   = "12 gauge",
+		/obj/item/ammo_casing/shotgun/stunshell = "12 gauge",
+		/obj/item/ammo_casing/shotgun/flash     = "12 gauge",
+		/obj/item/ammo_casing/a762              = "7.62mm",
+		/obj/item/ammo_casing/a556              = "5.56mm"
+		)
+
+/obj/item/weapon/gun/projectile/pirate/New()
+	ammo_type = pick(ammo_types)
+	desc += " Uses [ammo_types[ammo_type]] rounds."
+	
+	var/obj/item/ammo_casing/ammo = ammo_type
+	caliber = initial(ammo.caliber)
+	..()

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

@@ -47,7 +47,6 @@
 	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
 
-
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel
 	name = "double-barreled shotgun"
 	desc = "A true classic."
@@ -95,12 +94,23 @@
 			return
 		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
 			icon_state = "sawnshotgun"
+			item_state = "sawnshotgun"
 			w_class = 3
-			item_state = "gun"
+			force = 5
 			slot_flags &= ~SLOT_BACK	//you can't sling it on your back
 			slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
 			name = "sawn-off shotgun"
 			desc = "Omar's coming!"
 			user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
 	else
-		..()
+		..()
+
+/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn
+	name = "sawn-off shotgun"
+	desc = "Omar's coming!"
+	icon_state = "sawnshotgun"
+	item_state = "sawnshotgun"
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
+	ammo_type = /obj/item/ammo_casing/shotgun/pellet
+	w_class = 3
+	force = 5