Merge remote-tracking branch 'upstream/master'

code/game/gamemodes/gameticker.dm

@@ -54,7 +54,7 @@ var/global/datum/controller/gameticker/ticker
 			return 0
 		if(secret_force_mode != "secret")
 			var/datum/game_mode/M = config.pick_mode(secret_force_mode)
-			if(M.can_start())
+			if(M && M.can_start())
 				src.mode = config.pick_mode(secret_force_mode)
 		job_master.ResetOccupations()
 		if(!src.mode)

code/game/gamemodes/sandbox/sandbox.dm

@@ -2,6 +2,7 @@
 	name = "sandbox"
 	config_tag = "sandbox"
 	required_players = 0
+	votable = 0
 
 /datum/game_mode/sandbox/announce()
 	world << "<B>The current game mode is - Sandbox!</B>"

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

@@ -13,11 +13,25 @@ MOP
 /obj/item/weapon/cleaner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	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
+
 /obj/item/weapon/cleaner/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 (catch == 1)
+		user << "\blue The safety is on!"
+		return
 	else if (src.reagents.total_volume < 1)
 		user << "\blue [src] is empty!"
 		return
@@ -174,15 +188,33 @@ MOP
 /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
+
 /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)
+		if(src.reagents.total_volume < 45)
+			A.reagents.trans_to(src, 45 - src.reagents.total_volume)
+			user << "\blue Pepper spray refilled"
+			playsound(src.loc, 'refill.ogg', 50, 1, -6)
+			return
+		else
+			user << "\blue Pepper spray is already full!"
+			return
+	else if (catch == 1)
+		user << "\blue The safety is on!"
 		return
 	else if (src.reagents.total_volume < 1)
 		user << "\blue [src] is empty!"
@@ -195,8 +227,8 @@ MOP
 		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)
+		D.create_reagents(5)
+		src.reagents.trans_to(D, 5)
 
 		var/rgbcolor[3]
 		var/finalcolor
@@ -255,7 +287,7 @@ MOP
 
 /obj/item/weapon/pepperspray/examine()
 	set src in usr
-	usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
+	usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume)
 	..()
 	return