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 22abf7a9844..2232f5420e5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -85,4 +85,19 @@ display_name = "nralakk projector" path = /obj/item/skrell_projector whitelisted = list("Skrell") - sort_category = "Xenowear - Skrell" \ No newline at end of file + sort_category = "Xenowear - Skrell" + +/datum/gear/ears/skrell/goop + display_name = "glowing algae" + path = /obj/item/clothing/ears/skrell/goop + whitelisted = list("Skrell") + sort_category = "Xenowear - Skrell" + +/datum/gear/ears/skrell/goop/New() + ..() + var/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 + gear_tweaks += new/datum/gear_tweak/path(algae) + gear_tweaks += list(gear_tweak_free_color_choice) \ No newline at end of file diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index e34a7aecb11..01940fc1a45 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -218,4 +218,23 @@ 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" \ No newline at end of file + item_state = "skrell_cloth_purple_male" + +/obj/item/clothing/ears/skrell/goop + name = "glowing algae" + desc = "A mixture of glowing algae applied by skrell on their head tails." + icon_state = "skrell_dots" + item_state = "skrell_dots" + +/obj/item/clothing/ears/skrell/goop/Initialize() + . = ..() + if(color) + set_light(1,1,color) + +/obj/item/clothing/ears/skrell/goop/stripes + icon_state = "skrell_stripes" + item_state = "skrell_stripes" + +/obj/item/clothing/ears/skrell/goop/circles + icon_state = "skrell_circles" + item_state = "skrell_circles" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f71773cadf9..b9a51696326 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -672,6 +672,7 @@ There are several things that need to be remembered: if (result_layer) result_layer = list(result_layer, I) + I.color = r_ear.color else result_layer = I diff --git a/html/changelogs/alberyk-skrellstuff.yml b/html/changelogs/alberyk-skrellstuff.yml new file mode 100644 index 00000000000..4d50524dbdd --- /dev/null +++ b/html/changelogs/alberyk-skrellstuff.yml @@ -0,0 +1,6 @@ +author: Alberyk. BRAINOS + +delete-after: True + +changes: + - rscadd: "Added a new option for skrell in their xeno loadout." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index a31042cbde0..917950f9641 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 c94d8f956de..879b96f221b 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ