Merge remote-tracking branch 'upstream/master'

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

@@ -134,6 +134,7 @@
 		new /obj/item/weapon/fcardholder(src)
 		new /obj/item/weapon/clipboard(src)
 		new /obj/item/device/detective_scanner(src)
+		new /obj/item/weapon/pepperspray/small(src)
 		return
 
 

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 off."
+		catch = 0
+		return
+	else
+		user << "\blue You flip the safety on."
+		catch = 1
+		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
 
+//Pepper spray, set up to make the 2 different types
+
 /obj/item/weapon/pepperspray/New()
-	var/datum/reagents/R = new/datum/reagents(45)
+	var/datum/reagents/R = new/datum/reagents(ReagentAmount)
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("condensedcapsaicin", 45)
+	R.add_reagent("condensedcapsaicin", ReagentAmount)
 
 /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 off."
+		catch = 0
+		return
+	else
+		user << "\blue You flip the safety on."
+		catch = 1
+		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 < ReagentAmount)
+			A.reagents.trans_to(src, ReagentAmount - src.reagents.total_volume)
 			user << "\blue Pepper spray refilled"
 			playsound(src.loc, 'refill.ogg', 50, 1, -6)
 			return
@@ -221,14 +221,23 @@ MOP
 		return
 	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
 
-	var/Sprays[3]
-	for(var/i=1, i<=3, i++) // intialize sprays
+	var/SprayNum = 0 //Setting up the differentiation for the 2 bottles.   --SkyMarshal
+	var/SprayAmt = 0
+	if(BottleSize)
+		SprayNum = 3
+		SprayAmt = 5
+	else
+		SprayNum = 1
+		SprayAmt = 1
+
+	var/Sprays[SprayNum]
+	for(var/i=1, i<=SprayNum, 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(5)
-		src.reagents.trans_to(D, 5)
+		D.create_reagents(SprayAmt)
+		src.reagents.trans_to(D, SprayAmt)
 
 		var/rgbcolor[3]
 		var/finalcolor
@@ -263,11 +272,23 @@ MOP
 			var/obj/effect/decal/D = Sprays[i]
 			if(!D) continue
 
+			var/turf/my_target = null
 			// Spreads the sprays a little bit
-			var/turf/my_target = pick(the_targets)
+			if(i == 1)
+				my_target = T
+			else
+				my_target = pick(the_targets)
+
 			the_targets -= my_target
 
-			for(var/j=1, j<=rand(6,8), j++)
+			var/Dist = 0
+
+			if(BottleSize)
+				Dist = rand(6,8)
+			else
+				Dist = rand(2,3)
+
+			for(var/j=1, j<=Dist, j++)
 				step_towards(D, my_target)
 				D.reagents.reaction(get_turf(D))
 				for(var/atom/t in get_turf(D))
@@ -287,9 +308,14 @@ MOP
 
 /obj/item/weapon/pepperspray/examine()
 	set src in usr
-	usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume)
-	..()
-	return
+	if(BottleSize)
+		usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume)
+		..()
+		return
+	else
+		usr << text("\icon[] [] use(s) remaining!", src, src.reagents.total_volume)
+		..()
+		return
 
 // MOP