mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-23 16:27:04 +01:00
reworks game preferences (characters v2 staging) (#6310)
Co-authored-by: silicons <no@you.cat> Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
This commit is contained in:
co-authored by
silicons
LordME
parent
9f1b911556
commit
39bc14bb4a
@@ -252,8 +252,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
|
||||
//send this msg to all admins
|
||||
|
||||
for(var/client/X in GLOB.admins)
|
||||
if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
|
||||
// if(X.get_preference_toggle(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
// SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
|
||||
SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
|
||||
window_flash(X)
|
||||
to_chat(X, chat_msg)
|
||||
|
||||
@@ -339,8 +340,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
|
||||
return
|
||||
|
||||
if(initiator)
|
||||
if(initiator.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
|
||||
// if(initiator.get_preference_toggle(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
// SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
|
||||
SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
|
||||
|
||||
to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
|
||||
to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b></font>")
|
||||
|
||||
@@ -166,8 +166,9 @@
|
||||
to_chat(src, "<font color=#4F49AF>PM to-<b>Admins</b>: [msg]</font>")
|
||||
|
||||
//play the recieving admin the adminhelp sound (if they have them enabled)
|
||||
if(recipient.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
|
||||
// if(recipient.get_preference_toggle(/datum/client_preference/holder/play_adminhelp_ping))
|
||||
// SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
|
||||
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
|
||||
|
||||
else
|
||||
if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/client/proc/aooc(msg as text)
|
||||
set category = "OOC"
|
||||
set category = VERB_CATEGORY_OOC
|
||||
set name = "AOOC"
|
||||
set desc = "Antagonist OOC"
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
// normal verb for players to view info
|
||||
/client/verb/cmd_view_custom_event()
|
||||
set category = "OOC"
|
||||
set category = VERB_CATEGORY_OOC
|
||||
set name = "Custom Event Info"
|
||||
|
||||
if(!custom_event_msg || custom_event_msg == "")
|
||||
|
||||
@@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(stealthmin_nicknames, world.file2list("[global.config.directory
|
||||
to_chat(src, "<span class='warning'>You cannot send DSAY messages (muted).</span>")
|
||||
return
|
||||
|
||||
if(!is_preference_enabled(/datum/client_preference/show_dsay))
|
||||
if(!get_preference_toggle(/datum/game_preference_toggle/chat/dsay))
|
||||
to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
|
||||
return
|
||||
|
||||
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(stealthmin_nicknames, world.file2list("[global.config.directory
|
||||
|
||||
var/key
|
||||
if(holder.fakekey)
|
||||
if(is_preference_enabled(/datum/client_preference/holder/obfuscate_stealth_dsay))
|
||||
if(get_preference_toggle(/datum/game_preference_toggle/admin/obfuscate_stealth_dsay))
|
||||
key = pick(GLOB.stealthmin_nicknames)
|
||||
else
|
||||
key = holder.fakekey
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
var/sound = get_sfx("thunder")
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
if((P && (M.z in P.expected_z_levels)) || M.z == T.z)
|
||||
if(M.is_preference_enabled(/datum/client_preference/weather_sounds))
|
||||
if(M.get_preference_toggle(/datum/game_preference_toggle/ambience/weather))
|
||||
M.playsound_local(get_turf(M), soundin = sound, vol = 70, vary = FALSE, is_global = TRUE)
|
||||
|
||||
if(cosmetic) // Everything beyond here involves potentially damaging things. If we don't want to do that, stop now.
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
message_admins("[key_name_admin(src)] played sound [S]")
|
||||
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
if(M.is_preference_enabled(/datum/client_preference/play_admin_midis)) //if(M.client.prefs.toggles & SOUND_MIDI)
|
||||
if(M.get_preference_toggle(/datum/game_preference_toggle/music/admin)) //if(M.client.prefs.toggles & SOUND_MIDI)
|
||||
admin_sound.volume = vol * M.client.admin_music_volume
|
||||
SEND_SOUND(M, admin_sound)
|
||||
admin_sound.volume = vol
|
||||
@@ -126,7 +126,7 @@
|
||||
for(var/m in GLOB.player_list)
|
||||
var/mob/M = m
|
||||
var/client/C = M.client
|
||||
if(M.is_preference_enabled(/datum/client_preference/play_admin_midis)) //if(C.prefs.toggles & SOUND_MIDI)
|
||||
if(M.get_preference_toggle(/datum/game_preference_toggle/music/admin)) //if(C.prefs.toggles & SOUND_MIDI)
|
||||
if(!stop_web_sounds)
|
||||
C.tgui_panel?.play_music(web_sound_url, music_extra_data)
|
||||
else
|
||||
@@ -176,7 +176,7 @@
|
||||
for(var/m in GLOB.player_list)
|
||||
var/mob/M = m
|
||||
var/client/C = M.client
|
||||
if(M.is_preference_enabled(/datum/client_preference/play_admin_midis)) //if(C.prefs.toggles & SOUND_MIDI)
|
||||
if(M.get_preference_toggle(/datum/game_preference_toggle/music/admin)) //if(C.prefs.toggles & SOUND_MIDI)
|
||||
C.tgui_panel?.play_music(web_sound_input, music_extra_data)
|
||||
|
||||
//SSblackbox.record_feedback("tally", "admin_verb", 1, "Manual Play Internet Sound")
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/proc/possess(obj/O as obj in world)
|
||||
set name = "Possess Obj"
|
||||
set category = "Object"
|
||||
set category = VERB_CATEGORY_OBJECT
|
||||
|
||||
if(!O.loc)
|
||||
return // erm erm erm maybe not?
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
/proc/release(obj/O as obj in world)
|
||||
set name = "Release Obj"
|
||||
set category = "Object"
|
||||
set category = VERB_CATEGORY_OBJECT
|
||||
//usr.loc = get_turf(usr)
|
||||
|
||||
if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/// Used by players to ask badmins to do things for them, but ICly.
|
||||
/mob/verb/pray(msg as text)
|
||||
set category = "IC"
|
||||
set category = VERB_CATEGORY_IC
|
||||
set name = "Pray"
|
||||
|
||||
msg = sanitize(msg)
|
||||
@@ -49,9 +49,8 @@
|
||||
|
||||
for(var/client/C in GLOB.admins)
|
||||
if((R_ADMIN|R_MOD) & C.holder.rights)
|
||||
if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers))
|
||||
to_chat(C, msg)
|
||||
SEND_SOUND(C, sound('sound/effects/ding.ogg'))
|
||||
to_chat(C, msg)
|
||||
SEND_SOUND(C, sound('sound/effects/ding.ogg'))
|
||||
|
||||
to_chat(usr, SPAN_INFO("You pray to the gods: \"[msg_tmp]\""), confidential = TRUE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user