From cdcfd4ce014ebc20eddc603ce4e85a04afd8a076 Mon Sep 17 00:00:00 2001 From: ssdaniel24 <107036969+ssdaniel24@users.noreply.github.com> Date: Tue, 17 Jan 2023 21:47:18 +0300 Subject: [PATCH] Added CMO's beret (#13489) Co-authored-by: ssdaniel24 --- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Hats/beret_cmo.rsi/equipped-HELMET.png | Bin 0 -> 386 bytes .../Clothing/Head/Hats/beret_cmo.rsi/icon.png | Bin 0 -> 300 bytes .../Head/Hats/beret_cmo.rsi/inhand-left.png | Bin 0 -> 277 bytes .../Head/Hats/beret_cmo.rsi/inhand-right.png | Bin 0 -> 349 bytes .../Head/Hats/beret_cmo.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 38 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index dadcd41da2..c34a986f9c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -127,6 +127,7 @@ - id: ClothingBackpackDuffelSurgeryFilled - id: ClothingOuterCoatLabCmo - id: ClothingMaskSterile + - id: ClothingHeadHatBeretCmo - id: ClothingOuterHardsuitMedical - id: DiagnoserMachineCircuitboard - id: VaccinatorMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index da15eb96bb..416ba38f23 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -512,3 +512,14 @@ sprite: Clothing/Head/Hats/jester2.rsi - type: Clothing sprite: Clothing/Head/Hats/jester2.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretCmo + name: chief medical officer's beret + description: Turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_cmo.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_cmo.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..070336af7618ac95e170046edc14c57d125362a6 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!TmyVUTp5f!87u=B9OIbW(^vx% z*~9X9W~lRS*AuSjGg^n6SlqIM6X8;Z4E(!7r2GTGvQDWJDAp4=G zi(^Q{;kVZU^IH@ISQ5gzzos<2Exhyp|H|0hSs9Oyu-~86s&4#Ca$*X{>9d00#GOx? zxmSITtYhfcUpIkMUZ5_w%-(lZwK8cyn;z0xR zf9?ZE856q|MNV9MU;p~|jOaU=d-XlHKNsb3xE304>D;yV(Q|J8eDJ(sgJ0OXOxq@v t4OQ_^$}g0ivrHD_YT-Umz6fH@_Qw1*ISX2k?pO}?x2LP0%Q~loCIHGJm%IP~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4b00dab1cfe842ad7bad76e19cab9c64a7b6a8 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy9sxcft_((=43+^5j&V%xX{-T> ztl?Q4F=hY%|Hl+(56c5e@yt-?O)KKvuE&>C$(L6xbktb5qSNeU#KXI1oPcI>lmz(& z18FeW{ybW}nx#Zbi&Be?CRp*S?pHkINP+rM=;M?t*#0ZA2 zZCRIn7reR0c1d%VSKIUKax;e66DnnY9Gq~?ydiem?Vm3s#04Hryc4v`WpzQ_&i&2i Xo-gEcj5S->K<@K&^>bP0l+XkKj}2!( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fbeee4c5d66a65cb7a5cb31975b82181987da81a GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e-2k5uR|X?b2Fm~@_cXq|YN4aX z!WErnFC+f{|BqFiuTzs1sF9;2$S)X3gTeOaK?{M5eoq(25Rc=@8tM!ZZlXO}2i7@c zPqmt{F3MDJchlB#MXhW1?rQe=I$phN`&_N*<=x%tNx>V+(%s#aCg{z&c+s#~w!7(O zaP!>*Tu!~c(i=4|@Q5WabaNXSa3lpQWt~$(69A>YVWt28 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..31729b799f9d0770a691c6e0b7e7642bdb50c3ac GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!j01c^T!A!$ktc&?0F!$fUtYD) zQDfnXPP3O02M!$g|NlQ$sq^<2cL8;Al?3?(gS10H@dAkqAnUxRi(^Q{;kVZ=@*Ps( zVZ9Jlz|8gNfBjnVV@ln|c`qivtW|l-xj|>jpXrLMA^{GKat4NOpJQgLdAsZh%XvKK zv)tE1vI52Dv=jfN{A}|2FQ@T!CFhne%WuEcD{Wl+^wQS5&)GD-o=^&S=`S>)QZwzF zzC$~M!B!iOj0Tm1E7yPi^D|Gnp-5$owLy?yugtE}>!~k{wH6%kZ}@jU#G!FB!&}$J z|EwR*eBXR1lfl3I%tZ@#_D#%JE-LmiFYM(z+;F9A<6#EwrkjoJ?;YG@S&w~UX!%o9 TXSn{pH^`Hou6{1-oD!M<6;q5t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json new file mode 100644 index 0000000000..a9602ce838 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by 𝘽𝙚𝙡𝙖𝙮#7441", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}