-Adding pepper spray for security officers.

-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/weapon.dm

@@ -524,6 +524,18 @@
 	throw_range = 10
 	origin_tech = "combat=3;materials=3;engineering=3"
 
+/obj/item/weapon/pepperspray
+	desc = "Manufactred by UhangInc., used to blind and down an opponent quickly."
+	icon = 'weapons.dmi'
+	name = "pepperspray"
+	icon_state = "pepperspray"
+	item_state = "pepperspray"
+	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	throwforce = 3
+	w_class = 2.0
+	throw_speed = 2
+	throw_range = 10
+
 /obj/item/weapon/clipboard
 	name = "clipboard"
 	desc = "Apply paper to this to write better. Can also hold pens."

code/game/atom_procs.dm

@@ -71,7 +71,7 @@
 			if ((O.client && !( O.blinded )))
 				O << text("\red [src] has been scanned by [user] with the [W]")
 	else
-		if (!( istype(W, /obj/item/weapon/grab) ) && !(istype(W, /obj/item/weapon/plastique)) &&!(istype(W, /obj/item/weapon/cleaner)) &&!(istype(W, /obj/item/weapon/chemsprayer)) && !(istype(W, /obj/item/weapon/plantbgone)) )
+		if (!( istype(W, /obj/item/weapon/grab) ) && !(istype(W, /obj/item/weapon/plastique)) &&!(istype(W, /obj/item/weapon/cleaner)) &&!(istype(W, /obj/item/weapon/chemsprayer)) &&!(istype(W, /obj/item/weapon/pepperspray)) && !(istype(W, /obj/item/weapon/plantbgone)) )
 			for(var/mob/O in viewers(src, null))
 				if ((O.client && !( O.blinded )))
 					O << text("\red <B>[] has been hit by [] with []</B>", src, user, W)

code/game/objects/closets/secure/security.dm

@@ -100,6 +100,7 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/flashbang(src)
+		new /obj/item/weapon/pepperspray(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)

code/game/objects/items/weapons/mops_cleaners.dm

@@ -14,7 +14,7 @@ MOP
 	return
 
 /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob)
-	if (istype(A, /obj/item/weapon/storage/backpack ))
+	if (istype(A, /obj/item/weapon/storage ))
 		return
 	if (istype(A, /obj/effect/proc_holder/spell ))
 		return
@@ -91,7 +91,7 @@ MOP
 	return
 
 /obj/item/weapon/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob)
-	if (istype(A, /obj/item/weapon/storage/backpack ))
+	if (istype(A, /obj/item/weapon/storage ))
 		return
 	if (istype(A, /obj/effect/proc_holder/spell ))
 		return
@@ -165,7 +165,95 @@ MOP
 
 	return
 
-/obj/item/weapon/chemsprayer/examine()
+/obj/item/weapon/pepperspray/New()
+	var/datum/reagents/R = new/datum/reagents(45)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("condensedcapsaicin", 45)
+
+/obj/item/weapon/pepperspray/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+	return
+
+/obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob)
+	if (istype(A, /obj/item/weapon/storage ))
+		return
+	if (istype(A, /obj/effect/proc_holder/spell ))
+		return
+	else if (istype(A, /obj/structure/reagent_dispensers/peppertank) && get_dist(src,A) <= 1)
+		A.reagents.trans_to(src, 45)
+		user << "\blue Pepper spray refilled"
+		playsound(src.loc, 'refill.ogg', 50, 1, -6)
+		return
+	else if (src.reagents.total_volume < 1)
+		user << "\blue [src] is empty!"
+		return
+	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
+
+	var/Sprays[3]
+	for(var/i=1, i<=3, i++) // intialize sprays
+		if(src.reagents.total_volume < 1) break
+		var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
+		D.name = "chemicals"
+		D.icon = 'chempuff.dmi'
+		D.create_reagents(15)
+		src.reagents.trans_to(D, 15)
+
+		var/rgbcolor[3]
+		var/finalcolor
+		for(var/datum/reagent/re in D.reagents.reagent_list)
+			if(!finalcolor)
+				rgbcolor = GetColors(re.color)
+				finalcolor = re.color
+			else
+				var/newcolor[3]
+				var/prergbcolor[3]
+				prergbcolor = rgbcolor
+				newcolor = GetColors(re.color)
+
+				rgbcolor[1] = (prergbcolor[1]+newcolor[1])/2
+				rgbcolor[2] = (prergbcolor[2]+newcolor[2])/2
+				rgbcolor[3] = (prergbcolor[3]+newcolor[3])/2
+
+				finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3])
+
+		D.icon += finalcolor
+
+		Sprays[i] = D
+
+	var/direction = get_dir(src, A)
+	var/turf/T = get_turf(A)
+	var/turf/T1 = get_step(T,turn(direction, 90))
+	var/turf/T2 = get_step(T,turn(direction, -90))
+	var/list/the_targets = list(T,T1,T2)
+
+	for(var/i=1, i<=Sprays.len, i++)
+		spawn()
+			var/obj/effect/decal/D = Sprays[i]
+			if(!D) continue
+
+			// Spreads the sprays a little bit
+			var/turf/my_target = pick(the_targets)
+			the_targets -= my_target
+
+			for(var/j=1, j<=rand(6,8), j++)
+				step_towards(D, my_target)
+				D.reagents.reaction(get_turf(D))
+				for(var/atom/t in get_turf(D))
+					D.reagents.reaction(t)
+				sleep(2)
+			del(D)
+	sleep(1)
+
+	if(isrobot(user)) //Cyborgs can clean forever if they keep charged
+		var/mob/living/silicon/robot/janitor = user
+		janitor.cell.charge -= 20
+		var/refill = src.reagents.get_master_reagent_id()
+		spawn(600)
+			src.reagents.add_reagent(refill, 10)
+
+	return
+
+/obj/item/weapon/pepperspray/examine()
 	set src in usr
 	usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
 	..()

code/game/objects/storage/belt.dm

@@ -107,6 +107,7 @@
 	storage_slots = 4
 	can_hold = list(
 		"/obj/item/weapon/flashbang",
+		"/obj/item/weapon/pepperspray",
 		"/obj/item/weapon/handcuffs",
 		"/obj/item/device/flash",
 		"/obj/item/clothing/glasses",

code/modules/chemical/Chemistry-Reagents.dm

@@ -1683,6 +1683,37 @@ datum
 				..()
 				return
 
+		condensedcapsaicin
+			name = "Condensed Capsaicin"
+			id = "condensedcapsaicin"
+			description = "This shit goes in pepperspray."
+			reagent_state = LIQUID
+			color = "#B31008" // rgb: 179, 16, 8
+
+			reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+				if(!istype(M, /mob/living))
+					return
+				if(method == TOUCH)
+					if(istype(M, /mob/living/carbon/human))
+						if(M:wear_mask)
+
+							M << "\red Your mask protects you from the pepperspray!"
+							return
+						if(M:head)
+							M << "\red Your helmet protects you from the pepperspray!"
+							return
+						if(M:glasses)
+							M << "\red Your glasses protect you from most of the pepperspray!"
+							M:emote("scream")
+							M.eye_blurry = max(M.eye_blurry, 1)
+							return
+						M:emote("scream")
+						M << "\red You're sprayed directly in the eyes with pepperspray!"
+						M.eye_blurry = max(M.eye_blurry, 5)
+						M.eye_blind = max(M.eye_blind, 2)
+						M:paralysis = max(M:paralysis, 1)
+						M.drop_item()
+
 		frostoil
 			name = "Frost Oil"
 			id = "frostoil"

code/modules/chemical/Chemistry-Tools.dm

@@ -2733,6 +2733,18 @@
 		..()
 		reagents.add_reagent("fuel",1000)
 
+/obj/structure/reagent_dispensers/peppertank
+	name = "Pepper Spray Refiller"
+	desc = "Refill pepper spray canisters."
+	icon = 'objects.dmi'
+	icon_state = "peppertank"
+	anchored = 1
+	density = 0
+	amount_per_transfer_from_this = 45
+	New()
+		..()
+		reagents.add_reagent("condensedcapsaicin",1000)
+
 /obj/structure/reagent_dispensers/fueltank/blob_act()
 	explosion(src.loc,0,1,5,7,10)
 	if(src)

code/modules/clothing/suits/armor.dm

@@ -1,5 +1,5 @@
 /obj/item/clothing/suit/armor
-	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	flags = FPRINT | TABLEPASS