From 68b0b00328cd932570eb59589aaebfcbf29fe0e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joel=20Hedtj=C3=A4rn?= Date: Mon, 20 Feb 2023 04:34:02 +0100 Subject: [PATCH] Add the chemistry bag as the default belt for the chemist (#13965) --- .../VendingMachines/Inventories/chemdrobe.yml | 2 ++ .../Objects/Specific/Chemistry/chem_bag.yml | 28 ++++++++++++++++++ .../Entities/Objects/Specific/chemistry.yml | 4 +++ .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- Resources/Prototypes/tags.yml | 3 ++ .../Chemistry/chem_bag.rsi/equipped-BELT.png | Bin 0 -> 2269 bytes .../Specific/Chemistry/chem_bag.rsi/icon.png | Bin 0 -> 2271 bytes .../Specific/Chemistry/chem_bag.rsi/meta.json | 18 +++++++++++ 8 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml create mode 100644 Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index c8ed50cbba..d028c55cab 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -8,6 +8,8 @@ ClothingBackpackChemistry: 2 ClothingBackpackSatchelChemistry: 2 ClothingBackpackDuffelChemistry: 2 + ChemBag: 2 + ClothingBeltMedical: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetMedical: 2 ClothingOuterWinterChem: 2 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml new file mode 100644 index 0000000000..ad17f17e1e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml @@ -0,0 +1,28 @@ +- type: entity + name: chemistry bag + id: ChemBag + parent: BaseStorageItem + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + components: + - type: Sprite + netsync: false + sprite: Objects/Specific/Chemistry/chem_bag.rsi + state: icon + - type: Clothing + sprite: Objects/Specific/Chemistry/chem_bag.rsi + quickEquip: false + slots: + - belt + - type: Item + size: 46 + - type: Storage + capacity: 45 + quickInsert: true + areaInsert: true + whitelist: + tags: + - PillCanister + - Pill + - Bottle + - Syringe + - type: Dumpable diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 68ea5f6435..3737054ffd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -251,6 +251,9 @@ - type: SolutionContainerVisuals maxFillLevels: 4 fillBaseName: syringe + - type: Tag + tags: + - Syringe - type: entity parent: BaseSyringe @@ -258,6 +261,7 @@ components: - type: Tag tags: + - Syringe - Trash - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 390dc010a6..23faec9a59 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -24,7 +24,7 @@ outerClothing: ClothingOuterCoatLabChem id: ChemistryPDA ears: ClothingHeadsetMedical - belt: ClothingBeltMedical + belt: ChemBag pocket1: HandLabeler # the purple glasses? innerclothingskirt: ClothingUniformJumpskirtChemistry diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index dbb2562846..f8dbea80e5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -567,6 +567,9 @@ - type: Tag id: SyndicateSegwayKeys +- type: Tag + id: Syringe + - type: Tag id: Taser diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e70697ad2dd2d076e606a7a9eac4c90a1d7855 GIT binary patch literal 2269 zcmbVO3s4kg9A6$%3Z|h0nx;Ezrlotgw|BR9w{ikas7+?(BS}f^TR1K?d`vgDx8MHv_x=9A z|Kt15ElN*I?%nI9UI>Epwx(Dz;5|;co)3e+wfyX6cZ&Kx^r`RbcQ9#?+iYf zu>x6k(Q38F<579ED$$(}_nJ%!2T9@(flEb#%y@A@8rH>N0TS!xT{15UsKUtD#X{MP zL8+ZFI9&l+LGtGbW=!p6TxyMqP-5x;a%=$SDs($KoO7%iIDiufvIMc30M=C?%A!;t zK88B*`XL7}w>DeAN4Hv>&VUO^PMib7@F%2Ow3J!o0_qGPiG^+!B+h{{hbhsx=ma-l zWYL`|ijJ;IrFTh2NsWp`M^51dPV`8xJ+J{-7#Wx`STzzSV99iugqDV1Eip=25S>t) z$nkka|AA_Bv{pxx+J~U9XE;V?o(kqzI!|;v85l6{Wb%R9CFEmhAdPf_=n&n|F;u60 z&~8mgNOy~QyaT>Sw!&Vt7xE4n=LJ;CNFLXr*Jh)wf+RBn3#=A12D78$d5$*fNP;!8 zc{oLCN!(!4aX4e*w7Ax;WA%E@NB}@~?YD?*q0$4&{?7Bji7e#!S0B)6ILe^6<2r_+ zaDvj2xZR|qa8Ac+Dar(mK;OkS!Og=X$v7TlRa9}1(ZCovU?Md*%K|NK2Rc1&Wb|-l z0F+kG5q5?!Dt+J4N^}Y@!6Fy=PtqhX+rM(~Xh-+Z46B?9GsY_I065HV=DW$qGkNy! z_Y?p~`h+&=^e%~cvWIbl_ zQfXU!Hm>i2+;>jj?iFvSU@8)8US1~DTnYW6ZCra?dsy%Khyg3^PT$`ed||=%W6RbK z`Xwye8@+LKYt+K!>!yA*(KNes<`Uk4a zans7EqewT#XmS6ln{jLe;=6cjX^`(y+lU))RHhx6dK^j3`EgsniflOq!R#~UEh?|u z;ixNVNJ)y^Zap8FAJ-I_6}veIX>MP4|NGR5{YNa+M7(&dxFKosu}ua84Vn4MKK~`MDyZ z@1U(Y>7`ezLy-E@j*mZ`kaRB#S(aOUXgIO9sZXEZT5fOP4_4Xc?)c#H<-@-E(OW9s z_0`L@4dxiDK$a}1-$rRQHxsjW5XMF71gTwpo?Rjrh%K6=YwFGyYv!@!3g>$RU zj(H)W-z0k-!0cGjsJF^bytjP+`<@Bwa*rTO=6p53d_YLfX101p@NvO-ZhHBL+2xea zrMuYl^{&BZE-bzYX4YN!Y3ZLEBadubvL}9ia%=tip=;JumQ)Qv4piC8RN>cSqU$uZ zp|!QYhP{f6%qzRr+-4YjvLrRiVn}XFt8d#|+Gu+2YQyYrZ9nM8QtP5_tv;-;4ZZc{ z^>gPnm#YtqABYcKac6?HC3J_sM;Z?e`Xl;Q^y}k&3)*9pKOok`G|QH8Gw1yS_W3C# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..29fc1fb7ac18f64f2e7a5d498aa99f5aaa82630c GIT binary patch literal 2271 zcmbVO2~ZPP7+%EU1?Z?_QEFLZt$1v9vsn_d8kHnya13I^5d|GLyPL2j$*#K_2}r%F z;|O)?QKLge>Va+5>ZrBeN2_+mdbDcmebu8X3}_2f6mj|%Lh7y4Om_F}d*A#1??2w3 z%u7oh7S*;}TL^-pQmhs`c*4rnIs)9K{QMg5Xd_t1Nf6YolX8VY#mi$L=$&dVJwwj0 zjUZ{>qox?%!K(cp0iYph;9$Q%(K)OPJ6IRzHLC9I-mii=#;6*bV8d*Jna$>``64?y zKQ*1s&!G*BYVaUMu?naR3#|};S5_EZ01E4 z)~PXs#xNY#Xmo0gj?n9L{b3x#H7JIo8UuoBNexC~dN}w|0dpebB<+@=L1W;}sLGaQ zfke^V++208R?Ukpu-9NvIB*;R2t>;B%9J1RNDV z2agb<^-94wfrz1gNZ8$`Zh8LRcZ2mw73he+6}D z`56Nswl-VH#!Iz$JRuX3oIC}%5e&#n(NcPzz@m0m;(a2`CQkt}dn(=tq*-JsnHSS} z-rbz3v}VaLu2JJ~{8-M*@VQc-r#7$_N@k5JkTo2^K+1@8OiO~V7VD=BuqLRDXERr|jHH=&^CB<|)M=ldPcfU* zMBd4{!NRZ

T*9=av!93rqH4rbfLs8=2yjWXemkDHfv&L`ThW49T*315MEsLV+4Z z3@nj|P(-2z!Er{18z_p$DU?GazJql#9_fn`*|Y3?QQcq_}n{khpJ zAbm}lG+CE;r<_ZPY?2Ga?u})LzDm4AO?kcaw@YP{rWd3?U$*~8dN3?>Hsy7(pvR&r z#Tis-MomdUpU+q0+Eb0I84kLkG7R-$@Dl3etQSy=piiIAyu?FLi$y7xr1XqAm4U(5 z*ikVDrjPx3o4L)o9`YSze&;r`zlXp1rSQV>GfBtdxFKZ9+(_Tv%$5_bi>A4j@mb@S z6MdsiX-fkOtPw>!GEUy@k|YQpP1tCzxKVZgL{_}-$o5P1PcA)ZsG1sgZ-wKcPTyy{ z_q+U9Xh-Gkw9bdi+V$9TaMf=WwQC!uZCzVOz6Y6F5BTDEiv`vXpk>9yi;`z|_~+QM zNT|NP9_o*xyWz*>voFl@4@}*hQB(VFQS$Y_{L4Q7p?geh?AG?tpP72q3_p7#H4q3C zRMefA(c#B4zLM%{iPJ`YVp<8;?wdb(-NB-b5B6vlT3a67;yz$ZpWaJoxBT$bu|u=w zg@Lsi&!@ZHb4)X@ELqr3njLZO^5rEJ8#O}C9STnEwl-PUm0Q)`nh)FRK+iD&y zF_^;B*N<5`s3h@b{7$%b@saND7u;F+Xp}hf?jdSY^rpHK&=B>~)vkoYC8e(W(drd_ z_LP)9ue=x zwJSGWyO+^A3`S$ATYsNwk+%N#@expVZIwDRuG_WgN9JEGya;(_=nn8@TcC;d9)Dyi Pe?d}`Q!N`!lV<%3_#!^? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json new file mode 100644 index 0000000000..32e464780a --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} -- 2.52.0