Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/game/machinery/turrets.dm

code/datums/datumvars.dm

@@ -12,7 +12,7 @@
 	//set src in world
 
 
-	if(!usr.client || !usr.client.holder)
+	if(!is_admin(usr))
 		to_chat(usr, "<span class='warning'>You need to be an administrator to access this.</span>")
 		return
 
@@ -622,8 +622,9 @@ body
 			return
 		to_chat(M, "Control of your mob has been offered to dead players.")
 		log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
-		message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
-		var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100)
+		var/minhours = input(usr, "Minimum hours required to play [M]?", "Set Min Hrs", 10) as num
+		message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts with [minhours] hrs playtime")
+		var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100, min_hours = minhours)
 		var/mob/dead/observer/theghost = null
 
 		if(candidates.len)

code/datums/statclick.dm

@@ -31,7 +31,7 @@
 
 // This bit is called when clicked in the stat panel
 /obj/effect/statclick/debug/Click()
-	if(!usr.client.holder)
+	if(!is_admin(usr))
 		return
 
 	usr.client.debug_variables(target)