Merge remote-tracking branch 'upstream/master'

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, 12)
+						M:weakened = max(M:weakened, 20)
 						M.drop_item()
 
 		frostoil

code/modules/chemical/Chemistry-Tools.dm

@@ -2740,7 +2740,7 @@
 	icon_state = "peppertank"
 	anchored = 1
 	density = 0
-	amount_per_transfer_from_this = 45
+	amount_per_transfer_from_this = 30
 	New()
 		..()
 		reagents.add_reagent("condensedcapsaicin",1000)