cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-04-17 14:51:56 +03:00
parent 83000d25c3 e54af87ebf
commit dc25d31bd4
6 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/antagonism/01_candidacy.dm
+2 -1
View File
@@ -35,10 +35,11 @@
/datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user)
. += "<b>Special Role Availability:</b><br>"
. += "<table>"
var/is_global_banned = jobban_isbanned(preference_mob(), "Antagonist")
for(var/antag_type in all_antag_types)
var/datum/antagonist/antag = all_antag_types[antag_type]
. += "<tr><td>[antag.role_text]: </td><td>"
if(jobban_isbanned(preference_mob(), antag.bantype))
if(is_global_banned || jobban_isbanned(preference_mob(), antag.bantype))
. += "<span class='danger'>\[BANNED\]</span><br>"
else if(antag.role_type in pref.be_special_role)
. += "<b>Yes</b> / <a href='?src=\ref[src];del_special=[antag.role_type]'>No</a></br>"
code/modules/client/preference_setup/other/01_incidents.dm
-1
View File
@@ -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()