From db74ca0e2c81ba4979dc5df5fa38f003759c2345 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sun, 17 Dec 2023 01:29:53 +1100 Subject: [PATCH] Add vials (#22587) * vial * yea * s * fix something * yaml * fixer * aaaaaaaaaaa * update * sprite changes * a * fix'd --- .../catalog/fills/crates/medical-crates.ftl | 3 + .../Catalog/Cargo/cargo_medical.yml | 10 ++ .../Catalog/Fills/Boxes/medical.yml | 18 ++++ .../Catalog/Fills/Crates/medical.yml | 8 ++ .../Catalog/Fills/Lockers/medical.yml | 1 + .../Objects/Specific/chemistry-vials.yml | 95 ++++++++++++++++++ .../Chemistry/vial.rsi/inhand-left.png | Bin 352 -> 1172 bytes .../Chemistry/vial.rsi/inhand-right.png | Bin 356 -> 1178 bytes .../Specific/Chemistry/vial.rsi/lid_vial.png | Bin 116 -> 0 bytes .../Specific/Chemistry/vial.rsi/meta.json | 26 ++++- .../Specific/Chemistry/vial.rsi/vial-1-1.png | Bin 0 -> 1145 bytes .../Specific/Chemistry/vial.rsi/vial-1-2.png | Bin 0 -> 1168 bytes .../Specific/Chemistry/vial.rsi/vial-1-3.png | Bin 0 -> 1167 bytes .../Specific/Chemistry/vial.rsi/vial-1-4.png | Bin 0 -> 1171 bytes .../Specific/Chemistry/vial.rsi/vial-1-5.png | Bin 0 -> 1179 bytes .../Specific/Chemistry/vial.rsi/vial-1-6.png | Bin 0 -> 1210 bytes .../Specific/Chemistry/vial.rsi/vial-1.png | Bin 0 -> 1643 bytes .../Specific/Chemistry/vial.rsi/vial.png | Bin 178 -> 1643 bytes .../Objects/Storage/boxes.rsi/meta.json | 5 +- .../Objects/Storage/boxes.rsi/vials.png | Bin 0 -> 1205 bytes .../Objects/Storage/boxicons.rsi/meta.json | 5 +- .../Objects/Storage/boxicons.rsi/vials.png | Bin 0 -> 1436 bytes 22 files changed, 165 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/vials.png create mode 100644 Resources/Textures/Objects/Storage/boxicons.rsi/vials.png diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl index 840965cf1d..303ede62e1 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl @@ -6,6 +6,9 @@ ent-CrateMedicalSupplies = Medical supplies crate ent-CrateChemistrySupplies = Chemistry supplies crate .desc = Basic chemistry supplies. +ent-CrateChemistryVials = Vial supply crate + .desc = Crate filled with a box of vials. + ent-CrateMindShieldImplants = MindShield implant crate .desc = Crate filled with 3 MindShield implants. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 16498a5a75..01a7192b35 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -18,6 +18,16 @@ category: Medical group: market +- type: cargoProduct + id: MedicalChemistryVials + icon: + sprite: Objects/Specific/Chemistry/vial.rsi + state: vial + product: CrateChemistryVials + cost: 1000 + category: Medical + group: market + - type: cargoProduct id: EmergencyBurnKit icon: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 8d62fbb515..aba61ce332 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -126,3 +126,21 @@ whitelist: tags: - BodyBag + +- type: entity + name: vial box + parent: BoxCardboard + id: BoxVial + description: A box full of vials. + components: + - type: Storage + grid: + - 0,0,2,1 + - type: StorageFill + contents: + - id: BaseChemistryEmptyVial + amount: 6 + - type: Sprite + layers: + - state: box + - state: vials diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index a487138afd..f478713c1a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -28,6 +28,14 @@ - id: BoxBottle amount: 2 +- type: entity + id: CrateChemistryVials + parent: CrateMedical + components: + - type: StorageFill + contents: + - id: BoxVial + - type: entity id: CrateMindShieldImplants parent: CrateMedical diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 352ff69c50..466171f6f8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -116,6 +116,7 @@ prob: 0.3 - id: BoxPillCanister - id: BoxBottle + - id: BoxVial - id: ChemBag - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml new file mode 100644 index 0000000000..35ac6bcad2 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml @@ -0,0 +1,95 @@ +# TODO: Have a seperate lid state that can be popped on and off (not as a seperate item) that changes whether the vial can be spilled or not + +- type: entity + name: vial + parent: BaseItem + id: BaseChemistryEmptyVial + description: A small vial. + components: + - type: Tag + tags: + - Trash + - type: PhysicalComposition + materialComposition: + Glass: 25 + - type: FitsInDispenser + solution: beaker + - type: SpaceGarbage + - type: Sprite + sprite: Objects/Specific/Chemistry/vial.rsi + layers: + - state: vial-1 + - state: vial-1-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: vial-1- + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + canMix: true + - type: RefillableSolution + solution: drink + - type: DrainableSolution + solution: drink + - type: ExaminableSolution + solution: drink + - type: DrawableSolution + solution: drink + - type: SolutionTransfer + maxTransferAmount: 30 + canChangeTransferAmount: true + - type: UserInterface + interfaces: + - key: enum.TransferAmountUiKey.Key + type: TransferAmountBoundUserInterface + - type: Item + size: Tiny + sprite: Objects/Specific/Chemistry/vial.rsi + shape: + - 0,0,0,0 + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: TrashOnSolutionEmpty + solution: drink + - type: StaticPrice + price: 100 + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 2 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 0 + max: 1 + transferForensics: true + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Spillable + solution: drink diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png index 71a75ca66e9cc4fdb2924ac76750aa07b6cef084..4a82b48c905c7f4b56893407f644809641220ba0 100644 GIT binary patch literal 1172 zcmZ`(O=#3W6wYc})}<|q)S~qeBE49W$wnzn$cAm*{sg+EtSxNu(lnWEL$gVm%(5xP zvU<^aQ4m2->eWL%DCk+Fc(NiML_vBI1O+c1L@mxF>2|kl2WIBY%lEza=9`&pOizt> zrOu=%it17)as@nRNl$j*@rk+e1y2dTFg`+UzCHU5FS=n-E#>pnd2A^yLde2 zPR#ij@S60*y@BpNiaP3mOY~+6>?)S9j`LX5<;#7K($)ssuwuNTLfuQ z6ag;)L0~b0^;d1A1+49#i-PRM$w6QDOc$AsO_R9Vf>S{mh9QaSEvnPd>v`OYXN6e| z9Y70~p^bcy=F*@Q51FO?3T;1@0}BJl7fj<@(o`4e7qL>K0j?+BA1+i6^ZLjD4FDkU z{1D3vtRRB={&4xSp-ad_77T@}?{|q8Ru@#}wd5|!@E;_4lNtHa={%<45*b%?-~4i65WR-8H(i{oU3TQCy>*?)+Qq?K-() ztMuw5|MRo_s_jHa;z(QaIGwFgvGFLoBi(*Mf9*{(&w4(t&)zz;8!c?A2t} zS=&8b`@KDJqnT7^$HvV!yM4vo%FrKYezo?UrS9}Rf4G;RMqTS~SN?XU+?NAmJozK2 Mqf@!fk@@TY0oZ?9n*aa+ literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRw zr;B4q#hkadbomZBh`2uVcJgq&EUQrPhOznh0|N_{SxXfJRc7p(mDk|g;Jkt9pNpe| zoTvGPnVxAy@6+c!O09CrzGZhplK}%cbS!N@`eV1w`Mo#FrQS2XS@8Bt=>q}l=zGj- zR-H~Tm*1OvY|m!VCt?*zKDi@;1NjTf#i!e>rpMy`SGtvKK66P*~33 zapUdJswtQEY`9tKeu=T?^wHT*n0Ev*Ob7;}#rz+b50%BIe(k@t2N+}wp00i_>zopr E02F_Z7ytkO diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png index c9c7de38f4e7a47e808684239bdacfbf530f877a..0f835ece480cc136987698860cf10e98fbecd4df 100644 GIT binary patch literal 1178 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;Kw~5N4dJ%_q&kz+99W5>XQ2>tmIipR1RclAn~SSCLx) z)@4&+1!U%?mLw`v zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj> z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA8(5=(PRl?OIdg0q!aw}m+&!ph*+&i_tP!_eXm#zwWxpjM?XXRsaJ- zb3(2+igLI<2;+bg(?rXfYuk1&J3P_y&m@M(*qR&l-(n8OftWE+!_%GBJnGS)vo_Z{!Kne(r9^X9bY zjD>s+7VHjlm=(@33Or}%C}ucf>F}=g^z)0AyMDb8a5%Z9K9cbguXlcp_R`I1tQC>( zcXglqV7>Ov&P$P-w;%YO!~I%LaLSoi{R)p{7z!g9U+wx=S^cK;@~OGnb4`Eqc6|7- z-z)8_7^(#fAhk&LUe`KcbYW)WeiJ@{muC*tOR-nneY5)KSEbn1bqy^I&-?LH!zzMJ8@SbXY)6_tA!fWXt$&t;ucLK6UD CBaZk0 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png deleted file mode 100644 index b1ad7e1a7c897da356c32f3a4673a2658ec4e68a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5P&pI+P2neuVT-adJ z#kpvPiO`y6w$~Z=YX7l&UV87PCN-BqLweD{n4Pi>vv?oQ^PZ&g@+zb095$gu#s?r{ O7(8A5T-G@yGywo7LnOKY diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json index 7b251e87ff..800cb2b522 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json @@ -1,15 +1,12 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Drawn by Ubaser, taken inspiration by /tg/'s vials", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "lid_vial" - }, { "name": "vial" }, @@ -20,6 +17,27 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "vial-1" + }, + { + "name": "vial-1-1" + }, + { + "name": "vial-1-2" + }, + { + "name": "vial-1-3" + }, + { + "name": "vial-1-4" + }, + { + "name": "vial-1-5" + }, + { + "name": "vial-1-6" } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png new file mode 100644 index 0000000000000000000000000000000000000000..84c961944ad0165ef4065baf45d85b883492fff4 GIT binary patch literal 1145 zcma)6&1=*^6wg+Wc44cY1o4o@ODQCiO}Etz+341+?Sfm@b%oTE*<{iU%_bq4Wn)j` zMZ5`B1P>lPh}4ghSP;Q;i}(j9h#q=q5tQPoIFrQvVhaZ5BQNjwes6wnUhY?y7c=QI zX^NsUgt-v%9@kJt9?h{ezW zv|$T6C;(Y53r69PW%e?3f9KT)vStG<^Z54slmXt+oUG4FrSkm zod&GE>cj|jB%p}$88gp2KSAemO!@$<@Ceqj}N#pYh|TaS10y9z0Tm@ zfO3uBzc{ruy`AxHs(-AVlMlX^s^jz>YAl(4Ze4mh_JZ3pAAfNsJH=n`Ue>>E?{dxe i&%YhKJ!DRWGp|zj_D^hld~^Uv+m}nr%I3nYyMF=cnOK_u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png new file mode 100644 index 0000000000000000000000000000000000000000..2e477363e8d24bdcbd77a9a3cf85710658c1eef3 GIT binary patch literal 1168 zcma)6U1-x#6waKEE-=w2QG7@<#3?2>&Dza|G;_22DcD(R2i=3X{BB`s5|Ue+4HOXs z|3JhEqCWc~OcZ<&1Sfm(Nr!JDhz~0GFrNfL5xqC5T{}AP!u>lr-}%n{&b_%(m>lmR z_mKoa^yDV8MKn{m$GXtyFD`yZQ-@z1A0d`s@BfN6JN0tT$mfZ}XdOcxx3{Nmp|RVY znDz;x?=J2gdxZECg6Mo;mddc4KOv}2g_Si&(b=HlhA1%*(6XXKnF=bF?F&JM4m||4 z#%4fMp$nYP(B*uAI_`KnHNbK#M@u9{QKF|ALNPm5hofDFo`cX80I1b!Y^|SlyjhS) zr_+Gr0nanYgYg$^CX|My9h<^&WyPt&3{7LAMvL;))CP}R^{kLZ zQ-N;j72SqDNU#ae4hKzRBSYJ-%YlRe_zQw@ZDBbVs!62OXn^vmpARLfhP*!1K$8RD zIqoRK@eH2^jq{=OMNJi;2`xPou5q4F!C?!wTCqQtz%sG2f+gFt89HDz-H@vmq@{j7 z$!UWLh0zRyW0ESbFi2yW;dw2URuY=5rgRZR5n3Zh)>c9hw8>4xiU`w1-FK`iu8G7C zB*jpt7VAcJB1E|@qS?9`QJ8a}gKnE=syQ3#p6j8T7ctiPw)WT@YlD2sHlf7V18g!k zp_(cu412KVc=M&OO8+PEmhd`7BzM!zj-E|e8uV@?QUr}RD3MEr&nxI*nz`(7socH3 zmM4jLtgEp4?9cD)BPGw?KR0y!-pN=mzrH(85goB(#I{`*i0xG2$lBRoH}+1yH$I(D z4L#hkaAxX|G4nhCZ>~(P&ZoXf%I)qu@1DN-7>_NH&rkOqcya04 R*j4;D$c;{Bmq%tU{spV>UuggU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b11c4a52663ed0d25e0ee4a207623e321b53d34e GIT binary patch literal 1167 zcma)6&ui0A9M4dsi)@T3=!S`)ha;NGwc8*dIDY=5XqEh=%y=p2|Dl) z@Y**6nhIRdT!PMLveY@tfz%+&u^gQwDT)#uwJ79LV>LM5CFog%Yyp6Bxy+XPS<9IL z(Re%#I3DmkgFP5`-bAv;nC_7<$iFx#=qiq8Bh4}?KdxM`N+?0oK2g1ed8$gC$1XW~ zz@jPu>d=5DazT`hf>t=B6}K`p-I^R&7~p@wFs>y`vXK(QN{xCrpW69wqDsK)A{8_^ z0G{K97>;N7IH;cwr!T6CfHb7TK)CvO0tJV4)NJ+reF=2US60wvb0$H1j0%f#Nk??D zpO10s>1csbi$#u!DSUy!8p{mNs{`>uRF#zhD1tCTbL7z4OelgDxrx3a!gLP0mR|B} zlH>E2V~~ z^6g)%=gA5e8U6GK{rNd*AFuZ9KXW_sVDs&A&%5iLug1F05^cNjaBFSv=Bdg+_nR9> zKR^3^#aR0FwD&`zM6NHrKY3?fx?EXbc|G&(`NsV3wTm}sy@c`thRDVchSp T?n@th=>H6)(TUXR$koNa@?&GJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png new file mode 100644 index 0000000000000000000000000000000000000000..c87cbf9032659953f565f56b2ca629469b047bc0 GIT binary patch literal 1171 zcma)6PiWIn7|;GVy2{3!pdw?$co89aY1Yj(q=n7SEnsJ@6*_cin!IdbX%doG8YiNN z7ZC+cs!A_)FLMermdQ#>i+LB;oy+O?wtAH08GzTfxz-tT)am$Q@O zUD4f9ilVyYiF6LnH0hBJJbLr<-|^Jq<;F*;sYk7OaAphc|p{KfrgACiENnE99mr;^o2vMztd1`8n$0@sJ zz@n)Dny>^dpUA*g(8bJR#-vM1{1}Yrl^BZ0%3&4$f327Py$VIlZYbXR1SK!Std0} z2}5xy(5bIm2Y#8jj`6rk6Q*x3Dp1_ z%yp=`%84T`s@U#aKB&_FNxUh%N)gIkceBH16O;zOn^aT+wKtfGE@VHh;)iL<>5+V) z^XtOHu2nv=MP8VGd%kZ`>HY9vssH-ywLj;EmBm=k1*)B@iNK0VT(zMuYa z^c(xqd$P;k`h2aoykpzc=*>6fv%e=>zjS;)k?(ug>9qCyyt2Bqa_RMv3HEAt>#6qs Xl{+Wlt-;6l$PYmtn@lf{p1$}O1Fd5w literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png new file mode 100644 index 0000000000000000000000000000000000000000..bedbf5b855935a304478a5dad8ff1b94f4c90d6a GIT binary patch literal 1179 zcma)6PiWIn7|*&tticVGp-gs&5oHL;OS5jSAuV)vZgqB)+DQuzO!H?8OOuei(rjLw zAn4V3kTKCAcyr2N!c?#~FXBP)peWlx4<3df9z2NplGLsp9r)n=`||z1-}ipsd%2mO z9P7f5;uwZ?CC3vPG!t&`>_DTvu|?<&IOGqP=H zCATIqb|}nyIyG2#tK%bbO%e6hy@>Rz0S$E9ELBYEP_|49-8`SM%D2DA-dMZjQ@RRc zY&F0ha~-O#a$MYkWy6}wdR6*AiT8z9DSWx>Znpnyywad|6T^8>dxJ6jcKS;NJxrKP z#Iw2J&bv5XAr7=vdVWp({p*@{A|L)=&mTL~Rjj@L$@Kk=lLr@HY_GhYX*;+0 ha;Y!)G`;<(5^NoImbY$wy6gTJlB1J}wUNu${sMh&XT<;j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png new file mode 100644 index 0000000000000000000000000000000000000000..ba57cf0f06001e79f3c74ec666b7612f5c4ca6fb GIT binary patch literal 1210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|?RB84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx3jZ6$u%ng%tQ_|85bWM_tl5~M#oTzJLlwxX` zWSEkeY?^AL4>1ANWQZuLg*N(F+-3s`5v$0c)Z+Y{Qc#@O8JU^bfWrwz6cIZR9T8Y{ zAd8~w2*}7U$p@ykqReE^ypq(Sf+AqbgV+eQ54Q?*vk;bt=4F=H89@y|6Gqa76mwRN zMJ46=McE$R@*>tD2-ENH;wc7Q`em|znTPbd0U|?RB84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx3jZ6$u%ng%tQ_|85bWM_tl5~M#oTzJLlwxX` zWSEkeY?^AL4>1ANWQZuLg*N(F+-3s`5v$0c)Z+Y{Qc#@O8JU^bfWrwz6cIZR9T8Y{ zAd8~w2*}7U$p@ykqReE^ypq(Sf+AqbgV+eQ54Q?*vk;bt=4F=H89@y|6Gqa76mwRN zMJ46=McE^_d$n9qBWAp8tE|*i}q-M{4^sVB}neT7EpFN{2bv&YRBh&xLMh$`a zmrY7PzumSt@A}kK$%wX&vojg?ef#AqYW&-K^X3%?{;aw`-QW7ksn2`dY&Tx%(bX3| zkbW=k?~PwO9QiK1j~46{$j@7|`)zS}S?4F=WmOe7-454HLh=$^S=*k)G(Rx?^R|3^YtP#?gf25A8*1zinQ)xQ z^bKAxJtwflYQx#96XK;O?)l!^o0&DKPX4OT0?(Eg)dzm1Je)O2WyLhhmC@6fUh|vg zZ~E_fZ23%wT{|>p{OyRnT+rhwAeLUfKQT*f!kJV)t{2Cw1uPDh$XHl>iZ^aNe^=^ZI&-FN7a&w|*JD^2zX3Km5hDV$;1q;v4j$$VP|*QNtg^A9K~=_pCP z{eMyKMz+%_xy9^nY|d~!+46)zIFmm^J!~r1BH@iG?(X|$I_%bPllDJ8VPne%0aF{* zrzr_tg}pHU8e5K(qs91^|XdUQ_bOf{paefw=xS)&^M_u zyL!mB(xyA(%f!eqetjQb9`*e`Jo;_T>>Or(KYw%mVajE=6!x)nc`T@)_jL7hS?83{ F1OQSQQ+faZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png index 27b92b32095fbe6c4a850d889e8c79b00988826f..983e6b67032ee2d9608323c0c41be2645f617996 100644 GIT binary patch literal 1643 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|?RB84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx3jZ6$u%ng%tQ_|85bWM_tl5~M#oTzJLlwxX` zWSEkeY?^AL4>1ANWQZuLg*N(F+-3s`5v$0c)Z+Y{Qc#@O8JU^bfWrwz6cIZR9T8Y{ zAd8~w2*}7U$p@ykqReE^ypq(Sf+AqbgV+eQ54Q?*vk;bt=4F=H89@y|6Gqa76mwRN zMJ46=McE^_d$n9qBWAp8tE|*i}q-M{4^sVB}neT7EpFN{2bv&YRBh&xLMh$`a zmrY7PzumSt@A}kK$%wX&vojg?ef#AqYW&-K^X3%?{;aw`-QW7ksn2`dY&Tx%(bX3| zkbW=k?~PwO9QiK1j~46{$j@7|`)zS}S?4F=WmOe7-454HLh=$^S=*k)G(Rx?^R|3^YtP#?gf25A8*1zinQ)xQ z^bKAxJtwflYQx#96XK;O?)l!^o0&DKPX4OT0?(Eg)dzm1Je)O2WyLhhmC@6fUh|vg zZ~E_fZ23%wT{|>p{OyRnT+rhwAeLUfKQT*f!kJV)t{2Cw1uPDh$XHl>iZ^aNe^=^ZI&-FN7a&w|*JD^2zX3Km5hDV$;1q;v4j$$VP|*QNtg^A9K~=_pCP z{eMyKMz+%_xy9^nY|d~!+46)zIFmm^J!~r1BH@iG?(X|$I_%bPllDJ8VPne%0aF{* zrzr_tg}pHU8e5K(qs91^|XdUQ_bOf{paefw=xS)&^M_u zyL!mB(xyA(%f!eqetjQb9`*e`Jo;_T>>Or(KYw%mVajE=6!x)nc`T@)_jL7hS?83{ F1OQSQQ+faZ delta 150 zcmV;H0BQg046*@`B!78HL_t(|obA=I4Z<)KMbR6Yl$qp7lvHU^#`q(|gRp{!pnw%p zdm-8=w4+gcL%(K103LhuLq<_D#t&;%zn}fxW*Y^a}WA@YXATM07*qoM6N<$ Ef`raSod5s; diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 07c91cafb5..47c69de027 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -202,6 +202,9 @@ }, { "name": "darts" + }, + { + "name": "vials" } ] } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png new file mode 100644 index 0000000000000000000000000000000000000000..daf97dc2e45552ffddee66ba35838a499ff7db49 GIT binary patch literal 1205 zcma)6PfXKL7%wP>Ex`*U8p5FzOcc_-t{doTw`4eERYsP9$+*$AZ&2vk(!ROLMUV@4 zFa$jiZ${&d86Ytv9`NeLgE2~CxEMWf@=uJ3H(%R1HZl@l^8S7Oe&6qVzwf=Srp89v z{GEP+Alk%4JdJ14>8)q*XfG`M!c&u-9vLFaZ@Uih<}A#Jxnz>)!|PVuo%U}0As&5Z zV$vpvi;tb&bdK-dCWuqd)rkzsBu9DK$TN~+WFb?^n=VQy@pzesNFqylO}F_{gmOK2 zymrihB3&0W7ojrA6nV|CAUVje3`<4*BuNUElH=3y>lHZOMW`8sOdfz@vB(sIjA2cK zKsX!*EC)D_#vZhNM@LeL*6kiI$iFyoXv>yrBGu4IC$5w=3MfKR4pFsvc`9<1$1GTy z%c95tYA_FVWP<<`0F7`+%^hW^+Z8#mFu?hOVQfQ~Xd*d;l^QPLd@AR|iOMdojTBJh z063PtLbDvrg+cXvIDJ8pd88r@y24e@<0=@_P`%ahcO=kMM_FEz^yvsyq7|5v3L2uK zK`z89mjhW^$>mr&By(9BYb?udZlABgeT zM8+pioo{*C&2~1|4ey7@{e$0oo8`}U*IvzUi9g!gFWryLzSub|FZ6$F`fw(@H~#(f zjzO(1x2*IgZZB>x`Ifhz90u3^kT2Jld>fl9y<^V~reNXbu*$jE(MznTPbd0U|?RB84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx3jZ6$u%ng%tQ_|85bWM_tl5~M#oTzJLlwxX` zWSEkeY?^AL4>1ANWQZuLg*N(F+-3s`5v$0c)Z+Y{Qc#@O8JU^bfWrwz6cIZR9T8Y{ zAd8~w2*}7U$p@ykqReE^ypq(Sf+AqbgV+eQ54Q?*vk;bt=4F=H89@y|6Gqa76mwRN zMJ46=McEjLS{dAw-JdD3gX?CSylY!@6xYk!AAM&Jogqd^2_y2qsQG5#l(7*<`E9 z!DI3J%jP=9doivL6`yaL;1JdyZWu60gS~-=G4kBu!$%9g3;+AXu!L=i*fWk*mJBHc zUO{4tpAUR0e&(y}CF>!0QIR2N&HDA{C(M>O_uA@-k7_ zsUT#;n^d9wo^cz)k-Fs%IMcY5JB4$t0~9?K8H^%g9A_S!;4PBF-jU0Y+O62xtlFvK z!N)jZ=lp&Do22`@dBYtV9H%k=u((39JVk!{H!{(M6MvR;e5e_r$?qSDin8=F`NmCwEXjxX@!6itH4u+6z7RI ocjzd&@#^he{0JDvpPU#N9Cl