Re-uses the too_many_active_drones() proc as originally intended.
Makes the private_valid_special_roles list global, no need to let each individual player initialize the list.
This commit is contained in:
PsiOmegaDelta
2016-01-15 11:45:12 +01:00
parent 12fe589dce
commit bee18a16db
5 changed files with 16 additions and 12 deletions
+6 -6
View File
@@ -48,6 +48,12 @@ var/list/ghost_traps
// Print a message to all ghosts with the right prefs/lack of bans.
/datum/ghosttrap/proc/request_player(var/mob/target, var/request_string, var/request_timeout)
if(request_timeout)
request_timeouts[target] = world.time + request_timeout
target.destruction.register(src, /datum/ghosttrap/proc/target_destroyed)
else
request_timeouts -= target
for(var/mob/dead/observer/O in player_list)
if(!O.MayRespawn())
continue
@@ -58,12 +64,6 @@ var/list/ghost_traps
if(pref_check && !(pref_check in O.client.prefs.be_special_role))
continue
if(O.client)
if(request_timeout)
request_timeouts[target] = world.time + request_timeout
target.destruction.register(src, /datum/ghosttrap/proc/target_destroyed)
else
request_timeouts -= target
O << "[request_string] <a href='?src=\ref[src];candidate=\ref[O];target=\ref[target]'>(Occupy)</a> ([ghost_follow_link(target, O)])"
/datum/ghosttrap/proc/target_destroyed(var/destroyed_target)