From eafa35485c2fcca35aff3dc97bb893fb385dc502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Thu, 12 Sep 2024 08:53:03 +0300 Subject: [PATCH 1/9] Add_Poppy&Lily --- .../Prototypes/Loadouts/Miscellaneous/trinkets.yml | 13 +++++++++++++ Resources/Prototypes/Loadouts/loadout_groups.yml | 2 ++ 2 files changed, 15 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index c91108124f9c4d..49bca60471eeea 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: Poppy + storage: + back: + - FoodPoppy + +- type: loadout + id: Lily + storage: + back: + - FoodLily + # Plushies - type: loadout id: PlushieLizard diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index cff9a4f63655b1..7b49f2d4f721d1 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -5,6 +5,8 @@ minLimit: 0 maxLimit: 3 loadouts: + - Poppy + - Lily - PlushieLizard - PlushieSpaceLizard - Lighter From dbd6da4e1074e7f8e6fd215f6b876cc4ee659e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:22:41 +0300 Subject: [PATCH 2/9] Add_FlowerWreath --- Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml | 6 ++++++ Resources/Prototypes/Loadouts/loadout_groups.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 49bca60471eeea..4535ca336ec8f2 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -9,6 +9,12 @@ time: 3600 # 1 hour # Flowers +- type: loadout + id: FlowerWreath + storage: + back: + - ClothingHeadHatFlowerWreath + - type: loadout id: Poppy storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7b49f2d4f721d1..174dbebaa7b88d 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -5,6 +5,7 @@ minLimit: 0 maxLimit: 3 loadouts: + - FlowerWreath - Poppy - Lily - PlushieLizard From 862c3ed1b723451920675b80d1d829be139be54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:40:27 +0300 Subject: [PATCH 3/9] Add_Headflowers Sprites, meta, prototype --- .../Entities/Clothing/Head/misc.yml | 32 ++++++++++++++++++ .../Head/Misc/hairflowers.rsi/icon-lily.png | Bin 0 -> 411 bytes .../Head/Misc/hairflowers.rsi/icon-poppy.png | Bin 0 -> 425 bytes .../hairflowers.rsi/lily-equipped-HELMET.png | Bin 0 -> 341 bytes .../Head/Misc/hairflowers.rsi/meta.json | 25 ++++++++++++++ .../hairflowers.rsi/poppy-equipped-HELMET.png | Bin 0 -> 297 bytes 6 files changed, 57 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/poppy-equipped-HELMET.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 22ea8ed6ba606c..1d3b805e24f460 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -312,3 +312,35 @@ - WhitelistChameleon - type: StaticPrice price: 1 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHairflowerPoppy + name: poppy flower + suffix: headflower + description: A beautiful poppy flower that can be inserted between the locks of hair. + components: + - type: Sprite + sprite: Clothing/Head/Misc/hairflowers.rsi + state: icon-poppy + - type: Clothing + sprite: Clothing/Head/Misc/hairflowers.rsi + equippedPrefix: poppy + slots: + - HEAD + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHairflowerLily + name: lily flower + suffix: headflower + description: A beautiful lily flower that can be inserted between the locks of hair. + components: + - type: Sprite + sprite: Clothing/Head/Misc/hairflowers.rsi + state: icon-lily + - type: Clothing + sprite: Clothing/Head/Misc/hairflowers.rsi + equippedPrefix: lily + slots: + - HEAD \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png new file mode 100644 index 0000000000000000000000000000000000000000..ccbbbe752ec9c4744b0e273ede059030da099bef GIT binary patch literal 411 zcmV;M0c8G(P)Px$RY^oaR9J=Wl)X#CKp2Og6BnbRL!lxl=%0}BaL!mA96|>Np;IzTp-UE_IO}4e zgNQhH^XMW-1_!}G5ds|?1fg3&ipx1@#7L?6vJU215{}&Oee!beK|#TPN8}OmvX2hm zjYhJ}Oai?+dTBnoHnUhpIM1g{V@EFsONdVybTS95}{kh)E=Z+a$JP)SRZmhLs zM549pNB&rAjSxRKA$glzG^H;ht8%17T!G|MPy#%JZJ5}GN$b%c`B|Le=>$GF-@6e2 zwqY{p4;l1_X`>S0<#+f(GF?Q4z{CY?!~89ef`Wp-;|;}9U}R@?*7*Pc002ovPDHLk FV1gg9wIl!l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png new file mode 100644 index 0000000000000000000000000000000000000000..5b673813ea564c0f10d44174e6372ff1aba882c8 GIT binary patch literal 425 zcmV;a0apHrP)Px$V@X6oR9J=Wl)p>EKoo$#NTm?4Qwq|dpo8F0)O3-fj=EU|mr$G(r)G98uKf>M zaBvV8q0}vQv&1gdir|vX!O5*lw{xh425OsM*1>#J^0>VB-OIg$n3(^L5=D~s_Ldwy z7dp?ra)uIUp!|;AMYTPW^a{#Ox(M z7w>hCu=i|=Lc=mG0Ctl8as}=HK&DhcSb}D=34mo;)Us>y6Zp7p4?9pS0#GiOaU5rU z0-O0;ge5RdlUk{T<2Y24!{6`q90Z>N6WMsoxk4+MW!JlxX$U0%aP_e63a1jobA8x- zjpUA*T09B@jUm9?ZhclZiwd6UmB+5?%%TPk{zhPz+VaP<86> z_QYjgiU$+;=H~oK0WegZ{^x-H=OAb*A5@|{d?P|#M6tl!1q@aHEsvO(n7`u-aARHa T^y42i00000NkvXXu0mjfcUQdf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..374a7981d0479d7d078025fee7a0b3c26d5cb69a GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlU zPZ!6KinzD8HgX;c5IFX+d+t>39SvoA3i-^{(&+^Z-!~MqTMIt)Rpe6;E8DoaOQp4A zW95g|iaqtOo)mq5EV$$J%tFNpTOB4w)%I-sdgAkz70-k>zuma$>${0E#-{8~|1!I7 z*!AP|*&M5~(CXk_ED1Ywx~ntG_JwizCn+>AFmWJ=65R{0;_JWuR%}`K`GxMjC9>~y zs}FW>W*3kUVq#8f5rd+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json new file mode 100644 index 00000000000000..5655849bfc5abf --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon-poppy and icon-lily sprited by Just_Art, equipped-HELMET sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-poppy" + }, + { + "name": "icon-lily" + }, + { + "name": "poppy-equipped-HELMET", + "directions": 4 + }, + { + "name": "lily-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/poppy-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/poppy-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*&TUhySgSSd=t Date: Thu, 12 Sep 2024 14:45:45 +0300 Subject: [PATCH 4/9] Id_Changes --- Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml | 8 ++++---- Resources/Prototypes/Loadouts/loadout_groups.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 4535ca336ec8f2..4bd7502eea8fc3 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -16,16 +16,16 @@ - ClothingHeadHatFlowerWreath - type: loadout - id: Poppy + id: PoppyFlower storage: back: - - FoodPoppy + - ClothingHeadHatHairflowerPoppy - type: loadout - id: Lily + id: LilyFlower storage: back: - - FoodLily + - ClothingHeadHatHairflowerLily # Plushies - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 174dbebaa7b88d..98f35d07fe95af 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -6,8 +6,8 @@ maxLimit: 3 loadouts: - FlowerWreath - - Poppy - - Lily + - PoppyFlower + - LilyFlower - PlushieLizard - PlushieSpaceLizard - Lighter From 26b7bc8b9f1f669740019e8155b96c830ab31e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Sun, 15 Sep 2024 23:26:02 +0300 Subject: [PATCH 5/9] Changes --- .../Entities/Clothing/Head/misc.yml | 31 +++--------------- .../Loadouts/Miscellaneous/trinkets.yml | 10 ++---- .../Prototypes/Loadouts/loadout_groups.yml | 3 +- .../equipped-HELMET.png} | Bin .../Head/Misc/hairflower.rsi/icon.png | Bin 0 -> 572 bytes .../Head/Misc/hairflower.rsi/meta.json | 18 ++++++++++ .../Head/Misc/hairflowers.rsi/icon-lily.png | Bin 411 -> 0 bytes .../Head/Misc/hairflowers.rsi/icon-poppy.png | Bin 425 -> 0 bytes .../hairflowers.rsi/lily-equipped-HELMET.png | Bin 341 -> 0 bytes .../Head/Misc/hairflowers.rsi/meta.json | 25 -------------- 10 files changed, 26 insertions(+), 61 deletions(-) rename Resources/Textures/Clothing/Head/Misc/{hairflowers.rsi/poppy-equipped-HELMET.png => hairflower.rsi/equipped-HELMET.png} (100%) create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png delete mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png delete mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png delete mode 100644 Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 1d3b805e24f460..19351f294ef67e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -315,32 +315,11 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatHairflowerPoppy - name: poppy flower - suffix: headflower - description: A beautiful poppy flower that can be inserted between the locks of hair. + id: ClothingHeadHatHairflower + name: hairflower + description: A beautiful hairflower that can be inserted between the locks of hair. components: - type: Sprite - sprite: Clothing/Head/Misc/hairflowers.rsi - state: icon-poppy + sprite: Clothing/Head/Misc/hairflower.rsi - type: Clothing - sprite: Clothing/Head/Misc/hairflowers.rsi - equippedPrefix: poppy - slots: - - HEAD - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatHairflowerLily - name: lily flower - suffix: headflower - description: A beautiful lily flower that can be inserted between the locks of hair. - components: - - type: Sprite - sprite: Clothing/Head/Misc/hairflowers.rsi - state: icon-lily - - type: Clothing - sprite: Clothing/Head/Misc/hairflowers.rsi - equippedPrefix: lily - slots: - - HEAD \ No newline at end of file + sprite: Clothing/Head/Misc/hairflower.rsi diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 4bd7502eea8fc3..406fae65c20570 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -16,16 +16,10 @@ - ClothingHeadHatFlowerWreath - type: loadout - id: PoppyFlower + id: Hairflower storage: back: - - ClothingHeadHatHairflowerPoppy - -- type: loadout - id: LilyFlower - storage: - back: - - ClothingHeadHatHairflowerLily + - ClothingHeadHatHairflower # Plushies - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 98f35d07fe95af..8c69c4f108a1df 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -6,8 +6,7 @@ maxLimit: 3 loadouts: - FlowerWreath - - PoppyFlower - - LilyFlower + - Hairflower - PlushieLizard - PlushieSpaceLizard - Lighter diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/poppy-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/poppy-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png 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..6405d8cabcbe91693d86343f07da15a828d02720 GIT binary patch literal 572 zcmV-C0>k}@P)Px$_DMuRR9J=Wmc4G`Koo^PuRyNY%1F@`NLvhD6h&!LI3-FI!ULq+XW#|4bxXxl zB%})IHe0wsPDDA6fV)%(B&R?#8eqo8gVOBgRQCMbd*=R}8Ti8gj^LQh_ZO#y`X0>Y zUbbp)y1zIrqGkhtRyzXVeUX!|)?P#!bqPexhIXvbYDZv@sDp2H7MmeIW{o$2DyY=d zfpf?1NqmdUi-1{ZE<&G5K*6kXMJQjbVUh0@qM94b=7Ei@D}sB2>hv}Tii}Cl9M4y4 zYnQ0`IL-F_)h@y~&9;aD43`0Mn(_0;iIaG%9a+;@o50&mkJr0j`hVQ%l7t0sH@&*1 z>;wk0c~B)NS5FW8{@&*0`W7iA<4%|1(yvLJ5qMwZI?U!bY)%a@nM?qXQUaS)oIO4} z?b+a@{rB>GD_?P%F&d4uQve|ZQcC*$K37iqgMtq3dQW@0suX_BrLXWMujpJt=$D@kIzUc5kdf)I!MBT z>2#{sM9qedLY0I&C#wVr+@fU8D|K|)a7MuAX7j;O*Kw6zltr(SK$&r+3re(HJ$?u( zBd}{+{rfz>Y^ZEQ*scd#PrC~CkRm)tzz=zTyB;i`^^*F+zk?4K#rt%h89%xJ0000< KMNUMnLSTY|GXo?5 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 00000000000000..a3ec217bca50ef --- /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 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-lily.png deleted file mode 100644 index ccbbbe752ec9c4744b0e273ede059030da099bef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8G(P)Px$RY^oaR9J=Wl)X#CKp2Og6BnbRL!lxl=%0}BaL!mA96|>Np;IzTp-UE_IO}4e zgNQhH^XMW-1_!}G5ds|?1fg3&ipx1@#7L?6vJU215{}&Oee!beK|#TPN8}OmvX2hm zjYhJ}Oai?+dTBnoHnUhpIM1g{V@EFsONdVybTS95}{kh)E=Z+a$JP)SRZmhLs zM549pNB&rAjSxRKA$glzG^H;ht8%17T!G|MPy#%JZJ5}GN$b%c`B|Le=>$GF-@6e2 zwqY{p4;l1_X`>S0<#+f(GF?Q4z{CY?!~89ef`Wp-;|;}9U}R@?*7*Pc002ovPDHLk FV1gg9wIl!l diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/icon-poppy.png deleted file mode 100644 index 5b673813ea564c0f10d44174e6372ff1aba882c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmV;a0apHrP)Px$V@X6oR9J=Wl)p>EKoo$#NTm?4Qwq|dpo8F0)O3-fj=EU|mr$G(r)G98uKf>M zaBvV8q0}vQv&1gdir|vX!O5*lw{xh425OsM*1>#J^0>VB-OIg$n3(^L5=D~s_Ldwy z7dp?ra)uIUp!|;AMYTPW^a{#Ox(M z7w>hCu=i|=Lc=mG0Ctl8as}=HK&DhcSb}D=34mo;)Us>y6Zp7p4?9pS0#GiOaU5rU z0-O0;ge5RdlUk{T<2Y24!{6`q90Z>N6WMsoxk4+MW!JlxX$U0%aP_e63a1jobA8x- zjpUA*T09B@jUm9?ZhclZiwd6UmB+5?%%TPk{zhPz+VaP<86> z_QYjgiU$+;=H~oK0WegZ{^x-H=OAb*A5@|{d?P|#M6tl!1q@aHEsvO(n7`u-aARHa T^y42i00000NkvXXu0mjfcUQdf diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/lily-equipped-HELMET.png deleted file mode 100644 index 374a7981d0479d7d078025fee7a0b3c26d5cb69a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlU zPZ!6KinzD8HgX;c5IFX+d+t>39SvoA3i-^{(&+^Z-!~MqTMIt)Rpe6;E8DoaOQp4A zW95g|iaqtOo)mq5EV$$J%tFNpTOB4w)%I-sdgAkz70-k>zuma$>${0E#-{8~|1!I7 z*!AP|*&M5~(CXk_ED1Ywx~ntG_JwizCn+>AFmWJ=65R{0;_JWuR%}`K`GxMjC9>~y zs}FW>W*3kUVq#8f5rd+ diff --git a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json deleted file mode 100644 index 5655849bfc5abf..00000000000000 --- a/Resources/Textures/Clothing/Head/Misc/hairflowers.rsi/meta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "icon-poppy and icon-lily sprited by Just_Art, equipped-HELMET sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon-poppy" - }, - { - "name": "icon-lily" - }, - { - "name": "poppy-equipped-HELMET", - "directions": 4 - }, - { - "name": "lily-equipped-HELMET", - "directions": 4 - } - ] -} From 30b4c292b0587a9741aeaee9b23896dcbfbca39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:59:52 +0300 Subject: [PATCH 6/9] Update_Sprite --- .../Clothing/Head/Misc/hairflower.rsi/icon.png | Bin 572 -> 576 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png index 6405d8cabcbe91693d86343f07da15a828d02720..5501a8fff14b934d47513b2d7a1bd01525758172 100644 GIT binary patch delta 538 zcmV+#0_FX@1i%E4F@O3=L_t(oh3%HVY8yci#(xTuJGr_A-y`5!S}^4y=PlPsvfFJ0o5~wn+bU}%htH$?%Hv-$n)qkD#%LZ>5!e&0$YTA{s`y}CBUCuu3x2s`!uTJU% c{|^2DWfQam=<~kSasU7T07*qoM6N<$f}BwX1ONa4 delta 534 zcmV+x0_pw01iS>0F@N?+L_t(oh3%HTZsI@`g+H%AuGq>*(H2Ns3|$mOX;L^PN)^Hb zq}ylU1-5ld#Zx4t3h6dmxIs=tIgfz5R0t%eKrRuv?B-PV{M>uy{+t>3!vBuo zn9cVWr-k|+%;sLUYHzx~I4z=P1AtaL0^og-ldslZL>hGoM1ReOcC659M_`bsgKu>f zn;}1DjW>ZRsMOSfbI0yUe2dJBfLUlRLZ3=N!K`vcC||8%k?$3vnj6gKfsL#yf_sDN z^fm{Ij7iQM&sS?}m#FzT&G!7&F2Xp?wuk@>mjQ8_@$<)tlX$BgS<_gXz}roa*SlZ( zf86PkgavOmy??r<>;wk0c~B)NS5FW8{@&*0`W7iA<4%|1(yvLJ5qMwZI?U!bY)%a@ znM?qXQUaS)oIO4}?b+a@{rB>GD_?P%F&d4uQve|ZQcC*$K37iqgMtq3dQW@0dn>t9sg6VXs*F?>RjzX1$J146I3EZM&&MS3v*>Fa{=VtT4QP**mUX(?z zl0cbpr3*^5Ts?jWDkHFKT>bkzzig;%L)fkdTTi Date: Mon, 23 Sep 2024 14:26:02 +0300 Subject: [PATCH 7/9] Desc_Change --- Resources/Prototypes/Entities/Clothing/Head/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 19351f294ef67e..254eaf37c80f5c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -317,7 +317,7 @@ parent: ClothingHeadBase id: ClothingHeadHatHairflower name: hairflower - description: A beautiful hairflower that can be inserted between the locks of hair. + description: A beautiful hairflower that can be inserted between locks of hair. components: - type: Sprite sprite: Clothing/Head/Misc/hairflower.rsi From 4d5962bd0761962f7bd017e1ed545b232a358410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Sun, 6 Oct 2024 09:22:59 +0300 Subject: [PATCH 8/9] Scale_Change --- Resources/Prototypes/Entities/Clothing/Head/misc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 254eaf37c80f5c..17fafe9ecddf51 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -321,5 +321,6 @@ components: - type: Sprite sprite: Clothing/Head/Misc/hairflower.rsi + scale: 0.7, 0.7 - type: Clothing sprite: Clothing/Head/Misc/hairflower.rsi From 08fd194b4081c3b5cbc608b03e7313b0079f23e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Sun, 6 Oct 2024 12:37:24 +0300 Subject: [PATCH 9/9] Sprite_Scaling --- .../Prototypes/Entities/Clothing/Head/misc.yml | 1 - .../Clothing/Head/Misc/hairflower.rsi/icon.png | Bin 576 -> 442 bytes 2 files changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 17fafe9ecddf51..254eaf37c80f5c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -321,6 +321,5 @@ components: - type: Sprite sprite: Clothing/Head/Misc/hairflower.rsi - scale: 0.7, 0.7 - type: Clothing sprite: Clothing/Head/Misc/hairflower.rsi diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png index 5501a8fff14b934d47513b2d7a1bd01525758172..cd68c5efcba17bc016c73c48c0e1b384ba2aed84 100644 GIT binary patch delta 403 zcmV;E0c`%j1iAx|F@JPPL_t(oh3%HTYQr!Tg-=Qv$lyT0T03@9@Q~GO$3mvQK*zj8 zhrB~xqEo=5pCLnurjA{&z)(X2O&}c-3B`>nSx!2%{=gv1Klk|DdnE%cE&rWPlZO}M z(N2vg%T>_3f(0zbqg{O6)#q}v4H9wHBzVMPL@W+@g{HP*Gk>^ANixWVuIq+#1Hc53F@O3=L_t(oh3%HVY8yci#(xTuJGr_A-y`5!S}^4y=PlPsvfFJ0o5~wn+bU}%htH$?%Hv-$n)qkD#%LZ>5!e&0$YTA{s`y}CBUCuu3x2s`!uTJU% c{|^2DWfQam=<~kSasU7T07*qoM6N<$f|djZ0RR91