diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index d92b2358b4..f80e60acaf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/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 \ No newline at end of file + 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) diff --git a/code/modules/clothing/ears/earrings.dm b/code/modules/clothing/ears/earrings.dm new file mode 100644 index 0000000000..154f69f44a --- /dev/null +++ b/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" \ No newline at end of file diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index a8d55c2e92..5fa70ced82 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 77d0b44126..39b3dbf0bd 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/vorestation.dme b/vorestation.dme index b2b23f0438..18a8873b7c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1621,7 +1621,11 @@ #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" #include "code\modules\clothing\clothing_icons.dm" +<<<<<<< HEAD:vorestation.dme #include "code\modules\clothing\clothing_vr.dm" +======= +#include "code\modules\clothing\ears\earrings.dm" +>>>>>>> 7821e74... Ports Earrings from Baystation (#6444):polaris.dme #include "code\modules\clothing\ears\ears.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\glasses_vr.dm"