Shotgun and Sprite Updates

code/modules/projectiles/ammunition/magazines.dm

@@ -56,6 +56,14 @@
 	caliber = "shotgun"
 	max_ammo = 2
 	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/shotriot
+	name = "riot shotgun internal magazine"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	caliber = "shotgun"
+	max_ammo = 6
+	multiload = 0
 ///////////EXTERNAL MAGAZINES////////////////
 /obj/item/ammo_box/magazine/m9mm
 	name = "magazine (9mm)"

code/modules/projectiles/gun.dm

@@ -21,6 +21,7 @@
 	var/ghettomodded = 0
 	var/recoil = 0
 	var/clumsy_check = 1
+	var/sawn_desc = null
 	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber. THIS MISPLACED ITEM BROUGHT TO YOU BY HACKY BUCKSHOT.
 	var/tmp/list/mob/living/target //List of who yer targeting.
 	var/tmp/lock_time = -100

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

@@ -106,10 +106,11 @@
 
 /obj/item/weapon/gun/energy/crossbow/largecrossbow
 	name = "Energy Crossbow"
-	desc = "A weapon favored by syndicate infiltration teams."
-	w_class = 4.0
+	desc = "A weapon favored by syndicate carp hunters."
+	icon_state = "crossbowlarge"
+	w_class = 3.0
 	force = 10
-	m_amt = 200000
+	m_amt = 4000
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
 
 

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

@@ -88,6 +88,18 @@
 	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
 	w_class = 5
 
+/obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
+	name = "riot shotgun"
+	desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
+	icon_state = "riotshotgun"
+	mag_type = "/obj/item/ammo_box/magazine/internal/shotriot"
+	sawn_desc = "Come with me if you want to live."
+
+/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob)
+	..()
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+		sawoff(user)
+
 /obj/item/weapon/gun/projectile/revolver/doublebarrel
 	name = "double-barreled shotgun"
 	desc = "A true classic."
@@ -99,26 +111,33 @@
 	slot_flags = SLOT_BACK
 	origin_tech = "combat=3;materials=1"
 	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/dualshot"
+	sawn_desc = "Omar's coming!"
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
 	..()
+	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+		chamber_round()
 	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
-		user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
-		if(get_ammo())
-			afterattack(user, user)	//will this work?
-			afterattack(user, user)	//it will. we call it twice, for twice the FUN
-			playsound(user, fire_sound, 50, 1)
-			user.visible_message("<span class='danger'>\The [src] goes off!</span>", "<span class='danger'>\The [src] goes off in your face!</span>")
-			return
-		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
-			icon_state = "sawnshotgun"
-			w_class = 3.0
-			item_state = "gun"
-			slot_flags &= ~SLOT_BACK	//you can't sling it on your back
-			slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
-			user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
-			name = "sawn-off shotgun"
-			desc = "Omar's coming!"
+		sawoff(user)
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
+	user << "<span class='notice'>You begin to shorten \the [src].</span>"
+	if(get_ammo())
+		afterattack(user, user)
+		playsound(user, fire_sound, 50, 1)
+		user.visible_message("<span class='danger'>The [src] goes off!</span>", "<span class='danger'>The [src] goes off in your face!</span>")
+		return
+	if(do_after(user, 30))
+		name = "sawn-off [src.name]"
+		desc = sawn_desc
+		icon_state = initial(icon_state) + "-sawn"
+		w_class = 3.0
+		item_state = "gun"
+		slot_flags &= ~SLOT_BACK	//you can't sling it on your back
+		slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+		user << "<span class='warning'>You shorten \the [src]!</span>"
+		update_icon()
+		return
 
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob)
 	var/num_unloaded = 0

code/modules/reagents/Chemistry-Machinery.dm

@@ -318,13 +318,13 @@
 		..()
 	else
 		..()
-		
+
 	if(default_deconstruction_screwdriver(user, "minidispenser-o", "minidispenser", I))
 		return
 
 	if(exchange_parts(user, I))
 		return
-					
+
 	if(istype(I, /obj/item/weapon/wrench))
 		playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
 		if(anchored)
@@ -332,8 +332,8 @@
 			user << "<span class='caution'>The [src] can now be moved.</span>"
 		else if(!anchored)
 			anchored = 1
-			user << "<span class='caution'>The [src] is now secured.</span>"		
-		
+			user << "<span class='caution'>The [src] is now secured.</span>"
+
 	if(panel_open)
 		if(istype(I, /obj/item/weapon/crowbar))
 			if(beaker)
@@ -368,6 +368,7 @@
 	var/datum/reagents/R = new/datum/reagents(100)
 	reagents = R
 	R.my_atom = src
+	overlays += "waitlight"
 
 /obj/machinery/chem_master/ex_act(severity)
 	switch(severity)