From 431f045adb5baa7b548a54e3fe4e416048f56dd4 Mon Sep 17 00:00:00 2001 From: ravage123321 <142820619+ravage123321@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:47:03 +0200 Subject: [PATCH] lolkekhatholy alalalla --- .../Entities/Clothing/Head/hats.yml | 15 ++++++++++ .../Objects/Consumable/Food/produce.yml | 4 +++ .../Hats/holyhatmelon.rsi/equipped-HELMET.png | Bin 0 -> 408 bytes .../Head/Hats/holyhatmelon.rsi/icon.png | Bin 0 -> 334 bytes .../Hats/holyhatmelon.rsi/inhand-left.png | Bin 0 -> 491 bytes .../Hats/holyhatmelon.rsi/inhand-right.png | Bin 0 -> 502 bytes .../Head/Hats/holyhatmelon.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 45 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 123896240d9deb..97145a0f00d8ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -791,6 +791,21 @@ coefficients: Blunt: 0.95 +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHolyWatermelon + name: watermelon halo + description: Holy moly. + components: + - type: Sprite + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Clothing + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.95 + - type: entity parent: [ClothingHeadBase, BaseSyndicateContraband] id: ClothingHeadHatSyndie diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 42fd0967ff190f..7434481ac21e43 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2088,6 +2088,10 @@ - type: SliceableFood count: 5 slice: FoodHolymelonSlice + - type: Butcherable + butcheringType: Knife + spawned: + - id: ClothingHeadHatHolyWatermelon - type: Tag tags: - Fruit diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d23c59ef64de86cfb2e59f0600b23387278d29c5 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zgFIavLn`LH zy=Callqhrj<9$!((|0H6=`}hjOwzshKxzALDXCbQm_-Z2F9_)I>GkbxjceFp;o&T) z#38Bcl+wK24!R;&doB-Mk&z7|>yPu`yv+rx;xvwV|HF|Ei*08#6^~y_Elix5`yuCl; zX2wtEX+iR(k7cKpMC{mdZu>q)p!t;*zaDdmNl&V|eLk{!-aN~n!PhG`&x^D@=o8so zsQ2w5GcZUX;6|+Udv=doulgLW{G9lP-Q)Ic!49kYRSf#&+qFVgeNwaC99Q0dI!aIT wh}Nq=0saoZcFHT{ZdFVdQ&MBb@0GaB#)c^nh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6161c05f12086787d1e3c5c296aeceddae630eed GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR9J=W(lJZJKor37e}Y4n%V1RyL1-r_RR>+VNcMb}F5;&UmkwPz3Vs5! zhb|q0gTx`h#RwvZWJs4zJqL~SK;#bGd_TD1j(6`J?;Qvsg!u0~m*6x_js5YU&;a)j z2S%PKimY?`E)M|k=Of+k7P{BTbbHq8WV+uiv_Bu|-|qfo!?ifTvRUwSd(CP%_S*C9 z)1&nm>&`lj;5on4L8y4UOL*TrH|}oLS9<3pX4x#*KfJKc>okJqarP%M>zqbVmlcq( zcNP=AX2!hLAm(M3e8t#v>cDC^_Uf`CpH2uuh1&gGL8!>56Y8@1{uj2KI?z4>ptv!A gylY`0gb^MGl&;-%-SoYfy{! zS0YA#KiMB(SRy@P+HZ!Q+~!D^|04C1H!`TmD|O$|XJk{j+hBs1*kWI(AT;&s6pPL~ z=NaHCw=Csx&}@C^?fl)kR94pi)Q!62PZ2d2&2GHE@^y#x&TfN=-`*VvI@b`lx^wMh ztvQpH&z-cqxjjE#R<(}X+mdPx$ut`KgRCt{2*)dB3VH^hV=c1wIgwiE~paUTy+gs#zKSxVLOY|8U!lfaEM!$j| z;Kilka1tVDNLz%%3UX=c-*6~my~^3Ef90Ovc;el25AXZl=?f4M5fKp)5fKq(if8-4 z7=xpOC;9puz~A*T=nb%y^YQp{=!IeUuZxOEa&gak`MDTlFqtjx)?`}dP20(Wd?azJ ziT=)|hqvTd;khb7aUhsdoTlMT8e>Ms;#L*YGFuDiH0mgwog>$aWO&R!uAqH?=P2%C zeDrIwT?jn@cx~UvtjtrV003+}T#O3%KE3q-{2FFyEpiF~i^=Sih>S|mwxJzB8w=15 zpe^$SSRaGyAk9K*d*V1NU{zN2w46PNSD}D;-YYV{2Cx9_0NPl9b^vWGKs$go7N8wK z8w=15pp6A+2hf)K=hM3W>a(89*_mdr73cb|@wApU1+;I}hHHR!fWM~3GDl11M*s^* z`-SnXXCT>ujk`6OJiadGo^0bcTzIcau2{x?>B`A_#Y(RM&Fd2ZlI`XoA4!mpWUpL7 sr%`vGZV6IX?RpPhdjt>>5fNq950ll8lzgB7&Hw-a07*qoM6N<$f`a4ZhyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json new file mode 100644 index 00000000000000..4d35c0187d504f --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by ravage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}