adds a wide varriety of new loadout options and some minor cost adjustments (#12873)

* adds a wide varriety of new loadout options and some minor cost adjustments

* forgot to enable the vox plushie

* Removed the contravercial items and added camera, kilt, and lizard plushie as choices

* Deconflicted and the unwanted items removed

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

@@ -18,22 +18,68 @@
 	display_name = "a pack of Midoris"
 	path = /obj/item/storage/fancy/cigarettes/cigpack_midori
 
+/datum/gear/smokingpipe
+	display_name = "smoking pipe"
+	path = /obj/item/clothing/mask/cigarette/pipe
+	cost = 2
+
 /datum/gear/lighter
 	display_name = "a cheap lighter"
 	path = /obj/item/lighter
 
+/datum/gear/matches
+	display_name = "a box of matches"
+	path = /obj/item/storage/box/matches
+
+/datum/gear/candlebox
+	display_name = "a box candles"
+	description = "For setting the mood or for occult rituals."
+	path = /obj/item/storage/fancy/candle_box
+
 /datum/gear/rock
 	display_name = "a pet rock"
 	path = /obj/item/toy/pet_rock
 
+/datum/gear/camera
+	display_name = "a camera"
+	path = /obj/item/camera
+
+/datum/gear/redfoxplushie
+	display_name = "a red fox plushie"
+	path = /obj/item/toy/plushie/red_fox
+
+/datum/gear/blackcatplushie
+	display_name = "a black cat plushie"
+	path = /obj/item/toy/plushie/black_cat
+
+/datum/gear/voxplushie
+	display_name = "a vox plushie"
+	path = /obj/item/toy/plushie/voxplushie
+
+/datum/gear/lizardplushie
+	display_name = "a lizard plushie"
+	path = /obj/item/toy/plushie/lizardplushie
+
+/datum/gear/deerplushie
+	display_name = "a deer plushie"
+	path = /obj/item/toy/plushie/deer
+
+/datum/gear/carpplushie
+	display_name = "a carp plushie"
+	path = /obj/item/toy/carpplushie
+
 /datum/gear/sechud
 	display_name = "a classic security HUD"
 	path = /obj/item/clothing/glasses/hud/security
 	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent","Magistrate")
 
-/datum/gear/matches
-	display_name = "a box of matches"
-	path = /obj/item/storage/box/matches
+/datum/gear/cryaonbox
+	display_name = "a box of crayons"
+	path = /obj/item/storage/fancy/crayons
+
+/datum/gear/cane
+	display_name = "a walking cane"
+	path = /obj/item/cane
 
 /datum/gear/cards
 	display_name = "a deck of standard cards"
@@ -51,6 +97,10 @@
 	display_name = "a pair of headphones"
 	path = /obj/item/clothing/ears/headphones
 
+/datum/gear/fannypack
+	display_name = "a fannypack"
+	path = /obj/item/storage/belt/fannypack
+
 /datum/gear/blackbandana
 	display_name = "bandana, black"
 	path = /obj/item/clothing/mask/bandana/black
@@ -105,6 +155,11 @@
 	cost = 2
 	sort_category = "Mugs"
 
+/datum/gear/mug/flask
+	display_name = "flask"
+	description = "A flask for drink transportation. You'll need to supply your own beverage though."
+	path = /obj/item/reagent_containers/food/drinks/flask/barflask
+
 /datum/gear/mug/department
 	subtype_path = /datum/gear/mug/department
 	sort_category = "Mugs"

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

@@ -6,3 +6,11 @@
 /datum/gear/gloves/fingerless
 	display_name = "Fingerless Gloves"
 	path = /obj/item/clothing/gloves/fingerless
+
+/datum/gear/gloves/silverring
+	display_name = "Silver ring"
+	path = /obj/item/clothing/gloves/ring/silver
+
+/datum/gear/gloves/goldring
+	display_name = "Gold ring"
+	path = /obj/item/clothing/gloves/ring/gold

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

@@ -26,10 +26,22 @@
 	display_name = "flat cap"
 	path = /obj/item/clothing/head/flatcap
 
+/datum/gear/hat/witch
+	display_name = "witch hat"
+	path = /obj/item/clothing/head/wizard/marisa/fake
+
+/datum/gear/hat/piratecaphat
+	display_name = "pirate captian hat"
+	path = /obj/item/clothing/head/pirate
+
 /datum/gear/hat/fez
 	display_name = "fez"
 	path = /obj/item/clothing/head/fez
 
+/datum/gear/hat/rasta
+	display_name = "rasta hat"
+	path = /obj/item/clothing/head/beanie/rasta
+
 /datum/gear/hat/bfedora
 	display_name = "fedora, black"
 	path = /obj/item/clothing/head/fedora

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

@@ -17,12 +17,10 @@
 
 /datum/gear/shoes/fancysandals
 	display_name = "sandals, fancy"
-	cost = 2
 	path = /obj/item/clothing/shoes/sandal/fancy
 
 /datum/gear/shoes/dressshoes
 	display_name = "dress shoes"
-	cost = 2
 	path = /obj/item/clothing/shoes/centcom
 
 /datum/gear/shoes/cowboyboots
@@ -41,6 +39,14 @@
 	display_name = "cowboy boots, pink"
 	path = /obj/item/clothing/shoes/cowboy/pink
 
+/datum/gear/shoes/jackboots
+	display_name = "jackboots"
+	path = /obj/item/clothing/shoes/jackboots
+
+/datum/gear/shoes/jacksandals
+	display_name = "jacksandals"
+	path = /obj/item/clothing/shoes/jackboots/jacksandals
+
 /datum/gear/shoes/laceup
 	display_name = "laceup shoes"
 	path = /obj/item/clothing/shoes/laceup

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

@@ -208,3 +208,11 @@
 	display_name = "mantle, research director"
 	path = /obj/item/clothing/suit/mantle/labcoat
 	allowed_roles = list("Research Director")
+
+//Robes!
+
+/datum/gear/suit/witch
+	display_name = "witch robes"
+	path = /obj/item/clothing/suit/wizrobe/marisa/fake
+
+

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

@@ -4,6 +4,103 @@
 	slot = slot_w_uniform
 	sort_category = "Uniforms and Casual Dress"
 
+/datum/gear/uniform/suits
+	subtype_path = /datum/gear/uniform/suit
+
+//there's a lot more colors than I thought there were @_@
+
+/datum/gear/uniform/suit/jumpsuitblack
+	display_name = "jumpsuit, black"
+	path = /obj/item/clothing/under/color/black
+
+/datum/gear/uniform/suit/jumpsuitblue
+	display_name = "jumpsuit, blue"
+	path = /obj/item/clothing/under/color/blue
+
+/datum/gear/uniform/suit/jumpsuitgreen
+	display_name = "jumpsuit, green"
+	path = /obj/item/clothing/under/color/green
+
+/datum/gear/uniform/suit/jumpsuitgrey
+	display_name = "jumpsuit, grey"
+	path = /obj/item/clothing/under/color/grey
+
+/datum/gear/uniform/suit/jumpsuitorange
+	display_name = "jumpsuit, orange"
+	path = /obj/item/clothing/under/color/orange
+
+/datum/gear/uniform/suit/jumpsuitpink
+	display_name = "jumpsuit, pink"
+	path = /obj/item/clothing/under/color/pink
+
+/datum/gear/uniform/suit/jumpsuitred
+	display_name = "jumpsuit, red"
+	path = /obj/item/clothing/under/color/red
+
+/datum/gear/uniform/suit/jumpsuitwhite
+	display_name = "jumpsuit, white"
+	path = /obj/item/clothing/under/color/white
+
+/datum/gear/uniform/suit/jumpsuityellow
+	display_name = "jumpsuit, yellow"
+	path = /obj/item/clothing/under/color/yellow
+
+/datum/gear/uniform/suit/jumpsuitlightblue
+	display_name = "jumpsuit, lightblue"
+	path = /obj/item/clothing/under/color/lightblue
+
+/datum/gear/uniform/suit/jumpsuitaqua
+	display_name = "jumpsuit, aqua"
+	path = /obj/item/clothing/under/color/aqua
+
+/datum/gear/uniform/suit/jumpsuitpurple
+	display_name = "jumpsuit, purple"
+	path = /obj/item/clothing/under/color/purple
+
+/datum/gear/uniform/suit/jumpsuitlightpurple
+	display_name = "jumpsuit, lightpurple"
+	path = /obj/item/clothing/under/color/lightpurple
+
+/datum/gear/uniform/suit/jumpsuitlightgreen
+	display_name = "jumpsuit, lightgreen"
+	path = /obj/item/clothing/under/color/lightgreen
+
+/datum/gear/uniform/suit/jumpsuitlightblue
+	display_name = "jumpsuit, lightblue"
+	path = /obj/item/clothing/under/color/lightblue
+
+/datum/gear/uniform/suit/jumpsuitlightbrown
+	display_name = "jumpsuit, lightbrown"
+	path = /obj/item/clothing/under/color/lightbrown
+
+/datum/gear/uniform/suit/jumpsuitbrown
+	display_name = "jumpsuit, brown"
+	path = /obj/item/clothing/under/color/brown
+
+/datum/gear/uniform/suit/jumpsuityellowgreen
+	display_name = "jumpsuit, yellowgreen"
+	path = /obj/item/clothing/under/color/yellowgreen
+
+/datum/gear/uniform/suit/jumpsuitdarkblue
+	display_name = "jumpsuit, darkblue"
+	path = /obj/item/clothing/under/color/darkblue
+
+/datum/gear/uniform/suit/jumpsuitlightred
+	display_name = "jumpsuit, lightred"
+	path = /obj/item/clothing/under/color/lightred
+
+/datum/gear/uniform/suit/jumpsuitdarkred
+	display_name = "jumpsuit, darkred"
+	path = /obj/item/clothing/under/color/darkred
+
+/datum/gear/uniform/suit/soviet
+	display_name = "USSP uniform"
+	path = /obj/item/clothing/under/soviet
+
+/datum/gear/uniform/suit/kilt
+	display_name = "a kilt"
+	path = /obj/item/clothing/under/kilt
+
 /datum/gear/uniform/skirt
 	subtype_path = /datum/gear/uniform/skirt