Merge remote-tracking branch 'origin/master' into TGUI-3.0

code/modules/admin/chat_commands.dm

@@ -84,7 +84,7 @@ GLOBAL_LIST(round_end_notifiees)
 	if(!SSticker.IsRoundInProgress() && SSticker.HasRoundStarted())
 		return "[sender.mention], the round has already ended!"
 	LAZYINITLIST(GLOB.round_end_notifiees)
-	GLOB.round_end_notifiees["<@[sender.mention]>"] = TRUE
+	GLOB.round_end_notifiees[sender.mention] = TRUE
 	return "I will notify [sender.mention] when the round ends."
 
 /datum/tgs_chat_command/sdql

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -234,3 +234,7 @@
 	for(var/turf/T in v)
 		. += T
 	return pick(.)
+
+/proc/__nan()
+	var/list/L = json_decode("{\"value\":NaN}")
+	return L["value"]