Revert "Merge pull request #16240 from ShadowLarkens/revert"

This reverts commit 885171f985, reversing
changes made to 3e314f8064.

code/modules/admin/admin.dm

@@ -17,7 +17,7 @@ var/global/floorIsLava = 0
 	var/rendered = "<span class='filter_attacklog log_message'><span class='prefix'>ATTACK:</span> <span class=\"message\">[text]</span></span>"
 	for(var/client/C in GLOB.admins)
 		if((R_ADMIN|R_MOD) & C.holder.rights)
-			if(C.is_preference_enabled(/datum/client_preference/mod/show_attack_logs))
+			if(C.prefs?.read_preference(/datum/preference/toggle/show_attack_logs))
 				var/msg = rendered
 				to_chat(C,
 						type = MESSAGE_TYPE_ATTACKLOG,

code/modules/admin/admin_verb_lists_vr.dm

@@ -18,8 +18,6 @@ var/list/admin_verbs_default = list(
 //	/client/proc/cmd_mod_say,
 //	/client/proc/deadchat				//toggles deadchat on/off,
 //	/client/proc/toggle_ahelp_sound,
-	/client/proc/toggle_admin_global_looc,
-	/client/proc/toggle_admin_deadchat
 	)
 
 var/list/admin_verbs_admin = list(
@@ -118,8 +116,6 @@ var/list/admin_verbs_admin = list(
 	/client/proc/change_security_level,
 	/client/proc/view_chemical_reaction_logs,
 	/client/proc/makepAI,
-	/client/proc/toggle_debug_logs,
-	/client/proc/toggle_attack_logs,
 	/datum/admins/proc/paralyze_mob,
 	/client/proc/fixatmos,
 	/datum/admins/proc/quick_nif, //VOREStation Add,
@@ -267,7 +263,6 @@ var/list/admin_verbs_debug = list(
 	/client/proc/jumptomob,
 	/client/proc/jumptocoord,
 	/client/proc/dsay,
-	/client/proc/toggle_debug_logs,
 	/client/proc/admin_ghost,			//allows us to ghost/reenter body at will,
 	/datum/admins/proc/show_player_panel,	//shows an interface for individual players, with various links (links require additional flags, //VOREStation Add,
 	/client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Add,
@@ -411,7 +406,6 @@ var/list/admin_verbs_mod = list(
 	/client/proc/check_antagonists,
 	/client/proc/aooc,
 	/client/proc/jobbans,
-	/client/proc/toggle_attack_logs,
 	/client/proc/cmd_admin_subtle_message, 	//send an message to somebody as a 'voice in their head',
 	/datum/admins/proc/paralyze_mob,
 	/client/proc/cmd_admin_direct_narrate,
@@ -547,8 +541,6 @@ var/list/admin_verbs_event_manager = list(
 	/client/proc/change_human_appearance_self,      // Allows the human-based mob itself change its basic appearance ,
 	/client/proc/change_security_level,
 	/client/proc/makepAI,
-	/client/proc/toggle_debug_logs,
-	/client/proc/toggle_attack_logs,
 	/datum/admins/proc/paralyze_mob,
 	/client/proc/fixatmos,
 	/datum/admins/proc/sendFax,

code/modules/admin/verbs/adminhelp.dm

@@ -251,7 +251,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	for(var/client/X in GLOB.admins)
 		if(!check_rights(R_ADMIN, 0, X))
 			continue
-		if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
+		if(X.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
 			X << 'sound/effects/adminhelp.ogg'
 		window_flash(X)
 		to_chat(X, chat_msg)
@@ -362,7 +362,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		return
 
 	if(initiator)
-		if(initiator.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
+		if(initiator.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
 			initiator << 'sound/effects/adminhelp.ogg'
 
 		to_chat(initiator, "<span class='filter_pm'>[span_red("<font size='4'><b>- AdminHelp Rejected! -</b></font>")]<br>\

code/modules/admin/verbs/adminpm.dm

@@ -165,7 +165,7 @@
 				to_chat(src, "<span class='pm notice'>PM to-<b>Admins</b>: [msg]</span>")
 
 			//play the recieving admin the adminhelp sound (if they have them enabled)
-			if(recipient.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
+			if(recipient.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
 				recipient << 'sound/effects/adminhelp.ogg'
 
 		else

code/modules/admin/verbs/deadsay.dm

@@ -11,7 +11,7 @@
 		to_chat(src, "<span class='warning'>You cannot send DSAY messages (muted).</span>")
 		return
 
-	if(!is_preference_enabled(/datum/client_preference/show_dsay))
+	if(!prefs?.read_preference(/datum/preference/toggle/show_dsay))
 		to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
 		return
 

code/modules/admin/verbs/lightning_strike.dm

@@ -65,7 +65,7 @@
 	var/sound = get_sfx("thunder")
 	for(var/mob/M in 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.check_sound_preference(/datum/preference/toggle/weather_sounds))
 				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.

code/modules/admin/verbs/playsound.dm

@@ -42,7 +42,7 @@ var/list/sounds_cache = list()
 	message_admins("[key_name_admin(src)] played sound [S]", 1)
 
 	for(var/mob/M in player_list)
-		if(M.is_preference_enabled(/datum/client_preference/play_admin_midis))
+		if(M.read_preference(/datum/preference/toggle/play_admin_midis))
 			admin_sound.volume = vol * M.client.admin_music_volume
 			SEND_SOUND(M, admin_sound)
 			admin_sound.volume = vol
@@ -91,7 +91,7 @@ var/list/sounds_cache = list()
 	log_admin("[key_name(src)] played sound [S] on Z[target_z]")
 	message_admins("[key_name_admin(src)] played sound [S] on Z[target_z]", 1)
 	for(var/mob/M in player_list)
-		if(M.is_preference_enabled(/datum/client_preference/play_admin_midis) && M.z == target_z)
+		if(M.read_preference(/datum/preference/toggle/play_admin_midis) && M.z == target_z)
 			M << uploaded_sound
 
 	feedback_add_details("admin_verb", "Play Z Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -204,7 +204,7 @@ var/list/sounds_cache = list()
 		for(var/m in player_list)
 			var/mob/M = m
 			var/client/C = M.client
-			if(C.is_preference_enabled(/datum/client_preference/play_admin_midis))
+			if(C.prefs?.read_preference(/datum/preference/toggle/play_admin_midis))
 				if(!stop_web_sounds)
 					C.tgui_panel?.play_music(web_sound_url, music_extra_data)
 				else

code/modules/admin/verbs/pray.dm

@@ -21,7 +21,7 @@
 
 	for(var/client/C in GLOB.admins)
 		if(R_ADMIN|R_EVENT & C.holder.rights)
-			if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers))
+			if(C.prefs?.read_preference(/datum/preference/toggle/show_chat_prayers))
 				to_chat(C, msg, type = MESSAGE_TYPE_PRAYER, confidential = TRUE)
 				C << 'sound/effects/ding.ogg'
 	to_chat(usr, "Your prayers have been received by the gods.", confidential = TRUE)