cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 23:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Sandstorm-Station:master' into master

Browse Source
This commit is contained in:
BongaTheProto
2022-02-05 01:39:29 -05:00
committed by GitHub
parent e2d1d57b6e 3bbe8d199c
commit 024cf30c95
36 changed files with 6 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client_procs.dm
+6 -2
View File
@@ -422,7 +422,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(holder)
add_admin_verbs()
to_chat(src, get_message_output("memo"))
var/admin_memo = get_message_output("memo")
if(admin_memo)
to_chat(src, admin_memo)
adminGreet()
add_verbs_from_config()
@@ -466,7 +468,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(CONFIG_GET(flag/autoconvert_notes))
convert_notes_sql(ckey)
to_chat(src, get_message_output("message", ckey))
var/player_message_output = get_message_output("message", ckey)
if(player_message_output)
to_chat(src, player_message_output)
if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
to_chat(src, "<span class='warning'>Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.</span>")
code/modules/client/preferences.dm
-8
View File
@@ -982,9 +982,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Ghost PDA:</b> <a href='?_src_=prefs;preference=ghost_pda'>[(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"]</a><br>"
dat += "<b>Window Flashing:</b> <a href='?_src_=prefs;preference=winflash'>[(windowflashing) ? "Enabled":"Disabled"]</a><br>"
dat += "<br>"
//SKYRAT CHANGES BEGIN
dat += "<b>Play Megafauna Music:</b> <a href='?_src_=prefs;preference=hear_megafauna'>[(toggles & SOUND_MEGAFAUNA) ? "Enabled":"Disabled"]</a><br>"
//SKYRAT CHANGES END
dat += "<b>Play Admin MIDIs:</b> <a href='?_src_=prefs;preference=hear_midis'>[(toggles & SOUND_MIDI) ? "Enabled":"Disabled"]</a><br>"
dat += "<b>Play Lobby Music:</b> <a href='?_src_=prefs;preference=lobby_music'>[(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"]</a><br>"
dat += "<b>See Pull Requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"]</a><br>"
@@ -3185,11 +3182,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("hear_midis")
toggles ^= SOUND_MIDI
//SKYRAT CHANGES BEGIN - Megafauna music
if("hear_megafauna")
toggles ^= SOUND_MEGAFAUNA
//SKYRAT CHANGES END
if("verb_consent") // Skyrat - ERP Mechanic Addition
toggles ^= VERB_CONSENT // Skyrat - ERP Mechanic Addition