Merge pull request #5966 from VOREStation/upstream-merge-6444

[MIRROR] Ports Earrings from Baystation

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

@@ -11,4 +11,32 @@
 
 /datum/gear/ears/circuitry
 	display_name = "earwear, circuitry (empty)"
-	path = /obj/item/clothing/ears/circuitry
+	path = /obj/item/clothing/ears/circuitry
+	
+
+/datum/gear/ears/earrings
+	display_name = "earring selection"
+	description = "A selection of eye-catching earrings."
+	path = /obj/item/clothing/ears/earring
+
+/datum/gear/ears/earrings/New()
+	..()
+	var/earrings = list()
+	earrings["stud, pearl"] = /obj/item/clothing/ears/earring/stud
+	earrings["stud, glass"] = /obj/item/clothing/ears/earring/stud/glass
+	earrings["stud, wood"] = /obj/item/clothing/ears/earring/stud/wood
+	earrings["stud, iron"] = /obj/item/clothing/ears/earring/stud/iron
+	earrings["stud, steel"] = /obj/item/clothing/ears/earring/stud/steel
+	earrings["stud, silver"] = /obj/item/clothing/ears/earring/stud/silver
+	earrings["stud, gold"] = /obj/item/clothing/ears/earring/stud/gold
+	earrings["stud, platinum"] = /obj/item/clothing/ears/earring/stud/platinum
+	earrings["stud, diamond"] = /obj/item/clothing/ears/earring/stud/diamond
+	earrings["dangle, glass"] = /obj/item/clothing/ears/earring/dangle/glass
+	earrings["dangle, wood"] = /obj/item/clothing/ears/earring/dangle/wood
+	earrings["dangle, iron"] = /obj/item/clothing/ears/earring/dangle/iron
+	earrings["dangle, steel"] = /obj/item/clothing/ears/earring/dangle/steel
+	earrings["dangle, silver"] = /obj/item/clothing/ears/earring/dangle/silver
+	earrings["dangle, gold"] = /obj/item/clothing/ears/earring/dangle/gold
+	earrings["dangle, platinum"] = /obj/item/clothing/ears/earring/dangle/platinum
+	earrings["dangle, diamond"] = /obj/item/clothing/ears/earring/dangle/diamond
+	gear_tweaks += new/datum/gear_tweak/path(earrings)

code/modules/clothing/ears/earrings.dm

@@ -0,0 +1,78 @@
+//Material earrings
+/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 = "pearl stud earrings"
+	desc = "A pair of small stud earrings."
+	icon_state = "ear_stud"
+	color = "#eae0c8"
+
+/obj/item/clothing/ears/earring/stud/glass
+	name = "glass stud earrings"
+	color = "#00e1ff"
+
+/obj/item/clothing/ears/earring/stud/wood
+	name = "wood stud earrings"
+	color = "#824b28"
+
+/obj/item/clothing/ears/earring/stud/iron
+	name = "iron stud earrings"
+	color = "#5c5454"
+
+/obj/item/clothing/ears/earring/stud/steel
+	name = "steel stud earrings"
+	color = "#666666"
+
+/obj/item/clothing/ears/earring/stud/silver
+	name = "silver stud earrings"
+	color = "#d1e6e3"
+
+/obj/item/clothing/ears/earring/stud/gold
+	name = "gold stud earrings"
+	color = "#edd12f"
+
+/obj/item/clothing/ears/earring/stud/platinum
+	name = "platinum stud earrings"
+	color = "#9999ff"
+
+/obj/item/clothing/ears/earring/stud/diamond
+	name = "diamond stud earrings"
+	color = "#00ffe1"
+
+/obj/item/clothing/ears/earring/dangle
+	icon_state = "ear_dangle"
+
+/obj/item/clothing/ears/earring/dangle/glass
+	name = "glass dangle earrings"
+	color = "#00e1ff"
+
+/obj/item/clothing/ears/earring/dangle/wood
+	name = "wood dangle earrings"
+	color = "#824b28"
+
+/obj/item/clothing/ears/earring/dangle/iron
+	name = "iron dangle earrings"
+	color = "#5c5454"
+
+/obj/item/clothing/ears/earring/dangle/steel
+	name = "steel dangle earrings"
+	color = "#666666"
+
+/obj/item/clothing/ears/earring/dangle/silver
+	name = "silver dangle earrings"
+	color = "#d1e6e3"
+
+/obj/item/clothing/ears/earring/dangle/gold
+	name = "gold dangle earrings"
+	color = "#edd12f"
+
+/obj/item/clothing/ears/earring/dangle/platinum
+	name = "platinum dangle earrings"
+	color = "#9999ff"
+
+/obj/item/clothing/ears/earring/dangle/diamond
+	name = "diamond dangle earrings"
+	color = "#00ffe1"

vorestation.dme

@@ -1622,6 +1622,7 @@
 #include "code\modules\clothing\clothing_accessories.dm"
 #include "code\modules\clothing\clothing_icons.dm"
 #include "code\modules\clothing\clothing_vr.dm"
+#include "code\modules\clothing\ears\earrings.dm"
 #include "code\modules\clothing\ears\ears.dm"
 #include "code\modules\clothing\glasses\glasses.dm"
 #include "code\modules\clothing\glasses\glasses_vr.dm"