diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm
index dd836aee026..987afa846bc 100644
--- a/code/game/antagonist/antagonist_helpers.dm
+++ b/code/game/antagonist/antagonist_helpers.dm
@@ -1,7 +1,7 @@
/datum/antagonist/proc/can_become_antag(var/datum/mind/player, var/ignore_role)
if (!player.current)
return 0
- if(player.current && jobban_isbanned(player.current, bantype))
+ if(jobban_isbanned(player.current, bantype) || jobban_isbanned(player.current, "Antagonist"))
return 0
if(!ignore_role)
if(player.assigned_role in restricted_jobs)
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 6a28f8a647d..586804665a1 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -340,9 +340,7 @@
if( "activate" )
src.timer_start()
- log_debug("Updating record")
for (var/datum/data/record/E in data_core.general)
- log_debug("Searching for criminal with name: [incident.criminal.name]")
if(E.fields["name"] == incident.criminal.name)
for (var/datum/data/record/R in data_core.security)
if(R.fields["id"] == E.fields["id"])
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index 45435caf4fa..7097d74968d 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -16,10 +16,6 @@ var/jobban_keylist[0] //to store the keys & ranks
//returns a reason if M is banned from rank, returns 0 otherwise
/proc/jobban_isbanned(mob/M, rank)
if(M && rank)
- /*
- if(_jobban_isbanned(M, rank)) return "Reason Unspecified" //for old jobban
- */
-
if (guest_jobbans(rank))
if(config.guest_jobban && IsGuestKey(M.key))
return "Guest Job-ban"
diff --git a/code/modules/client/preference_setup/antagonism/01_candidacy.dm b/code/modules/client/preference_setup/antagonism/01_candidacy.dm
index 6147a905b52..346b3c4ea27 100644
--- a/code/modules/client/preference_setup/antagonism/01_candidacy.dm
+++ b/code/modules/client/preference_setup/antagonism/01_candidacy.dm
@@ -35,10 +35,11 @@
/datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user)
. += "Special Role Availability:
"
. += "
| [antag.role_text]: | "
- if(jobban_isbanned(preference_mob(), antag.bantype))
+ if(is_global_banned || jobban_isbanned(preference_mob(), antag.bantype))
. += "\[BANNED\] " else if(antag.role_type in pref.be_special_role) . += "Yes / No" diff --git a/code/modules/client/preference_setup/other/01_incidents.dm b/code/modules/client/preference_setup/other/01_incidents.dm index 879494f4d81..aefcf598855 100644 --- a/code/modules/client/preference_setup/other/01_incidents.dm +++ b/code/modules/client/preference_setup/other/01_incidents.dm @@ -60,7 +60,6 @@ infraction.fine = text2num(char_infraction_query.item[10]) infraction.felony = text2num(char_infraction_query.item[11]) pref.incidents.Add(infraction) - log_debug("Added infraction with [infraction.UID]") /datum/category_item/player_setup_item/other/incidents/content(var/mob/user) pref.incidents = list() diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 3b569cdae64..703b184a66f 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -35,8 +35,8 @@ em {font-style: normal;font-weight: bold;} .mod_channel {color: #735638; font-weight: bold;} .mod_channel .admin {color: #b82e00; font-weight: bold;} .admin_channel {color: #9611D4; font-weight: bold;} -.cciaasay {color: #521590;} -.devsay {color: #02280D;} +.cciaasay {color: #BD871B;} +.devsay {color: #5C7463;} /* Radio: Misc */ .deadsay {color: #530FAD;} |