From 6161f7d5f3309194a4074c5a46c12eb1d9530238 Mon Sep 17 00:00:00 2001 From: mhamster <81412348+mhamsterr@users.noreply.github.com> Date: Wed, 19 Apr 2023 14:42:05 +0700 Subject: [PATCH] [Entity] Add scientist lab coat (#15455) * Hey bro nice coat + added scientist lab coat + made scientist lab coat obtainable from scidrobe + made scientist lab coat obtainable from robodrobe + made scientist lab coat obtainable from role joining science departament + made scientist lab coat obtainable from science locker + made scientist lab coat obtainable from science wardrobe * Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> --- .../Catalog/Fills/Lockers/science.yml | 2 +- .../Catalog/Fills/Lockers/wardrobe_job.yml | 2 +- .../VendingMachines/Inventories/robodrobe.yml | 2 +- .../VendingMachines/Inventories/scidrobe.yml | 2 +- .../Entities/Clothing/OuterClothing/coats.yml | 16 ++++++- .../Roles/Jobs/Science/research_director.yml | 2 +- .../Roles/Jobs/Science/scientist.yml | 2 +- .../rndcoat.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 850 bytes .../Coats/rndcoat.rsi/icon-open.png | Bin 0 -> 397 bytes .../OuterClothing/Coats/rndcoat.rsi/icon.png | Bin 0 -> 422 bytes .../Coats/rndcoat.rsi/inhand-left.png | Bin 0 -> 432 bytes .../Coats/rndcoat.rsi/inhand-right.png | Bin 0 -> 434 bytes .../OuterClothing/Coats/rndcoat.rsi/meta.json | 41 ++++++++++++++++++ .../open-equipped-OUTERCLOTHING.png | Bin 0 -> 826 bytes .../Coats/rndcoat.rsi/open-inhand-left.png | Bin 0 -> 387 bytes .../Coats/rndcoat.rsi/open-inhand-right.png | Bin 0 -> 381 bytes 16 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml index 6ad2403846..881547fc10 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml @@ -8,6 +8,6 @@ - id: ClothingHandsGlovesLatex - id: ClothingHeadsetScience - id: ClothingMaskSterile - - id: ClothingOuterCoatLab + - id: ClothingOuterCoatRnd - id: AnomalyScanner - id: NodeScanner diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index d50cace0cf..5c24c99518 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -78,7 +78,7 @@ - id: ClothingUniformJumpsuitScientist - id: ClothingBackpackScience - id: ClothingShoesColorWhite - - id: ClothingOuterCoatLab + - id: ClothingOuterCoatRnd - id: ClothingUniformJumpskirtScientist - id: ClothingEyesGlasses prob: 0.5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 605b8f550d..b55a0b0814 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: RoboDrobeInventory startingInventory: - ClothingOuterCoatLab: 2 + ClothingOuterCoatRnd: 2 ClothingShoesColorBlack: 2 ClothingHandsGlovesFingerless: 2 ClothingHeadHatCorpsoft: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index f53af3b8f0..83562b174b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -7,7 +7,7 @@ ClothingUniformJumpsuitScientist: 3 ClothingUniformJumpskirtScientist: 3 ClothingUniformJumpsuitScientistFormal: 3 - ClothingOuterCoatLab: 3 + ClothingOuterCoatRnd: 3 ClothingShoesColorWhite: 3 ClothingNeckTieSci: 3 ClothingHeadsetScience: 3 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 0429396d64..7d5e62e1d7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -158,6 +158,21 @@ coefficients: Caustic: 0.75 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatRnd + name: scientist lab coat + description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/rndcoat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/rndcoat.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatPirate @@ -219,4 +234,3 @@ sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 25aa8b2037..d3e54f579c 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -27,7 +27,7 @@ jumpsuit: ClothingUniformJumpsuitResearchDirector back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown - outerClothing: ClothingOuterCoatLab + outerClothing: ClothingOuterCoatRnd id: RnDPDA ears: ClothingHeadsetRD innerclothingskirt: ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index debec221a6..a60a0da64b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -20,7 +20,7 @@ jumpsuit: ClothingUniformJumpsuitScientist back: ClothingBackpackScienceFilled shoes: ClothingShoesColorWhite - outerClothing: ClothingOuterCoatLab + outerClothing: ClothingOuterCoatRnd id: SciencePDA ears: ClothingHeadsetScience innerclothingskirt: ClothingUniformJumpskirtScientist diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..9f5f13f3743d56f027349f252cfe6de8d126000f GIT binary patch literal 850 zcmV-Y1FigtP)1_nV!awSAryaU92S9LI5-QkKi*=I!L&CUy*V9M7pw zjnIcf_AKHcb{zJcPH26Aef~%`{Zn~!Davi=oIZ~8bLg{^IuJ3NMZZ%;{H~nHFZnG` zmrtbM@5^enlJ7r$%8SwS4m$nd{=G~4hsR%p=by`~()KO-lg-OZJG2P2$*6N?(!Wu5 z!kx*jZDVK@otvD$-xH(*u|H*Yli@~*e5s-=j#-$1KX)Oop@eV{hP-Qe*3!E{$e2Y z#^do`=c`<2A=XYf{j?qTC9D3?02D>>SJV+%Ix!dw_Uy;5OChx#%XOtwAViPAVzG$Y zuM_3~=#f5@0XaFOld7MT0Ti3h=e5LB(E3DAODmP<3SW4%6SLV&hQr~WjW0+^-Wc_X z-nZ(TGeFdcuh;9SL%E4%Kq^TAAl+`awgdkfQ>unW{bon|>&b`Cv!G&p))6F@^}8+-^?idZmb07siJ z3$Se~16FEH5}-c_j2@IKm;(SYU3}mZfEiH~g|$f&$N)XsK_SF^BQ{TgSmlKy@%ht7 zYjb9(5i7@~RE28Q21PB5fJ3Ym<^&q-d=rZ@%mL8LVez+q9I;xQldvKk`eSV`DFe7N zQ`9J6+g1i>&Cnk!wWk2V&2c)NX0OabLqCP;QY!#@{W9eU?)yDooK{BRt{ cajr9e0I{j_B=AG#dH?_b07*qoM6N<$g0Dl9Gynhq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..89c2f1a7895b2731751f89ab562d6ff888c35b5c GIT binary patch literal 397 zcmV;80doF{P)!`p?t|l*KTzW9)s?*O58uvxdq^TDR&oeHS(X!_ z{^s`Ix)g=2JdU7k+fe}tI#QwM_*-Kyc7R})axS}U=c=q<-ke=4SBaf-{P4FXv6#R` zeI}c6eqGRVA;Lmp!oSM8uq-YEI_#%a@>pDkH2Xy|B7OTP<(!sQZ zkj?eJ?;SaE$^TCYaHXhJTTXB)9)`i`DwR}ytyj@B0u9E-YrFG2pQK-L=woCWfe$5X znr4!kR1C}s_>U1u9P0qf8TtqXcYtbHJbwq!v4<>QbOMmj_M7#s(~%?*LmrfX-Ujg& rP<8D_$o5Br8PDf@%$AUlkYL3pEV14np^O^400000NkvXXu0mjfg-x^` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bd519b3bc679bad518facce04a25c224e60229ae GIT binary patch literal 422 zcmV;X0a^ZuP)m5(|K;wI5CsB(|4!t);ikOnx2>HQXWr*IZ(!k*>4ctNUcarIcAr3Y zT*V;((lphAd=2eCWoZ<1y6QpGG(7_m%rP>&4u99Ptr@^!M|41oXrZ36yuDX;esUgR z$2$Dr?;3{tiz$37SKoV{IDfkH83ZCtuNy(m}F@&DL<%wu1 zl=?$*P0e;j=P*TiRHCaAS-_QDo0+ zSvk|Yz2O*=yG*OB9XT{{v0 z0000000000eJqa;N%tMhB@mMuiQ~A{vv^$`9g=RI&}Fx4W5n%8XrtG~(LU|>dmCTY z>rVBIb_Conmv;5|Gbv>v#krd^yxneR_YifhXS7p5={G=5--EVwjJ5;Z-T@s6=WYvt a@%jPC&$J$Of%$v@0000WMreanma)|caRQWk$|Ph1i8<@GbEr;YuO4ePCC zt`v*7CPhv=^SpRxq|TEhv)`um86|a3u9ocA`oH9c<5mMnZgbz@u+>wg+~prvh4X|O z{;!_4(r}CK&*ewYy}ldg@@*5(x={PR<+uph*^xXPH@#|0j2R5iz21KW5 zI?k&N4cPu`zoPcD^}pBW1evZ_nt3a6&%c+~7kH*JZYZc>uDNf1p>M6giSD_p>yuCW z!`u&~O>``Z_3tT5tUk8+pjE_{=@ms^bLzhD=DRjMjP-)d@rlvrU+bNf+@i&B?qT_K z>#sGZINwazs>QJFU(~g>*SpyC{Cgr-Gd(!Q`atN?jrhiwoW)wIo{Q{ic2pn!T&^Uw a+TVhG3vbuz%g(^KVDNPHb6Mw<&;$TUM#q!@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json new file mode 100644 index 0000000000..442bfb2920 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1f83265b5720410f1c666418d773ae367719aaa3 GIT binary patch literal 826 zcmV-A1I7G_P)yd63TZFWu`xl%;Q+ypHx==yQ;AB0_Z<{Xre^`|hs$>3+Fq*;6+f zjof;@cHh4La4)9M2N?9DhYyPS_vfD-+h4m^mHlh!>6`_b>$e-8ND zK(?!^U+DpGHLR|5r|IRSa6yzfCuoQE(nXuVe(G)~wyUduyX@lEFRT0rvDs{j(%%wg z_h|_A<7>%!JeRckr4x{*>0h&snT6PHx6992${7#c7ej16n)@oZfDcz-I2<07$5!Ul zQBMF@dbL^|lx^+#y83nNtBCRdh)ECVYw%KE!fn|pd3$YK6|V z`lS!SV@xI!w_Gms2Mx+3Njm)zxfH~{VFB|(B9^2$Ss_U#FB z;$`%jho&#}zru*W%UC^g1CS)q7toS<3d{?@p+z+TNIE#n&hpO?VzKBg zDhn-Wwn3u_IEBQhrZ%WoE%d7SS26ihvc)hA!?=n32L0+D2z!qBtN;K207*qoM6N<$ EfNkl7d*@>3QO00000000000Kbyd+vcL@4z48=QyD3WB4{p2N@H`-QhA=| za%GGyorg+R9G%Pab~`D5v0s4mdDqKI-h=ZOy#QK4o_cOz(ObY6W8?5llCQ-sfICCb hw(W9GkOBC2egMntw^OA&_Iv;U002ovPDHLkV1o3_tOEc5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9906772f0f7a1ca64a923e0e586258479b3322 GIT binary patch literal 381 zcmV-@0fPRCP)42B(ktW$LUoa>h2FxGxOeH^ZF&VEN3bg)>uhWxH)sOI6GXn?)G@@g)>sqz zK2ZM5gel)l(`;tU000000002s+}+tjl_W`}YgM)XJJU}rY*FV=)3mN?A3XSNyR8Sh zw)-OW|5e~Vx%{f`)0KbXH#FJT_1dy5vp9}-1JqW(dn$&?&%Y_lx=*z$|I}~1+^)=Q zW%J}}*H;vU1wmj>H_s=T#Ba3am#+L@7U0qDFI4CDxl$VJ-y5>F{LOn!leSL#_~rdN zM(%IWW!l!+ob=chL3vAW@?*;n0000000000Ff7`0_s~qutXdixgxva0lFzh?i@cEDa*q?yb?eTrwp$VP6xt`7X&U8{oEr94HsH(F! b05DeXgX_Pp2>u4T00000NkvXXu0mjfmTtLX literal 0 HcmV?d00001 -- 2.52.0