From 867efe8b5ba551b85a167aa5dfbe9afe03899730 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=90=D1=80=D1=82?=
 <123451459+JustArt1m@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:48:49 +0300
Subject: [PATCH] Add flowers to loadout (#32097)

* Add_Poppy&Lily

* Add_FlowerWreath

* Add_Headflowers

Sprites, meta, prototype

* Id_Changes

* Changes

* Update_Sprite

* Desc_Change

* Scale_Change

* Sprite_Scaling
---
 .../Entities/Clothing/Head/misc.yml           |  11 +++++++++++
 .../Loadouts/Miscellaneous/trinkets.yml       |  13 +++++++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |   2 ++
 .../Misc/hairflower.rsi/equipped-HELMET.png   | Bin 0 -> 297 bytes
 .../Head/Misc/hairflower.rsi/icon.png         | Bin 0 -> 442 bytes
 .../Head/Misc/hairflower.rsi/meta.json        |  18 ++++++++++++++++++
 6 files changed, 44 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 22ea8ed6ba..254eaf37c8 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -312,3 +312,14 @@
       - WhitelistChameleon
   - type: StaticPrice
     price: 1
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHairflower
+  name: hairflower
+  description: A beautiful hairflower that can be inserted between locks of hair.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/hairflower.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/hairflower.rsi
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index ea70828ce4..14c1174a7d 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -8,6 +8,19 @@
       department: Command
       time: 3600 # 1 hour
 
+# Flowers
+- type: loadout
+  id: FlowerWreath
+  storage:
+    back:
+    - ClothingHeadHatFlowerWreath
+
+- type: loadout
+  id: Hairflower
+  storage:
+    back:
+    - ClothingHeadHatHairflower
+
 # Plushies
 - type: loadout
   id: PlushieLizard
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 1483fc3c11..069dae3ae1 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -5,6 +5,8 @@
   minLimit: 0
   maxLimit: 3
   loadouts:
+  - FlowerWreath
+  - Hairflower
   - PlushieLizard
   - PlushieSpaceLizard
   - Lighter
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1a436b83793c3d52c053dfcff4d88fe84243253
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=A3R+gLn`LHowbpZ$x(#$eph3R
z?z3mt+kIz7Hru{f`YfuYbEbmQ9N!w5zPXwYjLmgoKHW0$eK}K9*Wq$)L+R0p*X!mS
zSG2Tw{>E>5SmEdRDSH|UJ>Jbv*&TUhySgS<f$hB8k7wVxSA2Bm{!4$jOZpfy7^Rpm
zFqyC|V9nrh;JzTyAhy7eLDwOfA*$gR!xn~KYzki5Ih?d>Sd=t<!wd0%jouL@4PCKK
fzwzn7X=L4uQ1zD1mgKoWzcYBc`njxgN@xNA0$Odo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd68c5efcba17bc016c73c48c0e1b384ba2aed84
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$bV)=(R9J=Wmc44jFcgJPN*c)EK)_l%c2e+=)oaH>roKSOyhDe)Ltdg&z@wib
zLy4x2U9Z4ULjz499TEw}jVf7AI<)@4Aj?1Z_}qIX11&B8olcX77vs@RjVH@h(7S>K
zEXJc<eBIUOa<dH*an&Sv#9~A&4ta&9wqi55Nl7xug|6#{bL2T#KsC>%m|qc~&~}pq
zurIjCa&J|n%Qb5ep31c<I@1*ZNU~hdR}YtKR&};wQ<NkTu^7{0jrp)|4d5zHs{@ne
zsv|dBln2|ZJQg3A^#&j!OpCQufQ#DeK$7KpEQA065D^|;-;S>N;%qCk6I428y#a&}
zV2pu?z&Xd$=Q{v=bIi3iI2}-_Fj2wg!#+6Y+6k3!^Kf;6R~uGIvK(oe0@$bF`Su3D
z!J(QfqIU{Tb%W}JB+Kz~e|I$RD<a4NGYCi?1+PocZfJhtPpx_}0q4Z4P+UJBO@2<i
kw^!G;eCchwrRDGP1xqc_a{dxkSO5S307*qoM6N<$f|m!sIsgCw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
new file mode 100644
index 0000000000..a3ec217bca
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "icon sprited by Just_Art, equipped-HELMET sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
-- 
2.51.2