Tweaks the existing loadout categories

code/__DEFINES/~doppler_defines/loadout.dm

@@ -3,8 +3,6 @@
 
 /// Max amonut of misc / backpack items that are allowed.
 #define MAX_ALLOWED_MISC_ITEMS 3
-/// The maximum allowed amount of erp items allowed in any given character's loadout
-#define MAX_ALLOWED_ERP_ITEMS 7
 
 /// Defines for extra info blurbs, for loadout items.
 #define TOOLTIP_NO_ARMOR "Armorless"

code/modules/loadout/categories/pocket.dm

@@ -1,7 +1,7 @@
 /// Pocket items (Moved to backpack)
 /datum/loadout_category/pocket
-	category_name = "Other"
-	category_ui_icon = FA_ICON_QUESTION
+	category_name = "Items"
+	category_ui_icon = FA_ICON_PEN
 	type_to_generate = /datum/loadout_item/pocket_items
 	tab_order = /datum/loadout_category/head::tab_order + 5
 	/// How many pocket items are allowed

modular_doppler/loadout_categories/categories/clothing.dm

@@ -267,10 +267,6 @@
 	name = "Frontier Medical Jacket"
 	item_path = /obj/item/clothing/suit/jacket/frontier_colonist/medical
 
-/datum/loadout_item/suit/frontier_flak
-	name = "Frontier Flak Jacket"
-	item_path = /obj/item/clothing/suit/frontier_colonist_flak
-
 /*
 *	MISC
 */

modular_doppler/loadout_categories/categories/gloves.dm

@@ -64,6 +64,6 @@
 	name = "Rainbow Gloves"
 	item_path = /obj/item/clothing/gloves/color/rainbow
 
-/datum/loadout_item/gloves/frontier
-	name = "Frontier Gloves"
-	item_path = /obj/item/clothing/gloves/frontier_colonist
+/datum/loadout_item/gloves/latex
+	name = "Latex Gloves"
+	item_path = /obj/item/clothing/gloves/latex

modular_doppler/loadout_categories/categories/heads.dm

@@ -69,3 +69,15 @@
 /datum/loadout_item/head/wrussianw
 	name = "White Papakha"
 	item_path = /obj/item/clothing/head/costume/papakha/white
+
+/datum/loadout_item/head/hair_tie
+	name = "Hairtie"
+	item_path = /obj/item/clothing/head/hair_tie
+
+/datum/loadout_item/head/hair_tie_scrunchie
+	name = "Hairtie (Scrunchie)"
+	item_path = /obj/item/clothing/head/hair_tie/scrunchie
+
+/datum/loadout_item/head/hair_tie_plastic
+	name = "Hairtie (Plastic)"
+	item_path = /obj/item/clothing/head/hair_tie/plastic_beads

modular_doppler/loadout_categories/categories/inhands.dm

@@ -7,6 +7,10 @@
 	name = "Skateboard"
 	item_path = /obj/item/melee/skateboard
 
+/datum/loadout_item/inhand/mechanical_toolbox
+	name = "Mechanical Toolbox"
+	item_path = /obj/item/storage/toolbox/mechanical
+
 /datum/loadout_item/inhand/bouquet_mixed
 	name = "Mixed Bouquet"
 	item_path = /obj/item/bouquet

modular_doppler/loadout_categories/categories/masks.dm

@@ -64,6 +64,14 @@
 	name = "Frontier Gas Mask"
 	item_path = /obj/item/clothing/mask/gas/atmos/frontier_colonist
 
-/datum/loadout_item/mask/frontier
+/datum/loadout_item/mask/bandana
+	name = "Bandana"
+	item_path = /obj/item/clothing/mask/bandana
+
+/datum/loadout_item/mask/bandana_skull
+	name = "Bandana (Skull)"
+	item_path = /obj/item/clothing/mask/bandana/skull
+
+/datum/loadout_item/mask/neck_gaiter
 	name = "Neck Gaiter"
 	item_path = /obj/item/clothing/mask/neck_gaiter

modular_doppler/loadout_categories/categories/toys.dm

@@ -0,0 +1,78 @@
+/// Inhand items (Moves overrided items to backpack)
+/datum/loadout_category/toys
+	category_name = "Recreative"
+	category_ui_icon = FA_ICON_GUITAR
+	type_to_generate = /datum/loadout_item/toy
+	tab_order = /datum/loadout_category/inhands::tab_order + 1
+
+/datum/loadout_item/toy
+	abstract_type = /datum/loadout_item/toy
+
+/datum/loadout_item/toy/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE)
+	if(outfit.l_hand && !outfit.r_hand)
+		outfit.r_hand = item_path
+	else
+		if(outfit.l_hand)
+			LAZYADD(outfit.backpack_contents, outfit.l_hand)
+		outfit.l_hand = item_path
+
+/datum/loadout_item/toy/toy_sword
+	name = "Fake Energy-Sword"
+	item_path = /obj/item/toy/sword
+
+/datum/loadout_item/toy/toy_gun
+	name = "Fake .357 Revolver"
+	item_path = /obj/item/toy/gun
+
+/datum/loadout_item/toy/toy_laser_red
+	name = "Red Practice Laser"
+	item_path = /obj/item/gun/energy/laser/redtag
+
+/datum/loadout_item/toy/toy_laser_blue
+	name = "Blue Practice Laser"
+	item_path = /obj/item/gun/energy/laser/bluetag
+
+/datum/loadout_item/toy/donk_pistol
+	name = "DONK CO. Makarov Pistol"
+	item_path = /obj/item/gun/ballistic/automatic/pistol/toy
+
+/datum/loadout_item/toy/donk_rifle
+	name = "DONK CO. C-20r"
+	item_path = /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
+
+/datum/loadout_item/toy/synth
+	name = "Keyboard"
+	item_path = /obj/item/instrument/piano_synth
+
+/datum/loadout_item/toy/guitar
+	name = "Acoustic Guitar"
+	item_path = /obj/item/instrument/guitar
+
+/datum/loadout_item/toy/banjo
+	name = "Banjo"
+	item_path = /obj/item/instrument/banjo
+
+/datum/loadout_item/toy/violin
+	name = "Violin"
+	item_path = /obj/item/instrument/violin
+
+/datum/loadout_item/toy/eguitar
+	name = "Electric Guitar"
+	item_path = /obj/item/instrument/eguitar
+
+/datum/loadout_item/toy/glockenspiel
+	name = "Glockenspiel"
+	item_path = /obj/item/instrument/glockenspiel
+
+/datum/loadout_item/toy/recorder
+	name = "Recorder"
+	item_path = /obj/item/instrument/recorder
+
+/datum/loadout_item/toy/violin
+	name = "Violin"
+	item_path = /obj/item/instrument/violin
+
+/datum/loadout_item/toy/harmonica
+	name = "Harmonica"
+	item_path = /obj/item/instrument/harmonica
+	restricted_roles =  list(JOB_PRISONER)

modular_doppler/loadout_categories/loadout_checkers.dm

@@ -28,9 +28,6 @@
 		GLOB.all_loadout_datums[spawned_type.item_path] = spawned_type
 		. |= spawned_type
 
-/datum/loadout_category
-	var/erp_category = FALSE
-
 /datum/loadout_item
 	/// If set, is a list of job names of which can get the loadout item
 	var/list/restricted_roles
@@ -40,10 +37,6 @@
 	var/list/restricted_species
 	/// Whether the item requires a specific season in order to be available
 	var/required_season = null
-	/// If the item won't appear when the ERP config is disabled
-	var/erp_item = FALSE
-	/// If the item goes into the special erp box
-	var/erp_box = FALSE
 
 /*
  * Place our [var/item_path] into [outfit].

modular_doppler/modular_quirks/overwrites/musician.dm

@@ -0,0 +1,3 @@
+/// Removes the instrument delivery beacon from the quirk, to use the loadout selection instead
+/datum/quirk/item_quirk/musician/add_unique(client/client_source)
+	return

tgstation.dme

@@ -6615,7 +6615,6 @@
 #include "modular_doppler\loadout_categories\categories\belts.dm"
 #include "modular_doppler\loadout_categories\categories\clothing.dm"
 #include "modular_doppler\loadout_categories\categories\ears.dm"
-#include "modular_doppler\loadout_categories\categories\erp.dm"
 #include "modular_doppler\loadout_categories\categories\glasses.dm"
 #include "modular_doppler\loadout_categories\categories\gloves.dm"
 #include "modular_doppler\loadout_categories\categories\heads.dm"
@@ -6624,8 +6623,8 @@
 #include "modular_doppler\loadout_categories\categories\neck.dm"
 #include "modular_doppler\loadout_categories\categories\pockets.dm"
 #include "modular_doppler\loadout_categories\categories\shoes.dm"
+#include "modular_doppler\loadout_categories\categories\toys.dm"
 #include "modular_doppler\loadout_categories\categories\undersuit.dm"
-#include "modular_doppler\loadout_categories\categories\weapons.dm"
 #include "modular_doppler\modular_antagonists\datums\antag_recipes.dm"
 #include "modular_doppler\modular_antagonists\sapper_gang\sapper.dm"
 #include "modular_doppler\modular_antagonists\sapper_gang\sapper_event.dm"
@@ -6772,6 +6771,7 @@
 #include "modular_doppler\modular_medical\wounds\wound_effects.dm"
 #include "modular_doppler\modular_mob_spawn\code\mob_spawn.dm"
 #include "modular_doppler\modular_quirks\excitable\quirk.dm"
+#include "modular_doppler\modular_quirks\overwrites\musician.dm"
 #include "modular_doppler\modular_quirks\paycheck_rations\code\quirk.dm"
 #include "modular_doppler\modular_quirks\paycheck_rations\code\rationpacks.dm"
 #include "modular_doppler\modular_quirks\paycheck_rations\code\reagents.dm"