From ebfc311b29fdc8837e6a9695f01905e9c8671211 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 31 May 2021 21:57:22 +0200 Subject: [PATCH] Tentacle Tie Auto-Adaption (#11959) Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> --- .../loadout/loadout_xeno/skrell.dm | 12 +--------- code/modules/clothing/ears/skrell.dm | 23 +++++++------------ .../abstract/new_player/sprite_accessories.dm | 5 ++++ html/changelogs/geeves-scrunchy_buff.yml | 6 +++++ 4 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 html/changelogs/geeves-scrunchy_buff.yml 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 46439cf1ab2..b5cca02fb3c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -110,22 +110,12 @@ sort_category = "Xenowear - Skrell" /datum/gear/ears/skrell/scrunchy - display_name = "tentacle tie selection" + display_name = "tentacle tie" 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) - /datum/gear/accessory/skrell_passport display_name = "jargon federation passport" path = /obj/item/clothing/accessory/badge/passport/jargon diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 4b83c9b8d3a..bd82042238f 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -254,18 +254,11 @@ 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 +/obj/item/clothing/ears/skrell/scrunchy/equipped(mob/user, slot, assisted_equip) + if((slot in list(slot_head, slot_l_ear, slot_r_ear)) && ishuman(user)) + var/mob/living/carbon/human/H = user + if(istype(hair_styles_list[H.h_style], /datum/sprite_accessory/hair/skr_tentacle_m)) + var/datum/sprite_accessory/hair/skr_tentacle_m/hair_datum = hair_styles_list[H.h_style] + if(hair_datum.scrunchy_style) + item_state = "scrunchy_[hair_datum.scrunchy_style]" + return ..() \ 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 6d939cfb6b8..565b774eaf9 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2200,6 +2200,7 @@ Follow by example and make good judgement based on length which list to include species_allowed = list(/datum/species/skrell,/datum/species/zombie/skrell) length = 6 chatname = "Short Tentacles" + var/scrunchy_style = "seaweed" // seaweed fits the normal tentacles pretty well skr_tentacle_f name = "Skrell Average Tentacles" @@ -2230,24 +2231,28 @@ Follow by example and make good judgement based on length which list to include icon_state = "skrell_hoop" length = 3 chatname = "Ponytail, Hoop" + scrunchy_style = "hoop" skr_tentacle_flb name = "Skrell Reef Ponytail" icon_state = "skrell_reef" length = 6 chatname = "Ponytail, Reef" + scrunchy_style = "reef" skr_tentacle_ponytailm name = "Skrell Driftwood Ponytail" icon_state = "skrell_driftwood" length = 6 chatname = "Ponytail, Driftwood" + scrunchy_style = "driftwood" skr_tentacle_backwater name = "Skrell Backwater" icon_state = "skrell_backwater" length = 6 chatname = "Backwater" + scrunchy_style = "backwater" //tajaran hair diff --git a/html/changelogs/geeves-scrunchy_buff.yml b/html/changelogs/geeves-scrunchy_buff.yml new file mode 100644 index 00000000000..312e8bbe35a --- /dev/null +++ b/html/changelogs/geeves-scrunchy_buff.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Skrell Tentacle Ties now auto-adapt to the type of headtails you have." \ No newline at end of file