cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 04:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds long variations of algae, refactors headtail cloths (#13717)

Browse Source
This commit is contained in:
Llywelwyn
2022-05-02 11:01:30 +01:00
committed by GitHub
parent 683d4bc40b
commit 94c44d0569
4 changed files with 52 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
View File

@@ -26,33 +26,19 @@
bandtypes[initial(band.name)] = band
gear_tweaks += new /datum/gear_tweak/path(sortAssoc(bandtypes))
/datum/gear/ears/skrell/cloth/short
display_name = "short headtail cloth"
path = /obj/item/clothing/ears/skrell/cloth_short/black
/datum/gear/ears/skrell/cloth
display_name = "headtail cloth selection (recolourable)"
path = /obj/item/clothing/ears/skrell/cloth
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/skrell/cloth/short/New()
/datum/gear/ears/skrell/cloth/New()
..()
var/list/shorttypes = list()
for(var/short_style in typesof(/obj/item/clothing/ears/skrell/cloth_short))
var/obj/item/clothing/ears/skrell/cloth_short/short = short_style
shorttypes[initial(short.name)] = short
gear_tweaks += new /datum/gear_tweak/path(sortAssoc(shorttypes))
/datum/gear/ears/skrell/cloth/average
display_name = "average headtail cloth"
path = /obj/item/clothing/ears/skrell/cloth_average/black
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/cloth/average/New()
..()
var/list/averagetypes = list()
for(var/average_style in typesof(/obj/item/clothing/ears/skrell/cloth_average))
var/obj/item/clothing/ears/skrell/cloth_average/average = average_style
averagetypes[initial(average.name)] = average
gear_tweaks += new /datum/gear_tweak/path(sortAssoc(averagetypes))
var/list/cloths = list()
cloths["headtail cloth"] = /obj/item/clothing/ears/skrell/cloth
cloths["short headtail cloth"] = /obj/item/clothing/ears/skrell/cloth/short
gear_tweaks += new /datum/gear_tweak/path(cloths)
/datum/gear/ears/skrell/workhat
display_name = "worker hat"
@@ -123,9 +109,12 @@
/datum/gear/ears/skrell/goop/New()
..()
var/list/algae = list()
algae["glowing algae(dots)"] = /obj/item/clothing/ears/skrell/goop
algae["glowing algae(stripes)"] = /obj/item/clothing/ears/skrell/goop/stripes
algae["glowing algae(circles)"] = /obj/item/clothing/ears/skrell/goop/circles
algae["glowing algae, dots"] = /obj/item/clothing/ears/skrell/goop
algae["long glowing algae, dots"] = /obj/item/clothing/ears/skrell/goop/long
algae["glowing algae, stripes"] = /obj/item/clothing/ears/skrell/goop/stripes
algae["long glowing algae, stripes"] = /obj/item/clothing/ears/skrell/goop/stripes/long
algae["glowing algae, circles"] = /obj/item/clothing/ears/skrell/goop/circles
algae["long glowing algae, circles"] = /obj/item/clothing/ears/skrell/goop/circles/long
gear_tweaks += new /datum/gear_tweak/path(algae)
/datum/gear/mask/skrell

125
code/modules/clothing/ears/skrell.dm
View File

@@ -45,88 +45,74 @@
icon_state = "skrell_chain_ebony"
item_state = "skrell_chain_ebony"
/obj/item/clothing/ears/skrell/chain/goldshort
/obj/item/clothing/ears/skrell/chain/short
name = "skrell short gold headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "male_golddia"
item_state = "male_golddia"
/obj/item/clothing/ears/skrell/chain/goldaverage
/obj/item/clothing/ears/skrell/chain/average
name = "skrell average gold headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "female_golddia"
item_state = "female_golddia"
/obj/item/clothing/ears/skrell/chain/goldlong
/obj/item/clothing/ears/skrell/chain/long
name = "skrell very long gold headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "verylong_golddia"
item_state = "verylong_golddia"
/obj/item/clothing/ears/skrell/chain/goldshort
/obj/item/clothing/ears/skrell/chain/short
name = "skrell very short gold headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "veryshort_golddia"
item_state = "veryshort_golddia"
/obj/item/clothing/ears/skrell/chain/silvershort
/obj/item/clothing/ears/skrell/chain/silver/short
name = "skrell short silver headdress"
desc = "A jeweled silver headdress worn by skrell around their head tails."
icon_state = "male_silvdia"
item_state = "male_silvdia"
/obj/item/clothing/ears/skrell/chain/silveraverage
/obj/item/clothing/ears/skrell/chain/silver/average
name = "skrell average silver headdress"
desc = "A jeweled silver headdress worn by skrell around their head tails."
icon_state = "female_silvdia"
item_state = "female_silvdia"
/obj/item/clothing/ears/skrell/chain/silverlong
/obj/item/clothing/ears/skrell/chain/silver/long
name = "skrell very long silver headdress"
desc = "A jeweled silver headdress worn by skrell around their head tails."
icon_state = "verylong_silvdia"
item_state = "verylong_silvdia"
/obj/item/clothing/ears/skrell/chain/festiveaverage
/obj/item/clothing/ears/skrell/chain/festive
name = "skrell average festive headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "female_fest"
item_state = "female_fest"
/obj/item/clothing/ears/skrell/chain/festivelong
/obj/item/clothing/ears/skrell/chain/festive/long
name = "skrell very long festive headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "verylong_fest"
item_state = "verylong_fest"
/obj/item/clothing/ears/skrell/chain/festiveshort
/obj/item/clothing/ears/skrell/chain/festive/short
name = "skrell short festive headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "male_fest"
item_state = "male_fest"
/obj/item/clothing/ears/skrell/chain/festiveveryshort
/obj/item/clothing/ears/skrell/chain/festive/veryshort
name = "skrell very short festive headdress"
desc = "An elaborate golden headdress worn by skrell around their head tails."
icon_state = "veryshort_fest"
item_state = "veryshort_fest"
/obj/item/clothing/ears/skrell/chain/blackshort
/obj/item/clothing/ears/skrell/chain/black/short
name = "skrell short ebony headdress"
desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails."
icon_state = "male_blackdia"
item_state = "male_blackdia"
/obj/item/clothing/ears/skrell/chain/blackaverage
/obj/item/clothing/ears/skrell/chain/black/average
name = "skrell average ebony headdress"
desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails."
icon_state = "female_blackdia"
item_state = "skrell_chain_ebony"
/obj/item/clothing/ears/skrell/chain/blacklong
/obj/item/clothing/ears/skrell/chain/black/long
name = "skrell long ebony headdress"
desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails."
icon_state = "verylong_blackdia"
item_state = "verylong_blackdia"
/obj/item/clothing/ears/skrell/band
@@ -161,73 +147,15 @@
icon_state = "skrell_band_ebony"
item_state = "skrell_band_ebony"
/obj/item/clothing/ears/skrell/cloth_average
name = "red headtail cloth"
/obj/item/clothing/ears/skrell/cloth
name = "headtail cloth"
desc = "A cloth shawl worn by skrell draped around their head tails."
icon_state = "skrell_cloth_female"
item_state = "skrell_cloth_female"
icon_state = "skrell_cloth"
item_state = "skrell_cloth"
/obj/item/clothing/ears/skrell/cloth_average/black
name = "black headtail cloth"
icon_state = "skrell_cloth_black_female"
item_state = "skrell_cloth_black_female"
/obj/item/clothing/ears/skrell/cloth_average/blue
name = "blue headtail cloth"
icon_state = "skrell_cloth_blue_female"
item_state = "skrell_cloth_blue_female"
/obj/item/clothing/ears/skrell/cloth_average/green
name = "green headtail cloth"
icon_state = "skrell_cloth_green_female"
item_state = "skrell_cloth_green_female"
/obj/item/clothing/ears/skrell/cloth_average/pink
name = "pink headtail cloth"
icon_state = "skrell_cloth_pink_female"
item_state = "skrell_cloth_pink_female"
/obj/item/clothing/ears/skrell/cloth_average/lightblue
name = "light blue headtail cloth"
icon_state = "skrell_cloth_lblue_female"
item_state = "skrell_cloth_lblue_female"
/obj/item/clothing/ears/skrell/cloth_short
name = "red headtail cloth"
desc = "A cloth band worn by skrell around their head tails."
icon_state = "skrell_cloth_male"
item_state = "skrell_cloth_male"
/obj/item/clothing/ears/skrell/cloth_short/black
name = "black headtail cloth"
icon_state = "skrell_cloth_black_male"
item_state = "skrell_cloth_black_male"
/obj/item/clothing/ears/skrell/cloth_short/blue
name = "blue headtail cloth"
icon_state = "skrell_cloth_blue_male"
item_state = "skrell_cloth_blue_male"
/obj/item/clothing/ears/skrell/cloth_short/green
name = "green headtail cloth"
icon_state = "skrell_cloth_green_male"
item_state = "skrell_cloth_green_male"
/obj/item/clothing/ears/skrell/cloth_short/pink
name = "pink headtail cloth"
icon_state = "skrell_cloth_pink_male"
item_state = "skrell_cloth_pink_male"
/obj/item/clothing/ears/skrell/cloth_short/lightblue
name = "light blue headtail cloth"
icon_state = "skrell_cloth_lblue_male"
item_state = "skrell_cloth_lblue_male"
/obj/item/clothing/ears/skrell/cloth_short/purple
name = "skrell purple head cloth"
desc = "A purple cloth band worn by skrell around their head tails."
icon_state = "skrell_cloth_purple_male"
item_state = "skrell_cloth_purple_male"
/obj/item/clothing/ears/skrell/cloth/short
name = "short headtail cloth"
item_state = "skrell_cloth_short"
/obj/item/clothing/ears/skrell/goop
name = "glowing algae"
@@ -245,14 +173,21 @@
. = ..()
update_icon()
/obj/item/clothing/ears/skrell/goop/long
item_state = "skrell_dots_long"
/obj/item/clothing/ears/skrell/goop/stripes
icon_state = "skrell_stripes"
item_state = "skrell_stripes"
/obj/item/clothing/ears/skrell/goop/stripes/long
item_state = "skrell_stripes_long"
/obj/item/clothing/ears/skrell/goop/circles
icon_state = "skrell_circles"
item_state = "skrell_circles"
/obj/item/clothing/ears/skrell/goop/circles/long
item_state = "skrell_circles_long"
/obj/item/clothing/ears/skrell/scrunchy
name = "skrell tentacle tie"
desc = "A self-powered hard-light 'scrunchy' used to comfortably tie back the tentacles."

7
html/changelogs/llywelwyn-skrell-headgear-changes.yml Normal file
View File

@@ -0,0 +1,7 @@
author: Llywelwyn
delete-after: True
changes:
- rscadd: "Added variations to Skrell algae loadout items for longer headtails."
- rscadd: "Made Skrell headtail cloths recolourable instead of a set of fixed colours."

BIN
icons/obj/skrell_items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 113 KiB