From 7bcb254e67cc62f60d3225e7fab36fcd92bf75bc Mon Sep 17 00:00:00 2001 From: crunchypretzels <70682905+crunchypretzels@users.noreply.github.com> Date: Mon, 19 Apr 2021 17:12:24 -0400 Subject: [PATCH] Tentatails (#11679) --- .../loadout/loadout_xeno/skrell.dm | 19 +++++++- code/modules/clothing/ears/skrell.dm | 23 ++++++++++ .../abstract/new_player/sprite_accessories.dm | 30 +++++++++++++ html/changelogs/waffai-skrellponytails.yml | 41 ++++++++++++++++++ icons/clothing/head/skrellscrunchies.dmi | Bin 0 -> 2052 bytes icons/mob/human_face/skrell_hair.dmi | Bin 1038 -> 2510 bytes 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/waffai-skrellponytails.yml create mode 100644 icons/clothing/head/skrellscrunchies.dmi 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 0000000000000000000000000000000000000000..4932d9dc4b614de6e39b5115f4a77ef9d562f480 GIT binary patch literal 2052 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