diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 0042a2d9d6..77b93428bc 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -696,16 +696,43 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Antag OOC Color: Change
"
dat += ""
- if(user.client.holder)
- dat +="
"
+
+ dat +=" | "
+
+ dat += "Special Role Settings"
+
+ if(jobban_isbanned(user, ROLE_SYNDICATE))
+ dat += "You are banned from antagonist roles."
+ src.be_special = list()
+
+
+ for (var/i in GLOB.special_roles)
+ if(jobban_isbanned(user, i))
+ dat += "Be [capitalize(i)]: BANNED "
+ else
+ var/days_remaining = null
+ if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age
+ var/mode_path = GLOB.special_roles[i]
+ var/datum/game_mode/temp_mode = new mode_path
+ days_remaining = temp_mode.get_remaining_days(user.client)
+
+ if(days_remaining)
+ dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] "
+ else
+ dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"] "
+ dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"] "
+
+ dat += " | "
+
+ dat +=""
+
+ if(user.client.holder) // sandstorm start - moves admin prefs to the right
dat += "Admin Settings"
dat += "Adminhelp Sounds: [(toggles & SOUND_ADMINHELP)?"Enabled":"Disabled"] "
dat += "Announce Login: [(toggles & ANNOUNCE_LOGIN)?"Enabled":"Disabled"] "
dat += " "
- dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"] "
- dat += " | "
+ dat += "Combo HUD Lighting: [(toggles & COMBOHUD_LIGHTING)?"Full-bright":"No Change"]
" // sandstorm end - moves admins prefs to the right
- dat +=""
dat += "Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe.
dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"] "
dat += "Auto stand: [autostand ? "Enabled" : "Disabled"] "
@@ -788,32 +815,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(CONFIG_GET(flag/allow_map_voting))
dat += "Preferred Map: [p_map] "
- dat += " | "
-
- dat += "Special Role Settings"
-
- if(jobban_isbanned(user, ROLE_SYNDICATE))
- dat += "You are banned from antagonist roles."
- src.be_special = list()
-
-
- for (var/i in GLOB.special_roles)
- if(jobban_isbanned(user, i))
- dat += "Be [capitalize(i)]: BANNED "
- else
- var/days_remaining = null
- if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age
- var/mode_path = GLOB.special_roles[i]
- var/datum/game_mode/temp_mode = new mode_path
- days_remaining = temp_mode.get_remaining_days(user.client)
-
- if(days_remaining)
- dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] "
- else
- dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"] "
- dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"] "
-
- dat += " "
+ dat += " | "
if(3)
dat += "