From a0298c047770285aea98566ce2f386d46b4d0a3f Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Sat, 17 Dec 2011 18:37:23 -0700
Subject: [PATCH] Should improve pepper spray a bit.  Reduced to 2 shot per
 Hawkie's request.

---
 .../objects/items/weapons/mops_cleaners.dm    | 44 +++++++++----------
 code/modules/chemical/Chemistry-Reagents.dm   |  6 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm
index ca4ce5544a4..6fea7af4b12 100644
--- a/code/game/objects/items/weapons/mops_cleaners.dm
+++ b/code/game/objects/items/weapons/mops_cleaners.dm
@@ -14,15 +14,14 @@ MOP
 	return
 
 /obj/item/weapon/cleaner/attack_self(var/mob/user as mob)
-	switch(catch)
-		if(0)
-			user << "\blue You flip the safety back on."
-			catch = 1
-			return
-		if(1)
-			user << "\blue You flip the safety off."
-			catch = 0
-			return
+	if(catch)
+		user << "\blue You flip the safety on."
+		catch = 1
+		return
+	else
+		user << "\blue You flip the safety off."
+		catch = 0
+		return
 
 /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob)
 	if (istype(A, /obj/item/weapon/storage ))
@@ -179,25 +178,26 @@ MOP
 
 	return
 
+//Crowd control pepper spray, for Hawkie
+
 /obj/item/weapon/pepperspray/New()
-	var/datum/reagents/R = new/datum/reagents(45)
+	var/datum/reagents/R = new/datum/reagents(30)
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("condensedcapsaicin", 45)
+	R.add_reagent("condensedcapsaicin", 30)
 
 /obj/item/weapon/pepperspray/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	return
 
 /obj/item/weapon/pepperspray/attack_self(var/mob/user as mob)
-	switch(catch)
-		if(0)
-			user << "\blue You flip the safety on."
-			catch = 1
-			return
-		if(1)
-			user << "\blue You flip the safety off."
-			catch = 0
-			return
+	if(catch)
+		user << "\blue You flip the safety on."
+		catch = 1
+		return
+	else
+		user << "\blue You flip the safety off."
+		catch = 0
+		return
 
 /obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob)
 	if (istype(A, /obj/item/weapon/storage ))
@@ -205,8 +205,8 @@ MOP
 	if (istype(A, /obj/effect/proc_holder/spell ))
 		return
 	else if (istype(A, /obj/structure/reagent_dispensers/peppertank) && get_dist(src,A) <= 1)
-		if(src.reagents.total_volume < 45)
-			A.reagents.trans_to(src, 45 - src.reagents.total_volume)
+		if(src.reagents.total_volume < 30)
+			A.reagents.trans_to(src, 30 - src.reagents.total_volume)
 			user << "\blue Pepper spray refilled"
 			playsound(src.loc, 'refill.ogg', 50, 1, -6)
 			return
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 8e4e7863458..bece66e2588 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -1709,13 +1709,13 @@ datum
 							M << "\red Your glasses protect you from most of the pepperspray!"
 							M:emote("scream")
 							M.eye_blurry = max(M.eye_blurry, 20)
-							M.eye_blind = max(M.eye_blind, 6)
+							M.eye_blind = max(M.eye_blind, 4)
 							return
 						M:emote("scream")
 						M << "\red You're sprayed directly in the eyes with pepperspray!"
 						M.eye_blurry = max(M.eye_blurry, 60)
-						M.eye_blind = max(M.eye_blind, 20)
-						M:paralysis = max(M:paralysis, 16)
+						M.eye_blind = max(M.eye_blind, 16)
+						M:weakened = max(M:weakened, 20)
 						M.drop_item()
 
 		frostoil