From ca03719e3db5995218f4aee3547e4d5a26b881eb Mon Sep 17 00:00:00 2001 From: Ed Date: Fri, 11 Apr 2025 16:40:42 +0300 Subject: [PATCH] revert straw --- .../Entities/Clothing/Head/Roles/general.yml | 16 +--------------- .../_CP14/Loadouts/Jobs/general.yml | 6 ------ .../Recipes/Crafting/Graphs/straw_hat.yml | 17 ----------------- .../_CP14/Recipes/Crafting/clothing.yml | 14 -------------- .../General/straw_hat.rsi/equipped-HELMET.png | Bin 818 -> 0 bytes .../Head/Roles/General/straw_hat.rsi/icon.png | Bin 479 -> 0 bytes .../Roles/General/straw_hat.rsi/meta.json | 18 ------------------ 7 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml delete mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 1fb054149a..c9e4726d5a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -84,18 +84,4 @@ - type: Sprite sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi - -- type: entity - parent: CP14ClothingHeadBase - id: CP14ClothingHeadStrawHat - name: straw hat - description: Easy to make, not too bad to lose. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi - - type: Construction - graph: CP14StrawHat - node: cp14headstrawhat + sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index b69be3dbb0..6af01d68ea 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -202,7 +202,6 @@ - CP14ClothingHeadJestersCap - CP14ClothingHeadHuntersHat - CP14ClothingHeadJagermeisterHat - - CP14ClothingHeadStrawHat - type: loadout id: CP14ClothingHeadMetalHeadband @@ -224,11 +223,6 @@ equipment: head: CP14ClothingHeadJestersCap -- type: loadout - id: CP14ClothingHeadStrawHat - equipment: - head: CP14ClothingHeadStrawHat - - type: loadout id: CP14ClothingHeadHuntersHat equipment: diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml deleted file mode 100644 index 3414274f38..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: constructionGraph - id: CP14StrawHat - start: start - graph: - - node: start - edges: - - to: cp14headstrawhat - steps: - - tag: CP14Wheat - name: wheat - icon: - sprite: _CP14/Objects/Flora/Farm/wheat.rsi - state: base1 - doAfter: 4 - - - node: cp14headstrawhat - entity: CP14ClothingHeadStrawHat diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml index 4d4a8715eb..be7b201d19 100644 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml @@ -11,17 +11,3 @@ icon: sprite: _CP14/Clothing/Head/Produced/wreath.rsi state: icon - -- type: construction - crystallPunkAllowed: true - name: straw hat - id: cp14headstrawhat - graph: CP14StrawHat - startNode: start - targetNode: cp14headstrawhat - category: construction-category-clothing - objectType: Item - description: Easy to make, not too bad to lose. - icon: - sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi - state: icon diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/equipped-HELMET.png deleted file mode 100644 index 65841e7a0164eec76b92504d66811435fc5911c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>V0z=};uumf z=j|QC?%4@4Y#-E@$}2c#>|81y@?y@uf@pE>n^tZwgsf6_yuH@f7rFUvf%C~Ak7GHK zc`w5@%;fKRvP(wS;}2VY`?uO`6*ITJ#t%M6PvWk!t6zNaD7%7^l2X>9u+aY=91HJP zGkZ&gi8BbSHRouSxE#7=v+n)xiY*QAe}}qS%(_))WX-@+-DdLEY?5)s=dI`BQ=g@~ zhKo2Q7?!2}D$Y-MdEV-|TF&vt%!tO=eEZSit}EbpIofjy;1x0xxiOE z0!}XuBnl+|{HuOuGoM|}o(m7Re^*@emF@KU{Q`D57wbO@W&M1qmBm}#wr5vlSee>0 zQ^~JOZ`E1V|9{IZ5muhwrayoG+q3cCax`pyq+Ge~-gWEb_084{4VBjz8E&k<#nAA; zz2`$BH^YvS_}34cZb$F=Z&Lkf?s}bL>&~2-e}+%NxL)FjMlpk}{;o$QqFdVh?6M?)|yz%h4TEYPT=0oMxN0_jrJb_uZYH9XJ7p=+>nx z+|BrHSIyMhw&Lr>b1limPv@HVAIjDA)anp$YWLPA9$j z_m;b={8Fu>Ls|NSRYpIqOQzVKn*6u-JvY;()n@d5=>a~*r%0lDvavP$9w0_xKP zl7BZfWLYPx$nMp)JRA_=ps6J$kw%^#;o2t zWC&gg$(YT9mu`WJ=Yn*|T}%o>`UaOFNH`&dR5E0FzvXntySw*J(t!{{2qAnMW4Jk=`RC*5Y1EDlM+zOs zC>@YYLjQdJA@q6!#u$=G=#>s|SnQVr)vv#}UB&eHJx%;_ zQx1|z=)Ya8I_GiJb>d<^^-2fmIHuY7cqpTA%AI>gQeEH~vK0Ut)LJ?*m@{J8qvCfjKGXR}X)(U{>#QEeSAt9zvWsB;1E zc$!Tz`$dG&m@+T++LN}wAFp)5Vm^JFPbis$KE2KdDR`IFC|#iA7@#fYr8ZlyY2wrC zy!S2Gd4ZernQs!X*0PvSJ<$H3|7wBuO6~gtAIwYF>1$&DXPyv32qA