From 88f0b3d4edbed8a6ec396a5f472b9bbf57c674d5 Mon Sep 17 00:00:00 2001 From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:25:14 +0300 Subject: [PATCH] [Clothing] watermelon helmet (#15025) --- .../Entities/Clothing/Head/hats.yml | 15 ++++++++++ .../Objects/Consumable/Food/produce.yml | 4 +++ .../Head/Hats/melon.rsi/equipped-HELMET.png | Bin 0 -> 750 bytes .../Clothing/Head/Hats/melon.rsi/icon.png | Bin 0 -> 279 bytes .../Head/Hats/melon.rsi/inhand-left.png | Bin 0 -> 583 bytes .../Head/Hats/melon.rsi/inhand-right.png | Bin 0 -> 582 bytes .../Clothing/Head/Hats/melon.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 45 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/melon.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/melon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 980bc3552e..7dc1ed0e0f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -538,3 +538,18 @@ sprite: Clothing/Head/Hats/beret_cmo.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_cmo.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadClothingHeadHatWatermelon + name: watermelon helmet + description: A carelessly cut half of a watermelon, gutted from the inside, to be worn as a helmet. It can soften the blow to the head. + components: + - type: Sprite + sprite: Clothing/Head/Hats/melon.rsi + - type: Clothing + sprite: Clothing/Head/Hats/melon.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index d1493f3a0c..1c8d38aa78 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1093,6 +1093,10 @@ - type: SliceableFood count: 5 slice: FoodWatermelonSlice + - type: Butcherable + butcheringType: Knife + spawned: + - id: ClothingHeadClothingHeadHatWatermelon - type: entity name: watermelon diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/melon.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..79853a9c84e65aff76d700606ceb86f3c5e83eab GIT binary patch literal 750 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V0n zPZ!6KiaBp*9n2CA6lvS9EXFzULarc7Gl!zc?hfwXER_u+cQ{IK&aD;N{Msm%>nr0Y zh9t9C7Zqu7uC80DoKu8$?a+I7_RJQ}XZI`)FRZeYcxN#A&gc2{=kBna6MZi8-?;qx z&q*aI2TjXgJ$e7s=*bf&R@!yD)d?VgMTtx2KR+y zJQu_k^hz$!b&xi8h;A@TYuLt+dxjyG@zxB+TTELFnYXZJpedYv=^Oi*{GFGxe)DY7 zEy(vw&p7+zq^N>yVRO3eiplc24-6Ufwrtc^^xh|$bS+;d`-uN59?|dYJnz2$`0!@0vwq9Gsui9b(oztgd(&ol9` lo60r0>!bz)Qh3!d|NOP(X@6kG5?}&m@O1TaS?83{1OQ*DPb2^U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/melon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c6bfab198528f32cdf3daa8643ef3e8b01c3b3ce GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tG- z#W5tJ_3hP-T!#z<8Xo?4X%8w0V>x*9;L^$d54d;iw)$nV?%loy{s%7}TuLv{x9B)* z8R2`e$yel20ekBOlb!EhOzc=CWE>T^S^5A2n?VEPKgJ7ukt#Fy+)bzo;JkJEyV(?< zDO=JW$+Z38xS{i$>qOGt(v$5Dfj>1E{SrIWY!w>Tr3Fv_!&P!xozd#)?=Ann*Kk)T z#5}buV5yo~$oQqP+rO$`ZB7r{p?TG%kA=24&wumdKI;Vst0F*v%s{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb1596e6d5b10f7930d6fefbfae366694a8a156 GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vnv zPZ!6KiaBp*ZS*=EAkwy9SxnGTMs(qV*&Qz~oIJaB_TE*+3zaNe()z)=goG|mir&+bnW<#zf3D0 zi+Q}iY&Ltztt{_lPQpTDqp z6(lrks(8Tf-;AFR`SF;gh4egn`5|EKfy*7IE~I>L|9If^71qOFHfagXGGb;DKM?%K zOz-eonP;)sLCc3sR~WDCU?^oU)pL+_ bIIC{4Hq$bEA$KY;WiWWU`njxgN@xNAP}2Lw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/melon.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..05be9f032a201a94ebf8e5d442133e46bebd6652 GIT binary patch literal 582 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vm^ zPZ!6KiaBp*ZS-Px6mdN-9NZxgq~+wW(R-n*mbLZnkZE-dOY2pB2-h{Fb~UiEvN3WMFR%EqR)mW{bu}2e!#miZkxrm%?Bi&E%sIXeaQL4t3PKdy4$P*PiQCF z$?M%+t)#r6U1Oo-`m-Klf)A<;cfY-zUHDqEM?G ziRLYGJHM! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json new file mode 100644 index 0000000000..f842621d06 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file -- 2.51.2