shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mapsyncs43293845982

Browse Source
This commit is contained in:
deathride58
2018-01-07 20:23:00 +00:00
committed by GitHub
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+7 -1
View File
@@ -816,7 +816,9 @@
//Antagonist (Orange)
var/isbanned_dept = jobban_isbanned(M, "Syndicate")
dat += "<table cellpadding='1' cellspacing='0' width='100%'>"
dat += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[REF(src)];[HrefToken()];jobban3=Syndicate;jobban4=[REF(M)]'>Antagonist Positions</a></th></tr><tr align='center'>"
dat += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[REF(src)];[HrefToken()];jobban3=Syndicate;jobban4=[REF(M)]'>Antagonist Positions</a> | "
dat += "<a href='?src=[REF(src)];[HrefToken()];jobban3=teamantags;jobban4=[REF(M)]'>Team Antagonists</a></th>"
dat += "<a href='?src=[REF(src)];[HrefToken()];jobban3=convertantags;jobban4=[REF(M)]'>Conversion Antagonists</a></th></tr><tr align='center'>"
//Traitor
if(jobban_isbanned(M, "traitor") || isbanned_dept)
@@ -940,6 +942,10 @@
joblist += jobPos
if("ghostroles")
joblist += list("pAI", "posibrain", "drone", "deathsquad", "lavaland")
if("teamantags")
joblist += list("operative", "revolutionary", "cultist", "servant of Ratvar", "abductor", "alien candidate")
if("convertantags")
joblist += list("revolutionary", "cultist", "servant of Ratvar", "alien candidate")
else
joblist += href_list["jobban3"]