Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

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

@@ -63,10 +63,6 @@
 	display_name = "Fur Cap"
 	path = /obj/item/clothing/head/furcap
 
-/datum/gear/donor/mouse
-	display_name = "Mouse Headband"
-	path = /obj/item/clothing/head/kitty/mouse
-
 /datum/gear/donor/fawkes
 	display_name = "Guy Fawkes mask"
 	path = /obj/item/clothing/mask/fawkes

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

@@ -138,10 +138,6 @@
 	path = /obj/item/cartridge/mob_hunt_game
 	cost = 2
 
-/datum/gear/piano_synth
-	display_name ="synthesizer"
-	path = /obj/item/instrument/piano_synth
-	cost = 2
 //////////////////////
 //		Mugs		//
 //////////////////////
@@ -197,3 +193,62 @@
 	display_name = "crewmember coffee mug"
 	description = "A crewmember's coffee mug, emblazoned in the colors of the Service department."
 	path = /obj/item/reagent_containers/food/drinks/mug/serv
+
+
+//////////////////////
+//	  Instruments	//
+//////////////////////
+
+/datum/gear/instrument
+	display_name = "Synthesizer"
+	path = /obj/item/instrument/piano_synth
+	sort_category = "Instruments"
+	cost = 2
+
+/datum/gear/instrument/accordion
+	display_name = "Accordion"
+	path = /obj/item/instrument/accordion
+
+/datum/gear/instrument/banjo
+	display_name = "Banjo"
+	path = /obj/item/instrument/banjo
+
+/datum/gear/instrument/eguitar
+	display_name = "Electric guitar"
+	path = /obj/item/instrument/eguitar
+
+/datum/gear/instrument/glock
+	display_name = "Glockenspiel"
+	path = /obj/item/instrument/glockenspiel
+
+/datum/gear/instrument/guitar
+	display_name = "Guitar"
+	path = /obj/item/instrument/guitar
+
+/datum/gear/instrument/harmonica
+	display_name = "Harmonica"
+	path = /obj/item/instrument/harmonica
+
+/datum/gear/instrument/recorder
+	display_name = "Recorder"
+	path = /obj/item/instrument/recorder
+
+/datum/gear/instrument/sax
+	display_name = "Saxophone"
+	path = /obj/item/instrument/saxophone
+
+/datum/gear/instrument/trumpet
+	display_name = "Trumpet"
+	path = /obj/item/instrument/trumpet
+
+/datum/gear/instrument/trombone
+	display_name = "Trombone"
+	path = /obj/item/instrument/trombone
+
+/datum/gear/instrument/violin
+	display_name = "Violin"
+	path = /obj/item/instrument/violin
+
+/datum/gear/instrument/xylo
+	display_name = "Xylophone"
+	path = /obj/item/instrument/xylophone

code/modules/client/preference/preferences.dm

@@ -362,7 +362,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 			dat += "</td><td width='405px' height='200px' valign='top'>"
 			dat += "<h2>Occupation Choices</h2>"
 			dat += "<a href='?_src_=prefs;preference=job;task=menu'>Set Occupation Preferences</a><br>"
-			if(jobban_isbanned(user, "Records"))
+			if(jobban_isbanned(user, ROLEBAN_RECORDS))
 				dat += "<b>You are banned from using character records.</b><br>"
 			else
 				dat += "<a href=\"byond://?_src_=prefs;preference=records;record=1\">Character Records</a><br>"
@@ -495,7 +495,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 			// RIGHT SIDE OF THE PAGE
 			dat += "</td><td width='300px' height='300px' valign='top'>"
 			dat += "<h2>Special Role Settings</h2>"
-			if(jobban_isbanned(user, "Syndicate"))
+			if(jobban_isbanned(user, ROLE_SYNDICATE))
 				dat += "<b>You are banned from special roles.</b>"
 				be_special = list()
 			else