diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 9e19662fed4..7d71ba9716c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -107,4 +107,21 @@ display_name = "skrell gill cover" path = /obj/item/clothing/mask/breath/skrell whitelisted = list(SPECIES_SKRELL) - sort_category = "Xenowear - Skrell" \ No newline at end of file + sort_category = "Xenowear - Skrell" + +/datum/gear/ears/skrell/scrunchy + display_name = "tentacle tie selection" + path = /obj/item/clothing/ears/skrell/scrunchy + whitelisted = list(SPECIES_SKRELL) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/ears/skrell/scrunchy/New() + ..() + var/list/scrunchy = list() + scrunchy["tentacle tie, seaweed"] = /obj/item/clothing/ears/skrell/scrunchy + scrunchy["tentacle tie, driftwood"] = /obj/item/clothing/ears/skrell/scrunchy/driftwood + scrunchy["tentacle tie, reef"] = /obj/item/clothing/ears/skrell/scrunchy/reef + scrunchy["tentacle tie, hoop"] = /obj/item/clothing/ears/skrell/scrunchy/hoop + scrunchy["tentacle tie, backwater"] = /obj/item/clothing/ears/skrell/scrunchy/backwater + gear_tweaks += new /datum/gear_tweak/path(scrunchy) diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 4e22a7b82c0..4b83c9b8d3a 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -246,3 +246,26 @@ /obj/item/clothing/ears/skrell/goop/circles icon_state = "skrell_circles" item_state = "skrell_circles" + +/obj/item/clothing/ears/skrell/scrunchy + name = "skrell tentacle tie" + desc = "A self-powered hard-light 'scrunchy' used to comfortably tie back the tentacles." + icon = 'icons/clothing/head/skrellscrunchies.dmi' + icon_state = "skrellhairtie" + item_state = "scrunchy_seaweed" + +/obj/item/clothing/ears/skrell/scrunchy/hoop + icon_state = "skrellhairtie" + item_state = "scrunchy_hoop" + +/obj/item/clothing/ears/skrell/scrunchy/backwater + icon_state = "skrellhairtie" + item_state = "scrunchy_backwater" + +/obj/item/clothing/ears/skrell/scrunchy/driftwood + icon_state = "skrellhairtie" + item_state = "scrunchy_driftwood" + +/obj/item/clothing/ears/skrell/scrunchy/reef + icon_state = "skrellhairtie" + item_state = "scrunchy_reef" \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index c33e35d83a8..a516a8c97a4 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2099,6 +2099,36 @@ Follow by example and make good judgement based on length which list to include length = 6 chatname = "Very Long Tentacles" + skr_tentacle_ponytail + name = "Skrell Seaweed Ponytail" + icon_state = "skrell_seaweed" + length = 3 + chatname = "Ponytail, Seaweed" + + skr_tentacle_doubletail + name = "Skrell Hoop Ponytail" + icon_state = "skrell_hoop" + length = 3 + chatname = "Ponytail, Hoop" + + skr_tentacle_flb + name = "Skrell Reef Ponytail" + icon_state = "skrell_reef" + length = 6 + chatname = "Ponytail, Reef" + + skr_tentacle_ponytailm + name = "Skrell Driftwood Ponytail" + icon_state = "skrell_driftwood" + length = 6 + chatname = "Ponytail, Driftwood" + + skr_tentacle_backwater + name = "Skrell Backwater" + icon_state = "skrell_backwater" + length = 6 + chatname = "Backwater" + //tajaran hair diff --git a/html/changelogs/waffai-skrellponytails.yml b/html/changelogs/waffai-skrellponytails.yml new file mode 100644 index 00000000000..87d7cae60e5 --- /dev/null +++ b/html/changelogs/waffai-skrellponytails.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Waff-AI + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a set of new Skrellian tentacle-tails, and a Skrellian loadout option for scrunchies." diff --git a/icons/clothing/head/skrellscrunchies.dmi b/icons/clothing/head/skrellscrunchies.dmi new file mode 100644 index 00000000000..4932d9dc4b6 Binary files /dev/null and b/icons/clothing/head/skrellscrunchies.dmi differ diff --git a/icons/mob/human_face/skrell_hair.dmi b/icons/mob/human_face/skrell_hair.dmi index e0cfd3cf969..7e4412e7cc8 100644 Binary files a/icons/mob/human_face/skrell_hair.dmi and b/icons/mob/human_face/skrell_hair.dmi differ