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

Re-enable xenomorph jobbans.

Browse Source
This commit is contained in:
D3athrow
2015-08-04 13:45:16 -05:00
parent 1b1f8d4077
commit 2274dfa78a
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/DB ban/functions.dm
View File

@@ -332,7 +332,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
output += "<option value='[j]'>[j]</option>"
for(var/j in nonhuman_positions)
output += "<option value='[j]'>[j]</option>"
for(var/j in list("traitor","changeling","operative","revolutionary","cultist","wizard"))
for(var/j in list("traitor","changeling","operative","revolutionary","cultist","wizard", "Dionaea", "Xenomorph"))
output += "<option value='[j]'>[j]</option>"
// AUTOFIXED BY fix_string_idiocy.py

10
code/modules/admin/topic.dm
View File

@@ -757,13 +757,13 @@
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'><font color=red>[replacetext("Malf AI", " ", "&nbsp")]</font></a></td>"
else
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'>[replacetext("Malf AI", " ", "&nbsp")]</a></td>"
*/
//Alien
if(jobban_isbanned(M, "alien candidate") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=alien candidate;jobban4=\ref[M]'><font color=red>[replacetext("Alien", " ", "&nbsp")]</font></a></td>"
if(jobban_isbanned(M, "Xenomorph") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Xenomorph;jobban4=\ref[M]'><font color=red>[replacetext("Alien", " ", "&nbsp")]</font></a></td>"
else
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=alien candidate;jobban4=\ref[M]'>[replacetext("Alien", " ", "&nbsp")]</a></td>"
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Xenomorph;jobban4=\ref[M]'>[replacetext("Alien", " ", "&nbsp")]</a></td>"
/*
//Infested Monkey
if(jobban_isbanned(M, "infested monkey") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=infested monkey;jobban4=\ref[M]'><font color=red>[replacetext("Infested Monkey", " ", "&nbsp")]</font></a></td>"

1
code/modules/admin/verbs/randomverbs.dm
View File

@@ -233,6 +233,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
for(var/mob/M in get_active_candidates(ROLE_ALIEN))
if(M.stat != DEAD) continue //we are not dead!
if(M.client.is_afk()) continue //we are afk
if(jobban_isbanned(M, "xenomorph")) continue
candidates += M.ckey
if(candidates.len)
ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates