From dd5e666d940f61b0cf9c540698358efcef82fe3e Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 18 Feb 2024 22:37:41 +0100 Subject: [PATCH] Revert "Straw hat (#527)" This reverts commit 1959db69 --- .../DeltaV/Entities/Clothing/Head/hats.yml | 18 ---------- .../Recipes/Crafting/Graphs/strawhat.yml | 31 ------------------ .../DeltaV/Recipes/Crafting/improvised.yml | 12 ------- Resources/Prototypes/DeltaV/tags.yml | 3 -- .../straw_hat.rsi/equipped-HELMET-hamster.png | Bin 983 -> 0 bytes .../Hats/straw_hat.rsi/equipped-HELMET.png | Bin 982 -> 0 bytes .../Clothing/Head/Hats/straw_hat.rsi/icon.png | Bin 743 -> 0 bytes .../Head/Hats/straw_hat.rsi/inhand-left.png | Bin 963 -> 0 bytes .../Head/Hats/straw_hat.rsi/inhand-right.png | Bin 932 -> 0 bytes .../Head/Hats/straw_hat.rsi/meta.json | 30 ----------------- 10 files changed, 94 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml delete mode 100644 Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/icon.png delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 22167ae038..1c5cef39af 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -192,21 +192,3 @@ sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi - type: Clothing sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatStrawHat - name: straw hat - description: A fancy hat for hot days! Not recommended to wear near fires. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi - - type: Construction - graph: StrawHat - node: strawhat - - type: Tag - tags: - - HamsterWearable - diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml deleted file mode 100644 index 7203a4fdfb..0000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: constructionGraph - id: StrawHat - start: start - graph: - - node: start - edges: - - to: strawhat - steps: - - tag: Wheat - name: Wheat Bushel - icon: - sprite: Objects/Specific/Hydroponics/wheat.rsi - state: produce - - tag: Wheat - name: Wheat Bushel - icon: - sprite: Objects/Specific/Hydroponics/wheat.rsi - state: produce - - tag: Wheat - name: Wheat Bushel - icon: - sprite: Objects/Specific/Hydroponics/wheat.rsi - state: produce - - tag: Wheat - name: Wheat Bushel - icon: - sprite: Objects/Specific/Hydroponics/wheat.rsi - state: produce - doAfter: 10 - - node: strawhat - entity: ClothingHeadHatStrawHat diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml deleted file mode 100644 index e01a510653..0000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: construction - name: straw hat - id: strawHat - graph: StrawHat - startNode: start - targetNode: strawhat - category: construction-category-clothing - description: A fancy hat for hot days! Not recommended to wear near fires. - icon: - sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi - state: icon - objectType: Item diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 72181758e3..6a1efcfa69 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -36,9 +36,6 @@ - type: Tag id: BionicSyrinxImplant -- type: Tag - id: Wheat - - type: Tag id: PaperSlip diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index 10a56e316be5029847778984dfbb740cf4781671..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-xA)-y zkz@61{kJ??(9z-CuEi%-(_rDn8hd5o+Jvi1dtWlolA0tU7=G}mV}U?y4evkpU0mz9 znig;<<-OY{rup%XTgJqy!)Jefy!%_$Z(l>b+Iq>dzbq20$GiO8o47lVCS2BLlzORj zrXXnZ*_$^)=G0%mZfh6%{?MxH|G#IgyC!<~+JWmjHp^yCQ`Wg`u=&}HuI;VXTXTwB ze|S_}n8et+e(JnWKU@osJ?1|eW@E)!chz{t%10rh*^#FO7|`@&rrb~Bf1eFsJWXMsm#F#`j)5C}6~x?A^$fq{wN)5S5QBJS<1jb6--0&V6} zoE5h+7Wy(dT3qnE;FnX&IRD5c_6=V=YZ#+F(+~JPbYSva+#2g=8L@`e5efRQ2V~w5^Xn&onddmwe8uu*F?p(`L)I7j+Ha zUTt;vS6lgW<9iMdsmI5rWqQ9?o#NM!YjTP6f-GZIPWP;9FZvu#>}FJx_{74#cO~n) zOL^PcPkrIARLj(45ZZkF+_vMT6K|zn&-^~;{g u`})_ZC>GVM=FDMZ6kx!L8uz diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png deleted file mode 100644 index 2ddd8f3209755697759ef3afc1add074023b47c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-xA)-y zkz@6_wF^ZBWnE;ft{e|=6gd*8bz`a37ST1kR5CAfuGqLG$wX?kN@P1hp2K-pO5dW_8(mS>g$46U;pp55BFAkE%6{*NX}Gew~o$bfq1>>F7p=a-aXR< z?}_)_Fk0}T^-^iSyy$bAy3m~ELc$NiZJl?@ulb*#oG;$W-g5Y;)6pOE+-p4zqGx$} zy`6Tq*||v~(CI};#1e;@jw@A9zRACTVS4^7)sGUNwnZEibMM4nJa0`Jj?qLo-9+fa zmWxiaS(*wK%v~_|#xEwj&ZYbbFDL(C+BWH2!`wrSER)>0ch9L>aipj4d})4Z`Z-(H zpZq~7Gw0SnyS;PC5Az_=d7B@9yK!$@wL!Lo)xG;aw7#mDG$uHPo^#d@E| ztxKW9YNdcoRJ~i&;ls)6-fez!+3c6!>u1iF70$lx+WxuV>&{zigpJ+x_Rb29wm!e~ z&)z&|)z|(dUZ1U^i&D-o`PuYm7U-|CW@GsHYHcB#^!{n2GWsHfz?K5hR3NQY+_i(Mb z{_fx39s2g=#Vyj;n$q=ST|wstmWE1>E&lQ?GoAfquPXdB7h;?s5}Ur}wZf~W_;mRb zyi5uVc+rR5ELzgaindjGr*D1y={0-y@t)Nz3R~RuHEp(Rdr{Z$?bTLyf3=lAH@@fa zka~RV*OsNJt~tGXlGxHNk+Lx8hg_8rqh3uSKazw&I~taBDGf4}e&Qaav0>p+?S h10w?P)sJi7fW$y@qymzHYfh^2e_6#Z4C2xpSnYZF^asP^`#cOOv+ojZE?$M$ z65FlotPF;x>{uOe{`5}m8Adx002ovPDHLkV1gywR!;x` diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png deleted file mode 100644 index 5cd89c082b142aba2fcaa1e0e1ef55b9d2db9c67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 963 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq}5*7RBxh4S4YH>j--hTG&+{L82E1K5bU|7GTHZp(HRww4Wc;E;Y?*09%vi>uqwv=%AXYL9Vn3lDlcS4IMlWws>=ViSSmmngb-m@vk{6tn zMpHuG)qggbJXv__J3sp^w$ayq8(5Sr4BEElee&s5a~l3~>J{_W#}&=`C$jg>1)KH< zx0*h$ZWFuR+?^{?ab>aF7Ok79wj((A?$5OJI_v2oo4p<~G72zYpa?UjshKJ@<##)L_b(T}>s3%J@cViHHQU&)u0@;J zf{#ev4EnIUw|B~$rMJUb4n8{{n*TX}-Fgwx8*l9Gl)uWgDW{n%tNgn#Yk^_?=UE~7 z-Oju6Yy~@&_og&2H!UssGs3Ejna=oi_;Hli{{s1^uT%}6-3*C6@@u8( z-?#f0ny>g*=DqUyy?UYQuO5Lxv!f61^!s48Nq6q9b<0zHZ5?CPpG#Ivmzks8P=6zD zeOZ!Ulh;4>Pm^|pWj|D?(D(fF=9B5x^)Ba6roU8geZb>zf5s#UagVqMRxX!}J?@H! z^ZuOhZ??yRDO?Vl79LUKPMNt}uanVCfq@A>>UK|1lU7zsd&lzhu5^Lrw4DqNoPMwG zIlTPN9OIWfXWDz-fXAW#KkQ}xJg?EDZ|4ezSEApn4qw}G(`@<9s?F=a+)JGJ?By9I z1Mhn|J3n(4zn**i(rSww`^^j*4$-@9SDz7I)@}3BTDSIlB0It*-u@57)yp3z3R*qa Q0;UZHPgg&ebxsLQ03_I?)&Kwi diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png deleted file mode 100644 index 8ad5764d3c372555106c27dc7a4dbc362c02d50d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq;>xh(cUEiE-s3#U9F7b0^Xeovoa>S6l702sUoC zujE;&XI#@3Ux~fXzawPt_tkM<-(QV+%X#Rc9x+Rl5_`cQ0?)ieP+ zF*(CjhlkQjk9+@FWfA(w|7erMq>1fYEWs)5S5QBJS<1jb4WXMB4JV1{v&n zv7nn(kZBj^uFlo^4<=juVvwyBia!v#E3zP%qa#3E_D+vfNYejPoi9CCnQytF{Fhm_ z=%nrU|NDz)@jSOU-p%6CfPoTjaa=jYGk?BG@ZNp(SJt{NkIt;92;FsDXouD>?z9b+ zTXzP0D864?)R1uU#fB%L7ws1}@7bgF&a#hvT4Dd!Kdo6C7@S{!xT=5ax8&LBJ|(u# z%f8*?zGwAz7q|KSO{Lyf7ktfsZ^rdYUw=~2-%=aStk(~V>Vq$={^xgl=j`3@6{NE} zoi7|+x_;~J7Z;sA8S_TjpUL{`@yh0m=HHv$Z`W*{#Kkh@kGoI``x&!G_ns*j*A@Ip zco+L%ar~L*U-=~*C(IAZzG(5~)OF7<-b$b2mSjCt{BLSJ{bb>v?Wcq?O)DRNI4z;# zz=R*wvAE^+guFcZ+w<4$@tvla5%o|)1_{AW7GeaH?!Cos(v63xB0=gXDyw6$l1 leP7ugF7|{6{Q;Fm|NNH6iOtc|4*?^e!PC{xWt~$(69CwhpIHC^ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json deleted file mode 100644 index 1885732f2b..0000000000 --- a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Adrian16199", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -}