From fc5bb118b352cd98ec3f795aad0b4d7831e03bce Mon Sep 17 00:00:00 2001 From: ExusA <67055922+ExusA@users.noreply.github.com> Date: Thu, 10 Dec 2020 01:17:11 +0800 Subject: [PATCH] 10 new Diona "hair" styles (#15021) * First commit 10 new diona 'hair'-styles! * Newline * Applied suggestions from review The literal only thing that could've been wrong about the code, was. good job me ._. Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- .../sprite_accessories/diona/diona_hair.dm | 45 ++++++++++++++++++ .../sprite_accessories/diona/diona_hair.dmi | Bin 3186 -> 5304 bytes 2 files changed, 45 insertions(+) diff --git a/code/modules/mob/new_player/sprite_accessories/diona/diona_hair.dm b/code/modules/mob/new_player/sprite_accessories/diona/diona_hair.dm index 37bb1bdd1ee..b220bfeae29 100644 --- a/code/modules/mob/new_player/sprite_accessories/diona/diona_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/diona/diona_hair.dm @@ -57,3 +57,48 @@ /datum/sprite_accessory/hair/diona/diona_wildflow name = "Wildflowers" icon_state = "wildflower" +//Sprites by skittles above + + +/datum/sprite_accessory/hair/diona/diona_frost + name = "Frost" + icon_state = "frost" + +/datum/sprite_accessory/hair/diona/diona_largerose + name = "Large Rose" + icon_state = "largerose" + +/datum/sprite_accessory/hair/diona/diona_lily + name = "Lilies" + icon_state = "lily" + glasses_over = FALSE + +/datum/sprite_accessory/hair/diona/diona_sunflower + name = "Sunflower" + icon_state = "sunflower" + glasses_over = FALSE + +/datum/sprite_accessory/hair/diona/diona_mushrooms + name = "Field Mushrooms" + icon_state = "shroom" + +/datum/sprite_accessory/hair/diona/diona_poppy + name = "Poppies" + icon_state = "poppy" + +/datum/sprite_accessory/hair/diona/diona_daisies + name = "Daisies" + icon_state = "daisy" + +/datum/sprite_accessory/hair/diona/diona_marigold + name = "Marigold" + icon_state = "marigold" + +/datum/sprite_accessory/hair/diona/diona_hydrangea + name = "Hydrangea" + icon_state = "hydrangea" + +/datum/sprite_accessory/hair/diona/diona_bigleaf + name = "Big Leaf" + icon_state = "bigleaf" + glasses_over = FALSE diff --git a/icons/mob/sprite_accessories/diona/diona_hair.dmi b/icons/mob/sprite_accessories/diona/diona_hair.dmi index 1c29dbc3b4e2c3b4eb6759e9483e0172375fc084..faae86d5923683651db0c714bee96e0d2f73754e 100644 GIT binary patch literal 5304 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