| Traitors | | |
"
for(var/datum/mind/traitor in ticker.mode.traitors)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index fdb2ccfac82..dc08a87351b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -950,10 +950,6 @@
//Unbanning joblist
//all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned)
if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban.
- if(!config.ban_legacy_system)
- usr << "Unfortunately, database based unbanning cannot be done through this panel"
- DB_ban_panel(M.ckey)
- return
var/msg
for(var/job in joblist)
var/reason = jobban_isbanned(M, job)
@@ -962,7 +958,7 @@
if("Yes")
ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]")
log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]")
- DB_ban_unban(M.ckey, BANTYPE_JOB_PERMA, job)
+ DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, job)
feedback_inc("ban_job_unban",1)
feedback_add_details("ban_job_unban","- [job]")
jobban_unban(M, job)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 2c378409665..15a8ce5bcba 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -65,11 +65,11 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_TRAITOR)
+ if(ROLE_TRAITOR in applicant.client.prefs.be_special)
if(!applicant.stat)
if(applicant.mind)
if (!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
+ if(!jobban_isbanned(applicant, ROLE_TRAITOR) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -101,11 +101,11 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_CHANGELING)
+ if(ROLE_CHANGELING in applicant.client.prefs.be_special)
if(!applicant.stat)
if(applicant.mind)
if (!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "changeling") && !jobban_isbanned(applicant, "Syndicate"))
+ if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -135,11 +135,11 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_REV)
+ if(ROLE_REV in applicant.client.prefs.be_special)
if(applicant.stat == CONSCIOUS)
if(applicant.mind)
if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "revolutionary") && !jobban_isbanned(applicant, "Syndicate"))
+ if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -206,11 +206,11 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_CULTIST)
+ if(ROLE_CULTIST in applicant.client.prefs.be_special)
if(applicant.stat == CONSCIOUS)
if(applicant.mind)
if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "cultist") && !jobban_isbanned(applicant, "Syndicate"))
+ if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -381,11 +381,11 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_GANG)
+ if(ROLE_GANG in applicant.client.prefs.be_special)
if(!applicant.stat)
if(applicant.mind)
if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "gangster") && !jobban_isbanned(applicant, "Syndicate"))
+ if(!jobban_isbanned(applicant, ROLE_GANG) && !jobban_isbanned(applicant, "Syndicate"))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -580,7 +580,7 @@
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
- if(applicant.client.prefs.be_special & BE_SHADOWLING)
+ if(ROLE_SHADOWLING in applicant.client.prefs.be_special)
if(!applicant.stat)
if(applicant.mind)
if(!applicant.mind.special_role)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 01acb9822f3..0a0d9b27500 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -198,7 +198,7 @@
var/list/candidates = list()
for(var/mob/M in player_list)
if(M.stat != DEAD) continue //we are not dead!
- if(!M.client.prefs.be_special & BE_ALIEN) continue //we don't want to be an alium
+ if(!(ROLE_ALIEN in M.client.prefs.be_special)) continue //we don't want to be an alium
if(M.client.is_afk()) continue //we are afk
if(M.mind && M.mind.current && M.mind.current.stat != DEAD) continue //we have a live body we are tied to
candidates += M.ckey
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index d5029854121..295d39ceef3 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -344,7 +344,6 @@ var/next_external_rsc = 0
'icons/pda_icons/pda_blank.png',
'icons/pda_icons/pda_boom.png',
'icons/pda_icons/pda_bucket.png',
- 'icons/pda_icons/pda_chatroom.png',
'icons/pda_icons/pda_medbot.png',
'icons/pda_icons/pda_floorbot.png',
'icons/pda_icons/pda_cleanbot.png',
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 89c3f0cdcf8..a307e6407a1 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2,24 +2,6 @@
var/list/preferences_datums = list()
-var/global/list/special_roles = list( //keep synced with the defines BE_* in setup.dm
-//some autodetection here.
- "traitor" = /datum/game_mode/traitor, //0
- "operative" = /datum/game_mode/nuclear, //1
- "changeling" = /datum/game_mode/changeling, //2
- "wizard" = /datum/game_mode/wizard, //3
- "malf AI" = /datum/game_mode/malfunction, //4
- "revolutionary" = /datum/game_mode/revolution, //5
- "alien", //6
- "pAI/posibrain", //7
- "cultist" = /datum/game_mode/cult, //8
- "blob" = /datum/game_mode/blob, //9
- "ninja", //10
- "monkey" = /datum/game_mode/monkey, //11
- "gangster" = /datum/game_mode/gang, //12
- "shadowling" = /datum/game_mode/shadowling, //13
- "abductor" = /datum/game_mode/abduction //14
-)
/datum/preferences
@@ -36,7 +18,14 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
//game-preferences
var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
var/ooccolor = null
- var/be_special = 0 //Special role selection
+
+ //Antag preferences
+ var/list/be_special = list() //Special role selection
+ var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more
+ //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were,
+ //autocorrected this round, not that you'd need to check that.
+
+
var/UI_style = "Midnight"
var/toggles = TOGGLES_DEFAULT
var/chat_toggles = TOGGLES_DEFAULT_CHAT
@@ -377,15 +366,16 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
dat += ""
- dat += "Antagonist Settings"
+ dat += "Special Role Settings"
if(jobban_isbanned(user, "Syndicate"))
dat += "You are banned from antagonist roles."
- src.be_special = 0
- var/n = 0
+ src.be_special = list()
+
+
for (var/i in special_roles)
if(jobban_isbanned(user, i))
- dat += "Be [i]: BANNED
"
+ dat += "Be [capitalize(i)]: BANNED
"
else
var/days_remaining = null
if(config.use_age_restriction_for_jobs && ispath(special_roles[i])) //If it's a game mode antag, check if the player meets the minimum age
@@ -394,10 +384,10 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
days_remaining = temp_mode.get_remaining_days(user.client)
if(days_remaining)
- dat += "Be [i]: \[IN [days_remaining] DAYS]
"
+ dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS]
"
else
- dat += "Be [i]: [src.be_special&(1<
"
- n++
+ dat += "Be [capitalize(i)]: [(i in be_special) ? "Yes" : "No"]
"
+
dat += " |
"
dat += "
Close"
if ((!isnull(cartridge)) && (mode == 0))
dat += " | 
Eject [cartridge]"
- if (mode && !noreturn)
+ if (mode)
dat += " | 
Return"
dat += " | 
Refresh"
@@ -307,7 +296,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "
Notekeeper
Messenger
Nanotrasen Relay Chat ([new_ntrc_msg] unread)