cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge commits

Browse Source
This commit is contained in:
Mandurrrh
2015-03-02 12:40:16 -05:00
parent 7865f56b1a
commit cde9de9e85
175 changed files with 7009 additions and 12009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+1 -1
View File
@@ -167,7 +167,7 @@ var/next_external_rsc = 0
send_resources()
if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
//////////////
code/modules/client/preferences.dm
+5 -1
View File
@@ -39,6 +39,7 @@ datum/preferences
var/UI_style = "Midnight"
var/toggles = TOGGLES_DEFAULT
var/ghost_form = "ghost"
var/allow_midround_antag = 1
//character preferences
var/real_name //our character's name
@@ -227,7 +228,7 @@ datum/preferences
dat += "<b>Ghost whispers:</b> <a href='?_src_=prefs;preference=ghost_whispers'>[(toggles & CHAT_GHOSTWHISPER) ? "Nearest Creatures" : "All Speech"]</a><br>"
dat += "<b>Ghost pda:</b> <a href='?_src=prefs;preference=ghost_pda'>[(toggles & CHAT_GHOSTPDA) ? "Nearest Creatures" : "All Messages"]</a><br>"
dat += "<b>Pull requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(toggles & CHAT_PULLR) ? "Yes" : "No"]</a><br>"
dat += "<b>Midround Antagonist:</b> <a href='?_src_=prefs;preference=allow_midround_antag'>[(toggles & MIDROUND_ANTAG) ? "Yes" : "No"]</a><br>"
if(config.allow_Metadata)
dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'> Edit </a><br>"
@@ -789,6 +790,9 @@ datum/preferences
if("pull_requests")
toggles ^= CHAT_PULLR
if("allow_midround_antag")
toggles ^= MIDROUND_ANTAG
if("save")
save_preferences()
save_character()
code/modules/client/preferences_toggles.dm
+9
View File
@@ -82,6 +82,15 @@
src << "You will [(prefs.toggles & CHAT_PULLR) ? "now" : "no longer"] see new pull request announcements."
feedback_add_details("admin_verb","TPullR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/togglemidroundantag()
set name = "Toggle Midround Antagonist"
set category = "Preferences"
set desc = "Toggles whether or not you will be considered for antagonist status given during a round."
prefs.toggles ^= MIDROUND_ANTAG
prefs.save_preferences()
src << "You will [(prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions."
feedback_add_details("admin_verb","TMidroundA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggletitlemusic()
set name = "Hear/Silence LobbyMusic"
set category = "Preferences"