Merge branch 'master' into tgui-medical

code/modules/client/preference/loadout/loadout_accessories.dm

@@ -154,9 +154,6 @@
 	display_name = "corset, blue"
 	path = /obj/item/clothing/accessory/corset/blue
 
-/datum/gear/accessory/armband/job
-	subtype_path = /datum/gear/accessory/armband/job
-	subtype_cost_overlap = FALSE
 
 /datum/gear/accessory/armband_red
 	display_name = "armband"
@@ -166,41 +163,41 @@
 	display_name = "armband, blue-yellow"
 	path = /obj/item/clothing/accessory/armband/yb
 
-/datum/gear/accessory/armband/job/sec
+/datum/gear/accessory/armband_job
+	subtype_path = /datum/gear/accessory/armband_job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/accessory/armband_job/sec
 	display_name = " armband, security"
 	path = /obj/item/clothing/accessory/armband/sec
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Security Pod Pilot")
 
-/datum/gear/accessory/armband/job/cargo
+/datum/gear/accessory/armband_job/cargo
 	display_name = "cargo armband"
 	path = /obj/item/clothing/accessory/armband/cargo
 	allowed_roles = list("Quartermaster","Cargo Technician", "Shaft Miner")
 
-/datum/gear/accessory/armband/job/medical
+/datum/gear/accessory/armband_job/medical
 	display_name = "armband, medical"
 	path = /obj/item/clothing/accessory/armband/med
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic", "Brig Physician")
 
-/datum/gear/accessory/armband/job/emt
+/datum/gear/accessory/armband_job/emt
 	display_name = "armband, EMT"
 	path = /obj/item/clothing/accessory/armband/medgreen
 	allowed_roles = list("Paramedic", "Brig Physician")
 
-/datum/gear/accessory/armband/job/engineering
+/datum/gear/accessory/armband_job/engineering
 	display_name = "armband, engineering"
 	path = /obj/item/clothing/accessory/armband/engine
 	allowed_roles = list("Chief Engineer","Station Engineer", "Life Support Specialist")
 
-/datum/gear/accessory/armband/job/hydro
+/datum/gear/accessory/armband_job/hydro
 	display_name = "armband, hydroponics"
 	path = /obj/item/clothing/accessory/armband/hydro
 	allowed_roles = list("Botanist")
 
-/datum/gear/accessory/armband/job/sci
+/datum/gear/accessory/armband_job/sci
 	display_name = "armband, science"
 	path = /obj/item/clothing/accessory/armband/science
 	allowed_roles = list("Research Director","Scientist", "Roboticist")
-
-
-
-

code/modules/client/preference/loadout/loadout_hat.dm

@@ -108,50 +108,47 @@
 	display_name = "cowboy hat, pink"
 	path = /obj/item/clothing/head/cowboyhat/pink
 
-//Berets Refactor
-//Defining all Job Berets as no-overlap
-//Somehow this doesn't break the DB.
-/datum/gear/hat/beret/job
-	subtype_path = /datum/gear/hat/beret/job
-	subtype_cost_overlap = FALSE
-
-/datum/gear/hat/beret/purple
+/datum/gear/hat/beret_purple
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/purple_normal
 
-/datum/gear/hat/beret/black
+/datum/gear/hat/beret_black
 	display_name = "beret, black"
 	path = /obj/item/clothing/head/beret/black
 
-/datum/gear/hat/beret/blue
+/datum/gear/hat/beret_blue
 	display_name = "beret, blue"
 	path = /obj/item/clothing/head/beret/blue
 
-/datum/gear/hat/beret/red
+/datum/gear/hat/beret_red
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
 
-/datum/gear/hat/beret/job/sec
+/datum/gear/hat/beret_job
+	subtype_path = /datum/gear/hat/beret_job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/hat/beret_job/sec
 	display_name = "security beret"
 	path = /obj/item/clothing/head/beret/sec
 	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
 
-/datum/gear/hat/beret/job/sci
+/datum/gear/hat/beret_job/sci
 	display_name = "science beret"
 	path = /obj/item/clothing/head/beret/sci
 	allowed_roles = list("Research Director", "Scientist")
 
-/datum/gear/hat/beret/job/med
+/datum/gear/hat/beret_job/med
 	display_name = "medical beret"
 	path = /obj/item/clothing/head/beret/med
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Brig Physician" , "Coroner")
 
-/datum/gear/hat/beret/job/eng
+/datum/gear/hat/beret_job/eng
 	display_name = "engineering beret"
 	path = /obj/item/clothing/head/beret/eng
 	allowed_roles = list("Chief Engineer", "Station Engineer")
 
-/datum/gear/hat/beret/job/atmos
+/datum/gear/hat/beret_job/atmos
 	display_name = "atmospherics beret"
 	path = /obj/item/clothing/head/beret/atmos
 	allowed_roles = list("Chief Engineer", "Life Support Specialist")

code/modules/client/preference/preferences_toggles.dm

@@ -30,7 +30,8 @@
 	set name = "Show/Hide RadioChatter"
 	set category = "Preferences"
 	set desc = "Toggle seeing radiochatter from radios and speakers"
-	if(!holder) return
+	if(!check_rights(R_ADMIN))
+		return
 	prefs.toggles ^= CHAT_RADIO
 	prefs.save_preferences(src)
 	to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
@@ -49,7 +50,8 @@
 	set name = "Hear/Silence Admin Bwoinks"
 	set category = "Preferences"
 	set desc = "Toggle hearing a notification when admin PMs are recieved"
-	if(!holder)	return
+	if(!check_rights(R_ADMIN))
+		return
 	prefs.sound ^= SOUND_ADMINHELP
 	prefs.save_preferences(src)
 	to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
@@ -59,7 +61,7 @@
 	set name = "Hear/Silence Mentorhelp Bwoinks"
 	set category = "Preferences"
 	set desc = "Toggle hearing a notification when mentorhelps are recieved"
-	if(!holder)
+	if(!check_rights(R_ADMIN|R_MENTOR))
 		return
 	prefs.sound ^= SOUND_MENTORHELP
 	prefs.save_preferences(src)
@@ -296,7 +298,7 @@
 	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTPDA) ? "see all PDA messages" : "no longer see PDA messages"].")
 	prefs.save_preferences(src)
 	feedback_add_details("admin_verb","TGP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	
+
 /client/verb/silence_current_midi()
 	set name = "Silence Current Midi"
 	set category = "Preferences"