Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets

Gun Revamp 2: Gun Harder: Director's Cut

code/modules/reagents/syringe_gun.dm

@@ -13,20 +13,31 @@
 	var/list/syringes = list()
 	var/max_syringes = 1
 
-/obj/item/weapon/gun/syringe/process_chambered()
-	if(!syringes.len) return 0
-	
+/obj/item/weapon/gun/syringe/New()
+	..()
+	chambered = new /obj/item/ammo_casing/syringegun(src)
+
+/obj/item/weapon/gun/syringe/proc/newshot()
+	if(!syringes.len) return
+
 	var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
-	
-	if(!S) return 0
-	
-	in_chamber = new /obj/item/projectile/bullet/dart/syringe(src)
-	S.reagents.trans_to(in_chamber, S.reagents.total_volume)
-	in_chamber.name = S.name
+
+	if(!S) return
+
+	chambered.BB = new /obj/item/projectile/bullet/dart/syringe(src)
+	S.reagents.trans_to(chambered.BB, S.reagents.total_volume)
+	chambered.BB.name = S.name
 	syringes.Remove(S)
-	
+
 	del(S)
-	return 1
+	return
+
+/obj/item/weapon/gun/syringe/process_chamber()
+	return
+
+/obj/item/weapon/gun/syringe/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+	newshot()
+	..()
 
 /obj/item/weapon/gun/syringe/examine()
 	..()
@@ -37,22 +48,22 @@
 	if(!syringes.len)
 		user << "<span class='notice'>[src] is empty.</span>"
 		return 0
-	
+
 	var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
-	
+
 	if(!S) return 0
 	S.loc = user.loc
-	
+
 	syringes.Remove(S)
 	user << "<span class = 'notice'>You unload [S] from \the [src]!</span>"
-	
+
 	return 1
 
 /obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, var/show_msg = 1)
 	if(istype(A, /obj/item/weapon/reagent_containers/syringe))
 		if(syringes.len < max_syringes)
 			user.drop_item()
-			user << "<span class='notice'>You load [A] into \the [src]!</span>"
+			user << "<span class='notice'>You load [A] into \the [src].</span>"
 			syringes.Add(A)
 			A.loc = src
 			return 1