Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm

code/game/objects/items/devices/radio/radio.dm

@@ -578,7 +578,6 @@
 		if(keyslot.syndie)
 			src.syndie = 1
 
-
 	for (var/ch_name in src.channels)
 		if(!radio_controller)
 			sleep(30) // Waiting for the radio_controller to be created.

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

@@ -83,7 +83,7 @@ AI MODULES
 		laws.sync(target, 0)
 	addAdditionalLaws(target, sender)
 
-	target << "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: "
+	target << "\The [sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: "
 	target.show_laws()
 
 /obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -140,13 +140,7 @@ AI MODULES
 	if(!targetName)
 		usr << "No name detected on module, please enter one."
 		return 0
-	..()
-
-/obj/item/weapon/aiModule/oneHuman/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "Only [targetName] is a crew member."
-	target << "[sender.real_name] attempted to modify your zeroth law." // And lets them know that someone tried. --NeoFite
-	target << "It would be in your best interest to play along with [sender.real_name] that [law]"
+	return ..()
 
 /obj/item/weapon/aiModule/oneHuman/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 	var/law = "Only [targetName] is an crew member."

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

@@ -32,7 +32,7 @@
 	else if(istype(target,/turf))
 		user << "<span class='notice'>You scrub \the [target.name] clean.</span>"
 		var/turf/T = target
-		T.clean()
+		T.clean(src)
 	else
 		user << "<span class='notice'>You clean \the [target.name].</span>"
 		target.clean_blood()

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

@@ -16,6 +16,7 @@
 /obj/item/weapon/mop/New()
 	create_reagents(5)
 
+//expects an atom containing the reagents used to clean the turf
 /turf/proc/clean(atom/source)
 	if(source.reagents.has_reagent("water", 1))
 		clean_blood()