cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Sanity checks for special role preferences."

Browse Source
This commit is contained in:
Rob Nelson
2017-09-01 11:52:12 -07:00
committed by GitHub
parent 633cb4b6c1
commit f7e22e2d84
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/__HELPERS/game.dm
View File

@@ -295,11 +295,6 @@ var/list/DummyCache = list()
/proc/get_active_candidates(var/role_id=null, var/buffer=ROLE_SELECT_AFK_BUFFER, var/poll=0)
var/list/candidates = list() //List of candidate mobs to assume control of the new larva ~fuck you
var/i = 0
// Sanity check
if(!(role_id in special_roles))
message_admins("<span class='danger'>BUG: get_active_candidates() has been passed role_id=[role_id], which doesn't exist in special_roles! Aborting to avoid breaking shit...</span>")
return candidates // empty list
while(candidates.len <= 0 && i < 5)
roleselect_debug("get_active_candidates(role_id=[role_id], buffer=[buffer], poll=[poll]): Player list is [player_list.len] items long.")
for(var/mob/dead/observer/G in player_list)
@@ -322,9 +317,6 @@ var/list/DummyCache = list()
/proc/get_candidates(var/role_id=null)
. = list()
if(!(role_id in special_roles))
message_admins("<span class='danger'>BUG: get_candidates() has been passed role_id=[role_id], which doesn't exist in special_roles! Aborting to avoid breaking shit...</span>")
return // empty list
for(var/mob/dead/observer/G in player_list)
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
if(!G.client.is_afk() && (role_id==null || G.client.desires_role(role_id)))

2
code/modules/client/preferences.dm
View File

@@ -909,7 +909,7 @@ var/const/MAX_SAVE_SLOTS = 8
var/role_id = href_list["role_id"]
// to_chat(user, "<span class='info'>Toggling role [role_id] (currently at [roles[role_id]])...</span>")
if(!(role_id in special_roles))
to_chat(user, "<span class='danger'>BUG: Unable to find role [role_id] in special_roles.</span>")
to_chat(user, "<span class='danger'>BUG: Unable to find role [role_id].</span>")
return 0
if(roles[role_id] == null || roles[role_id] == "")