Earring/necklace/belt selection expansion (#15965)

* jewelry p1

* part 2 belts and stuff

* finishing up

* contained belts

* gem suggestions

* ok nvm

aurorastation.dme

@@ -1709,6 +1709,7 @@
 #include "code\modules\clothing\under\accessories\holster.dm"
 #include "code\modules\clothing\under\accessories\lockets.dm"
 #include "code\modules\clothing\under\accessories\medal.dm"
+#include "code\modules\clothing\under\accessories\necklace.dm"
 #include "code\modules\clothing\under\accessories\shirts.dm"
 #include "code\modules\clothing\under\accessories\storage.dm"
 #include "code\modules\clothing\under\accessories\temperature.dm"

code/game/objects/items/weapons/storage/belt.dm

@@ -578,7 +578,27 @@
 /obj/item/storage/belt/generic
 	name = "belt"
 	desc = "Only useful for holding up your pants." // Useless belt is useless.
+	icon = 'icons/obj/item/clothing/belts/generic_belts.dmi'
 	icon_state = "belt"
 	item_state = "belt"
+	contained_sprite = TRUE
 	storage_slots = 1
 	max_w_class = ITEMSIZE_TINY
+
+/obj/item/storage/belt/generic/thin
+	name = "thin elastic belt"
+	icon_state = "thin_belt"
+	item_state = "thin_belt"
+
+/obj/item/storage/belt/generic/thick
+	name = "wide waist belt"
+	icon_state = "thick_belt"
+	item_state = "thick_belt"
+
+/obj/item/storage/belt/generic/buckle
+	name = "buckle belt"
+	desc = "A belt secured by a large golden buckle."
+	icon_state = "belt_b"
+	item_state = "belt_b"
+	build_from_parts = TRUE
+	worn_overlay = "buckle"

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

@@ -591,7 +591,37 @@
 	gear_tweaks += new /datum/gear_tweak/path(temperature)
 
 /datum/gear/accessory/necklace
-	display_name = "necklace (colorable)"
-	description = "A piece of jewelry that goes around your neck."
+	display_name = "colored necklace selection"
+	description = "A selection of already-colored necklaces."
 	path = /obj/item/clothing/accessory/necklace
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/necklace/New()
+	..()
+	var/list/colored = list()
+	colored["necklace"] = /obj/item/clothing/accessory/necklace
+	colored["golden"] = /obj/item/clothing/accessory/necklace/thin
+	colored["silver"] = /obj/item/clothing/accessory/necklace/thin/silver
+	colored["golden chain"] = /obj/item/clothing/accessory/necklace/chain
+	colored["silver chain"] = /obj/item/clothing/accessory/necklace/chain/silver
+	gear_tweaks += new /datum/gear_tweak/path(colored)
+
+/datum/gear/accessory/necklace_uncolored
+	display_name = "necklace selection (colorable)"
+	description = "A selection of entirely colorable necklaces."
+	path = /obj/item/clothing/accessory/necklace/colorable
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/accessory/necklace_uncolored/New()
+	..()
+	var/list/necklace_uncolored = list()
+	necklace_uncolored["rounded"] = /obj/item/clothing/accessory/necklace/colorable
+	necklace_uncolored["low hanging"] = /obj/item/clothing/accessory/necklace/colorable/low
+	necklace_uncolored["small"] = /obj/item/clothing/accessory/necklace/colorable/small
+	necklace_uncolored["golden dotted"] = /obj/item/clothing/accessory/necklace/colorable/twopiece
+	necklace_uncolored["silver dotted"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/silver
+	necklace_uncolored["golden pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant
+	necklace_uncolored["silver pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/silver
+	necklace_uncolored["large golden pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/fat
+	necklace_uncolored["large silver pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/silver/fat
+	gear_tweaks += new /datum/gear_tweak/path(necklace_uncolored)

code/modules/client/preference_setup/loadout/loadout_belt.dm

@@ -1,17 +1,29 @@
 /datum/gear/belt
-	display_name = "belt"
+	display_name = "belt selection (colorable)"
+	description = "A selection of colorable belts."
 	path = /obj/item/storage/belt/generic
 	slot = slot_belt
 	sort_category = "Belts"
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/belt/New()
+	..()
+	var/list/belt = list()
+	belt["generic belt"] = /obj/item/storage/belt/generic
+	belt["thin belt"] = /obj/item/storage/belt/generic/thin
+	belt["thick belt"] = /obj/item/storage/belt/generic/thick
+	belt["buckle belt"] = /obj/item/storage/belt/generic/buckle
+	gear_tweaks += new /datum/gear_tweak/path(belt)
+
 /datum/gear/belt/fannypack
 	display_name = "fannypack"
+	description = "A colorable fannypack."
 	cost = 2
 	path = /obj/item/storage/belt/fannypack/recolorable
 
 /datum/gear/belt/toolbelt_alt
 	display_name = "tool-belt, alt"
+	description = "An alternative look to a standard toolbelt."
 	cost = 0
 	path = /obj/item/storage/belt/utility/alt
 	allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director")

code/modules/client/preference_setup/loadout/loadout_ears.dm

@@ -37,8 +37,11 @@
 /datum/gear/ears/earrings/New()
 	..()
 	var/list/earrings = list()
-	earrings["stud earrings"] = /obj/item/clothing/ears/earring/stud
+	earrings["stud earrings"] = /obj/item/clothing/ears/earring
 	earrings["dangle earrings"] = /obj/item/clothing/ears/earring/dangle
+	earrings["circular bangle earrings"] = /obj/item/clothing/ears/earring/bangle
+	earrings["crescent earrings"] = /obj/item/clothing/ears/earring/crescent
+	earrings["oversized earrings"] = /obj/item/clothing/ears/earring/heavy
 	gear_tweaks += new /datum/gear_tweak/path(earrings)
 
 /datum/gear/ears/hearing_aid

code/modules/clothing/ears/earrings.dm

@@ -1,17 +1,31 @@
-
 /obj/item/clothing/ears/earring
-    name = "earring"
-    desc = "An earring of some kind."
-    icon = 'icons/obj/clothing/ears.dmi'
-
-/obj/item/clothing/ears/earring/stud
 	name = "stud earrings"
 	desc = "A pair of small stud earrings."
-	icon_state = "ear_stud"
-	item_state = "ear_stud"
+	icon = 'icons/obj/item/clothing/ears/earrings.dmi'
+	icon_state = "stud"
+	item_state = "stud"
+	contained_sprite = TRUE
 
 /obj/item/clothing/ears/earring/dangle
 	name = "dangle earrings"
 	desc = "A pair of small dangle earrings."
-	icon_state = "ear_dangle"
-	item_state = "ear_dangle"
+	icon_state = "dangle"
+	item_state = "dangle"
+
+/obj/item/clothing/ears/earring/bangle
+	name = "bangle earrings"
+	desc = "A pair of large, circular bangle earrings."
+	icon_state = "bangle"
+	item_state = "bangle"
+
+/obj/item/clothing/ears/earring/crescent
+	name = "crescent earrings"
+	desc = "A pair of hefty crescent earrings."
+	icon_state = "crescent"
+	item_state = "crescent"
+
+/obj/item/clothing/ears/earring/heavy
+	name = "overweight earrings"
+	desc = "A pair of dazzling, painfully large earrings."
+	icon_state = "heavy"
+	item_state = "heavy"

code/modules/clothing/under/accessories/necklace.dm

@@ -0,0 +1,77 @@
+/obj/item/clothing/accessory/necklace
+	name = "necklace"
+	desc = "A piece of jewelry that goes around your neck."
+	icon = 'icons/obj/item/clothing/accessory/necklace.dmi'
+	icon_state = "necklace"
+	item_state = "necklace"
+	contained_sprite = TRUE
+
+/obj/item/clothing/accessory/necklace/thin
+	name = "golden necklace"
+	icon_state = "gold"
+	item_state = "gold"
+
+/obj/item/clothing/accessory/necklace/thin/silver
+	name = "silver necklace"
+	icon_state = "silver"
+	item_state = "silver"
+
+/obj/item/clothing/accessory/necklace/chain
+	name = "golden chain necklace"
+	desc = "A winding chain of golden links, fashioned into an exquisite necklace."
+	icon_state = "chain"
+	item_state = "chain"
+
+/obj/item/clothing/accessory/necklace/chain/silver
+	name = "silver chain necklace"
+	desc = "A winding chain of silver links, fashioned into an exquisite necklace."
+	icon_state = "chain_silver"
+	item_state = "chain_silver"
+
+/obj/item/clothing/accessory/necklace/colorable
+	icon_state = "round"
+	item_state = "round"
+
+/obj/item/clothing/accessory/necklace/colorable/low
+	name = "low-hanging necklace"
+	desc = "A long piece of jewelry that hangs quite low from the neck of its wearer."
+	icon_state = "low"
+	item_state = "low"
+
+/obj/item/clothing/accessory/necklace/colorable/small
+	name = "small necklace"
+	desc = "A diminutive necklace."
+	icon_state = "small"
+	item_state = "small"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece
+	name = "golden dotted necklace"
+	desc = "A set of small gemstones lining a costly necklace."
+	icon_state = "dots_gold"
+	item_state = "dots_gold"
+	build_from_parts = TRUE
+	worn_overlay = "over"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece/silver
+	name = "silver dotted necklace"
+	icon_state = "dots_silver"
+	item_state = "dots_silver"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece/pendant
+	name = "golden pendant necklace"
+	desc = "A heavy gemstone tethered to a necklace by a chain."
+	icon_state = "pendant_gold"
+	item_state = "pendant_gold"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/fat
+	icon_state = "large_pendant_gold"
+	item_state = "large_pendant_gold"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/silver
+	name = "silver pendant necklace"
+	icon_state = "pendant_silver"
+	item_state = "pendant_silver"
+
+/obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/silver/fat
+	icon_state = "large_pendant_silver"
+	item_state = "large_pendant_silver"

html/changelogs/kyres-loadout_jewelry.yml

@@ -0,0 +1,8 @@
+author: kyres1
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a selection of alternative necklaces, some colorable and some colored."
+  - rscadd: "Added a colorable buckle belt, and separated belt selection into thin, thick and normal sized colorable belts."
+  - rscadd: "Added new colorable earrings to the earring selection."