Merge branch 'master' into cleanupTwo

code/modules/admin/verbs/adminhelp.dm

@@ -100,7 +100,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		if((R_ADMIN|R_MOD|R_MENTOR|R_SERVER) & X.holder.rights)
 			if(X.is_afk())
 				admin_number_afk++
-			if(X.prefs.toggles & SOUND_ADMINHELP)
+			if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
 				X << 'sound/effects/adminhelp.ogg'
 			if(X.holder.rights == R_MENTOR)
 				X << mentor_msg		// Mentors won't see coloring of names on people with special_roles (Antags, etc.)

code/modules/admin/verbs/adminpm.dm

@@ -104,7 +104,7 @@
 
 	//play the recieving admin the adminhelp sound (if they have them enabled)
 	//non-admins shouldn't be able to disable this
-	if(C.prefs && C.prefs.toggles & SOUND_ADMINHELP)
+	if(C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
 		C << 'sound/effects/adminhelp.ogg'
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")

code/modules/admin/verbs/deadsay.dm

@@ -8,11 +8,11 @@
 	if(!src.mob)
 		return
 	if(prefs.muted & MUTE_DEADCHAT)
-		src << "\red You cannot send DSAY messages (muted)."
+		src << "<span class='warning'>You cannot send DSAY messages (muted).</span>"
 		return
 
-	if(!(prefs.toggles & CHAT_DEAD))
-		src << "\red You have deadchat muted."
+	if(!is_preference_enabled(/datum/client_preference/show_dsay))
+		src << "<span class='warning'>You have deadchat muted.</span>"
 		return
 
 	if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))

code/modules/admin/verbs/debug.dm

@@ -732,7 +732,7 @@
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 		if("blue wizard")
-			M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
@@ -744,7 +744,7 @@
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 
 		if("red wizard")
-			M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
@@ -756,7 +756,7 @@
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 
 		if("marisa wizard")
-			M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)

code/modules/admin/verbs/grief_fixers.dm

@@ -0,0 +1,54 @@
+/client/proc/fixatmos()
+	set category = "Admin"
+	set name = "Fix Atmospherics Grief"
+
+	if(!check_rights(R_ADMIN|R_DEBUG)) return
+
+
+	if(alert("WARNING: Executing this command will perform a full reset of atmosphere. All pipelines will lose any gas that may be in them, and all zones will be reset to contain air mix as on roundstart. The supermatter engine will also be stopped (to prevent overheat due to removal of coolant). Do not use unless the station is suffering serious atmospheric issues due to grief or bug.", "Full Atmosphere Reboot", "No", "Yes") == "No")
+		return
+	feedback_add_details("admin_verb","FA")
+
+	log_and_message_admins("Full atmosphere reset initiated by [usr].")
+	world << "<span class = 'danger'>Initiating restart of atmosphere. The server may lag a bit.</span>"
+	sleep(10)
+	var/current_time = world.timeofday
+
+	// Depower the supermatter, as it would quickly blow up once we remove all gases from the pipes.
+	for(var/obj/machinery/power/supermatter/S in machines)
+		S.power = 0
+	usr << "\[1/5\] - Supermatter depowered"
+
+	// Remove all gases from all pipenets
+	for(var/datum/pipe_network/PN in pipe_networks)
+		for(var/datum/gas_mixture/G in PN.gases)
+			G.gas = list()
+			G.update_values()
+
+	usr << "\[2/5\] - All pipenets purged of gas."
+
+	// Delete all zones.
+	for(var/zone/Z in world)
+		Z.c_invalidate()
+
+	usr << "\[3/5\] - All ZAS Zones removed."
+
+	var/list/unsorted_overlays = list()
+	for(var/id in gas_data.tile_overlay)
+		unsorted_overlays |= gas_data.tile_overlay[id]
+
+
+	for(var/turf/simulated/T in world)
+		T.air = null
+		T.overlays.Remove(unsorted_overlays)
+		T.zone = null
+
+	usr << "\[4/5\] - All turfs reset to roundstart values."
+
+	qdel(air_master)
+	air_master = new
+	air_master.Setup()
+	spawn air_master.Start()
+
+	usr << "\[5/5\] - ZAS Rebooted"
+	world << "<span class = 'danger'>Atmosphere restart completed in <b>[(world.timeofday - current_time)/10]</b> seconds.</span>"

code/modules/admin/verbs/modifyvariables.dm

@@ -1,7 +1,7 @@
 var/list/forbidden_varedit_object_types = list(
-										/datum/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea.
-										/obj/machinery/blackbox_recorder,	//Prevents people messing with feedback gathering
-										/datum/feedback_variable			//Prevents people messing with feedback gathering
+										/datum/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea,
+										/obj/machinery/blackbox_recorder,	//Prevents people messing with feedback gathering,
+										/datum/feedback_variable			//Prevents people messing with feedback gathering,
 									)
 
 var/list/VVlocked = list("vars", "client", "virus", "viruses", "cuffed", "last_eaten", "unlock_content", "bound_x", "bound_y", "step_x", "step_y", "force_ending")

code/modules/admin/verbs/playsound.dm

@@ -16,7 +16,7 @@ var/list/sounds_cache = list()
 	log_admin("[key_name(src)] played sound [S]")
 	message_admins("[key_name_admin(src)] played sound [S]", 1)
 	for(var/mob/M in player_list)
-		if(M.client.prefs.toggles & SOUND_MIDI)
+		if(M.is_preference_enabled(/datum/client_preference/play_admin_midis))
 			M << uploaded_sound
 
 	feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/pray.dm

@@ -21,7 +21,7 @@
 
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
-			if(C.prefs.toggles & CHAT_PRAYER)
+			if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers))
 				C << msg
 	usr << "Your prayers have been received by the gods."
 

code/modules/admin/verbs/randomverbs.dm

@@ -234,9 +234,9 @@ Ccomp's first proc.
 
 	var/list/mobs = list()
 	var/list/ghosts = list()
-	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
-	/var/any=0
-	for(var/mob/observer/dead/M in sortmob)
+	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
+	var/any=0
+	for(var/mob/observer/dead/M in sortmob)
 		mobs.Add(M)                                             //filter it where it's only ghosts
 		any = 1                                                 //if no ghosts show up, any will just be 0
 	if(!any)