Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: static pref info to object #6418

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/components/pref_viewer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
for(var/datum/preference_info/pref as anything in preferences_to_show)
var/datum/preference_toggle/toggle = pref.get_preference_toggle()

if(!HASBIT(target.client.prefs.toggles, toggle::preftoggle_bitflag) \
&& !HASBIT(target.client.prefs.toggles2, toggle::preftoggle_bitflag)
if(!HASBIT(target.client.prefs.toggles, toggle.preftoggle_bitflag) \
&& !HASBIT(target.client.prefs.toggles2, toggle.preftoggle_bitflag)
)
continue

Expand Down
80 changes: 40 additions & 40 deletions code/modules/client/preference/preference_info.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,124 +128,124 @@
name = "Take out from round without objective"

/datum/preference_info/deadchat_visibility/get_preference_toggle()
return /datum/preference_toggle/toggle_deadchat_visibility
return new /datum/preference_toggle/toggle_deadchat_visibility

/datum/preference_info/ghost_ears/get_preference_toggle()
return /datum/preference_toggle/toggle_ghost_ears
return new /datum/preference_toggle/toggle_ghost_ears

/datum/preference_info/ghost_sight/get_preference_toggle()
return /datum/preference_toggle/toggle_ghost_sight
return new /datum/preference_toggle/toggle_ghost_sight

/datum/preference_info/ghost_radio/get_preference_toggle()
return /datum/preference_toggle/toggle_ghost_radio
return new /datum/preference_toggle/toggle_ghost_radio

/datum/preference_info/admin_radio/get_preference_toggle()
return /datum/preference_toggle/toggle_admin_radio
return new /datum/preference_toggle/toggle_admin_radio

/datum/preference_info/ai_voice_announcements/get_preference_toggle()
return /datum/preference_toggle/toggle_ai_voice_annoucements
return new /datum/preference_toggle/toggle_ai_voice_annoucements

/datum/preference_info/admin_pm_sound/get_preference_toggle()
return /datum/preference_toggle/toggle_admin_pm_sound
return new /datum/preference_toggle/toggle_admin_pm_sound

/datum/preference_info/mentor_pm_sound/get_preference_toggle()
return /datum/preference_toggle/toggle_mentor_pm_sound
return new /datum/preference_toggle/toggle_mentor_pm_sound

/datum/preference_info/end_of_round_scoreboard/get_preference_toggle()
return /datum/preference_toggle/end_of_round_scoreboard
return new /datum/preference_toggle/end_of_round_scoreboard

/datum/preference_info/title_music/get_preference_toggle()
return /datum/preference_toggle/title_music
return new /datum/preference_toggle/title_music

/datum/preference_info/admin_midis/get_preference_toggle()
return /datum/preference_toggle/toggle_admin_midis
return new /datum/preference_toggle/toggle_admin_midis

/datum/preference_info/ooc/get_preference_toggle()
return /datum/preference_toggle/toggle_ooc
return new /datum/preference_toggle/toggle_ooc

/datum/preference_info/looc/get_preference_toggle()
return /datum/preference_toggle/toggle_looc
return new /datum/preference_toggle/toggle_looc

/datum/preference_info/ambience/get_preference_toggle()
return /datum/preference_toggle/toggle_ambience
return new /datum/preference_toggle/toggle_ambience

/datum/preference_info/white_noise/get_preference_toggle()
return /datum/preference_toggle/toggle_white_noise
return new /datum/preference_toggle/toggle_white_noise

/datum/preference_info/heartbeat_noise/get_preference_toggle()
return /datum/preference_toggle/toggle_heartbeat_noise
return new /datum/preference_toggle/toggle_heartbeat_noise

/datum/preference_info/instruments/get_preference_toggle()
return /datum/preference_toggle/toggle_instruments
return new /datum/preference_toggle/toggle_instruments

/datum/preference_info/disco/get_preference_toggle()
return /datum/preference_toggle/toggle_disco
return new /datum/preference_toggle/toggle_disco

/datum/preference_info/ghost_pda/get_preference_toggle()
return /datum/preference_toggle/toggle_ghost_pda
return new /datum/preference_toggle/toggle_ghost_pda

/datum/preference_info/runechat/get_preference_toggle()
return /datum/preference_toggle/toggle_runechat
return new /datum/preference_toggle/toggle_runechat

/datum/preference_info/ghost_death_notifs/get_preference_toggle()
return /datum/preference_toggle/toggle_ghost_death_notifs
return new /datum/preference_toggle/toggle_ghost_death_notifs

/datum/preference_info/reverb/get_preference_toggle()
return /datum/preference_toggle/toggle_reverb
return new /datum/preference_toggle/toggle_reverb

/datum/preference_info/simple_stat_panel/get_preference_toggle()
return /datum/preference_toggle/toggle_simple_stat_panel
return new /datum/preference_toggle/toggle_simple_stat_panel

/datum/preference_info/anonmode/get_preference_toggle()
return /datum/preference_toggle/toggle_anonmode
return new /datum/preference_toggle/toggle_anonmode

/datum/preference_info/typing_indicator/get_preference_toggle()
return /datum/preference_toggle/toggle_typing_indicator
return new /datum/preference_toggle/toggle_typing_indicator

/datum/preference_info/admin_logs/get_preference_toggle()
return /datum/preference_toggle/toggle_admin_logs
return new /datum/preference_toggle/toggle_admin_logs

/datum/preference_info/mhelp_notification/get_preference_toggle()
return /datum/preference_toggle/toggle_mhelp_notification
return new /datum/preference_toggle/toggle_mhelp_notification

/datum/preference_info/ahelp_notification/get_preference_toggle()
return /datum/preference_toggle/toggle_ahelp_notification
return new /datum/preference_toggle/toggle_ahelp_notification

/datum/preference_info/debug_logs/get_preference_toggle()
return /datum/preference_toggle/toggle_debug_logs
return new /datum/preference_toggle/toggle_debug_logs

/datum/preference_info/mctabs/get_preference_toggle()
return /datum/preference_toggle/toggle_mctabs
return new /datum/preference_toggle/toggle_mctabs

/datum/preference_info/attack_animations/get_preference_toggle()
return /datum/preference_toggle/toggle_attack_animations
return new /datum/preference_toggle/toggle_attack_animations

/datum/preference_info/prayers/get_preference_toggle()
return /datum/preference_toggle/toggleprayers
return new /datum/preference_toggle/toggleprayers

/datum/preference_info/prayers_notify/get_preference_toggle()
return /datum/preference_toggle/toggle_prayers_notify
return new /datum/preference_toggle/toggle_prayers_notify

/datum/preference_info/karma_reminder/get_preference_toggle()
return /datum/preference_toggle/toggle_karma_reminder
return new /datum/preference_toggle/toggle_karma_reminder

/datum/preference_info/parallax_multiz/get_preference_toggle()
return /datum/preference_toggle/toggle_parallax_multiz
return new /datum/preference_toggle/toggle_parallax_multiz

/datum/preference_info/vote_popup/get_preference_toggle()
return /datum/preference_toggle/toggle_vote_popup
return new /datum/preference_toggle/toggle_vote_popup

/datum/preference_info/tgui_input/get_preference_toggle()
return /datum/preference_toggle/toggle_tgui_input
return new /datum/preference_toggle/toggle_tgui_input

/datum/preference_info/strip_tgui_size/get_preference_toggle()
return /datum/preference_toggle/toggle_strip_tgui_size
return new /datum/preference_toggle/toggle_strip_tgui_size

/datum/preference_info/item_descritpion_tips/get_preference_toggle()
return /datum/preference_toggle/toggle_item_descritpion_tips
return new /datum/preference_toggle/toggle_item_descritpion_tips

/datum/preference_info/take_out_of_the_round_without_obj/get_preference_toggle()
return /datum/preference_toggle/toggle_take_out_of_the_round_without_obj
return new /datum/preference_toggle/toggle_take_out_of_the_round_without_obj

/datum/preference_info/take_out_of_the_round_without_obj/get_examine_text()
return "\n<div class='examine'>[span_info("Вы можете вывести этого игрока из игры не имея соответствующей цели.")]</div>"
Loading