Merge part 2

Yeah this should fix everything with the update

modular_splurt/code/modules/admin/playtimes.dm

@@ -12,6 +12,8 @@
 	var/touched_circuit = FALSE
 	var/uses_vpn = FALSE
 
+//Most of this data is now unused except for the flags
+/*
 /client/proc/cmd_player_playtimes()
 	set category = "Admin"
 	set name = "Player Playtimes"
@@ -64,6 +66,7 @@
 	clients = sortList(clients, /proc/cmp_playtime)
 	data["clients"] = clients
 	return data
+*/
 
 /datum/player_playtime/proc/check_flags(client/C)
 	var/list/flags = list()
@@ -105,7 +108,7 @@
 		flags += list(flag)
 
 	return flags
-
+/*
 /datum/player_playtime/ui_act(action, params)
 	if(..())
 		return
@@ -125,3 +128,4 @@
 				return
 			var/mob/dead/observer/A = C.mob
 			A.ManualFollow(target)
+*/