diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 064f438da46..1d1d7145b2a 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -100,7 +100,7 @@ var/datum/subsystem/ticker/ticker
 
 			if(!mode.explosion_in_progress && mode.check_finished() || force_ending)
 				current_state = GAME_STATE_FINISHED
-				auto_toggle_ooc(1) // Turn it on
+				toggle_ooc(1) // Turn it on
 				declare_completion(force_ending)
 				spawn(50)
 					if(mode.station_was_nuked)
@@ -162,7 +162,8 @@ var/datum/subsystem/ticker/ticker
 		mode.announce()
 
 	current_state = GAME_STATE_PLAYING
-	auto_toggle_ooc(0) // Turn it off
+	if(!config.ooc_during_round)
+		toggle_ooc(0) // Turn it off
 	round_start_time = world.time
 
 	start_landmarks_list = shuffle(start_landmarks_list) //Shuffle the order of spawn points so they dont always predictably spawn bottom-up and right-to-left
@@ -204,8 +205,6 @@ var/datum/subsystem/ticker/ticker
 
 	for (var/datum/html_interface/hi in html_interfaces)
 		hi.closeAll()
-
-	auto_toggle_ooc(1) // Turn it on
 	//initialise our cinematic screen object
 	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=20;mouse_opacity=0;screen_loc="1,0";}(src)
 
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 60f4b66da8b..592eda9b691 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -58,16 +58,19 @@
 			else
 				C << "<font color='[normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message'>[msg]</span></span></font>"
 
-/proc/toggle_ooc()
-	ooc_allowed = !( ooc_allowed )
-	if (ooc_allowed)
-		world << "<B>The OOC channel has been globally enabled!</B>"
-	else
-		world << "<B>The OOC channel has been globally disabled!</B>"
-
-/proc/auto_toggle_ooc(var/on)
-	if(!config.ooc_during_round && ooc_allowed != on)
-		toggle_ooc()
+/proc/toggle_ooc(var/toggle = null)
+	if(toggle != null) //if we're specifically en/disabling ooc
+		world << "toggle has value [toggle]"
+		world << "ooc_allowed is [ooc_allowed]"
+		if(toggle != ooc_allowed)
+			world << "ooc_allowed set to toggle"
+			ooc_allowed = toggle
+		else
+			world << "toggle was the same as ooc_allowed returning"
+			return
+	else //otherwise just toggle it
+		ooc_allowed = !ooc_allowed
+	world << "<B>The OOC channel has been globally [ooc_allowed ? "enabled" : "disabled"].</B>"
 
 var/global/normal_ooc_colour = "#002eb8"
 
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 054b8113f2f..1f606a3f885 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -47,16 +47,16 @@
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 	user.changeNext_move(CLICK_CD_RANGE*2)
 	user.newtonian_move(get_dir(A, user))
-
+	var/turf/T = get_turf(src)
 	if(reagents.has_reagent("sacid"))
-		message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
-		log_game("[key_name(user)] fired sulphuric acid from \a [src].")
+		message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[get_area(src)] ([T.x], [T.y], [T.z])</a>).")
+		log_game("[key_name(user)] fired sulphuric acid from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).")
 	if(reagents.has_reagent("facid"))
-		message_admins("[key_name_admin(user)] fired Fluacid from \a [src].")
-		log_game("[key_name(user)] fired Fluacid from \a [src].")
+		message_admins("[key_name_admin(user)] fired Fluacid from \a [src] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[get_area(src)] ([T.x], [T.y], [T.z])</a>).")
+		log_game("[key_name(user)] fired Fluacid from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).")
 	if(reagents.has_reagent("lube"))
-		message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
-		log_game("[key_name(user)] fired Space lube from \a [src].")
+		message_admins("[key_name_admin(user)] fired Space lube from \a [src] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[get_area(src)] ([T.x], [T.y], [T.z])</a>).")
+		log_game("[key_name(user)] fired Space lube from \a [src] at [get_area(src)] ([T.x], [T.y], [T.z]).")
 	return