From a78137c1ae8e54b3fc7049012250a7fd8b15bf1f Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 1 Dec 2023 19:34:07 +1100
Subject: [PATCH] Improve/fix senior physician beret (#22051)
* add
* fix error
* Revert "fix error"
This reverts commit 19580047c0e2f4b3daed7a4e8324fc5c240c81f1.
* readd
* change name
* typo
---
.../Entities/Clothing/Head/hats.yml | 11 ++++++++
.../Roles/Jobs/Medical/senior_physician.yml | 2 +-
.../beret_physician.rsi/equipped-HELMET.png | Bin 0 -> 1561 bytes
.../Head/Hats/beret_physician.rsi/icon.png | Bin 0 -> 1447 bytes
.../Hats/beret_physician.rsi/inhand-left.png | Bin 0 -> 1457 bytes
.../Hats/beret_physician.rsi/inhand-right.png | Bin 0 -> 1410 bytes
.../Head/Hats/beret_physician.rsi/meta.json | 26 ++++++++++++++++++
7 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png
create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/icon.png
create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-left.png
create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-right.png
create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/meta.json
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 49e686e9ee..5274a69bdb 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -111,6 +111,17 @@
- type: Clothing
sprite: Clothing/Head/Hats/beret_warden.rsi
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeretSeniorPhysician
+ name: physician beret
+ description: Donning the colours of medical and chemistry, physicians are the pride of this department!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hats/beret_physician.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hats/beret_physician.rsi
+
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretBrigmedic
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
index e4c097b0c5..f10b22f3ba 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -24,7 +24,7 @@
- type: startingGear
id: SeniorPhysicianGear
equipment:
- head: ClothingHeadHatBeretBrigmedic
+ head: ClothingHeadHatBeretSeniorPhysician
jumpsuit: ClothingUniformJumpsuitSeniorPhysician
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorBlack
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..47463551241ddb544b72b4d4214acf574ec03e85
GIT binary patch
literal 1561
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq
ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~%
zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?x
G?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2k^pv9!^Ls6y2Z5k)oBMjwm)HXvVHMFyo7
z=jW7y!rji&)CL?BD1wLxfM|%orU6+HT|+=den~zsJr!jpd*+p-78Mi$(-zo1BdB$_
zRiK-Nusbv_v&0T&0Gcq8E~L1zax5w-&o9aj0mlO(5OFGj8UqPXr1S|%{NTU`rhYpv
z8+~|Avg7ia;dq~cfl0^H#WAFU@$IbBeuo@H+WdR-A0DgdHL+b8o;&mN{LfocKRcT|
z_5Bq5Kk}KA`S;o@@h;}G&;II4J@&E4S8cLWePZF-&2LR=ZRBe8_FaBr`S;1MNS?Dx
ztRz{lB+jj|yYJa(ZL`fzME{a;oY-a$t5TJ1D^_`J{UyHl{#1>s0uS%guSHB)`p#S3
ziJ0FXw%YY$#T*NLdx11p6Y=Hu9;HSu3t8`}WJ_=_%W{
zE@mhH_-=|c|D{{U+FW<`Z<^)Foj=!d{&rwsA&CA>YM6W7%w*qW?$<}B$Y?#Du
z(lbAw`oA}+Zc6^y&m{i-%A5mV)T~e4@Y^4u^Qx`z_37;;Z~2NZznTPbd0U|`P642dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#UlzV7jcre>Bl`Vdv9x*?*dhT7<3vEK&dYpckh
z)Z+Y{Qc$?t8JU^bfWrbs6cGau9T8Y{Ad8~w2*}7U$p@yWqReE^ypq(Sf+Aq*g4hVP
z54Q?*vk;bt=4F=H89@y|6Gqa76gyUqMJ46=McETp5+MYQRjp!_&nvB!cs8@NO?=M-f|X@0Nz9i%U9`B5rte{A-N5apOhP
z)VZytN_CE>ru<~}o_$2Aga5`Mw@WJ+FXwD(ZEM-#IZNO~_nPYCJt-5<<^^n+*?8C5
zc)I2DJI3Vc-TV?Vt$Yre{#SuDS6*@c
z_)~Ce6z_R`)_G;U>-YpLLq$4WW;|`Vkzpe7A;G|5^G%oCcaPoacoii7D0c7Wb*Wn(
z3aN2Dc+%qNaxg)lo&7h@q!XSVTcfrHzSz}w^rz~UsM6c}E+;Kwu$prIxnQr`{`d2A
zo;UBBf9&kqE@kam&ji}0HLnle{!HiTuVT>!tF(k2JoYeV{)@Vxu^>iobNB^aX@ee_
zY1Z;RHj{rYPCp@CP@Uc{cqu=-__6!+`QG6cvu%%dsUA4}`EkO$sMhWW?I+^ai+(az
f;$nvc>15{l{t?UT^Zl3o2NjZ@u6{1-oD!MG?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2k^pv9!^Ls6y2Z5k)oBMjwm)HXvVHMFyo7
z=jW7y!rji&)CL?BD1wLxfM|%orU6+HT|+=den~zsJr!jpd*+p-78Mi$(-zo1BdB$_
zRiK-Nusbv_v&0T&0Gcq8E~L1zax5w-&o9aj0mlO(5OFGj8UqPXr1S|%{NTU`rhYpv
z8+~|Avg7ia;dmdIWsi8eIEGX(zP+{I`>=xu`-gB%4|B&?j~*@YW*5EUDenH<=O3ff
zVv*Im|2K$+Fzwpmc4EQ*hHlRT+nQyM#IIO=L#$BS5d++F3e6src
zz2z^bC?9HIU{PRT
zJjzb4j#$#Sj%B{N*_Cw)`upa&TJ$NG#C~_UeROr)`(WN5uj=&d_U?LfwzL
zzW%+z6V#+0$6i)Feb6y9*^%@J(+b7}6CMVV0<_04{-KK631uDpNLfD_&ENdAB@
z8}EreDDS^>H!W@XzgxDSck(YR-~I1J&fgzFd&2IsnCrLaT6txWqJDU+oIoIdgiLh$!G0rGDZ&4Eut0dFWpu?II1bH3o0%>UHx3vIVCg!01zG?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2k^pv9!^Ls6y2Z5k)oBMjwm)HXvVHMFyo7
z=jW7y!rji&)CL?BD1wLxfM|%orU6+HT|+=den~zsJr!jpd*+p-78Mi$(-zo1BdB$_
zRiK-Nusbv_v&0T&0Gcq8E~L1zax5w-&o9aj0mlO(5OFGj8UqPXr1S|%{NTU`rhYpv
z8+~|Avg7ia;dmdIWv6<&IEGX(zP)AWeb_&W$#hF_n!5=-%ICya*^OrXkcJM
zAr9CJM`*74{^yaF@$2;F$%ky8{Z`wz`{(|BJ}MkdN3$m&Q<**g{ZGX}k(+yeIyuLGaa)>cH9dCuX2r`d+oxPx
z*w}TU&Du8nE)(~>=Traj=KP4)y(e~pg^@+TfdMDc_>1Y6O`yK*!9CaQ*QQR4+8~*B
zYzUzXq*;Q7dkH7hJf#`TXP6b2h)(n_Vh&Vfl$=6_;BUJil|d-z7TemPr<4M&stz
z{->Enr(UnS(tnv@<*itGducu|YkjEz6-`8-iEz{~u6VxeZ~x7^uR!IWr>mdKI;Vst
E0C4Qv_5c6?
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/meta.json
new file mode 100644
index 0000000000..563409ca4a
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by Hülle#2562 (Discord), redrawn by Ubaser",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
--
2.51.2