From a263a17f7217d659914f767527881d91c479a2a3 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Fri, 1 Dec 2023 01:40:34 +0100 Subject: [PATCH] Cryostasis syringe (#22021) * Added cryo syringe, sprite courtesy of Ubaser * I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly * IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW * added canReact at the wrong place, fixed now * made the transfer good * more issues with the sprites * not much to say, one must imagine sisyphus happy * mmm yes give me 0 of layers * I oughta double check shit more * Should be all done! * I didn't add it to the lathe, I am le stupide * Forgot to add the recipe somewhere * final touches, can actually be made at the medlathe now * added the recipe to the protolathe as well --- .../Entities/Objects/Specific/chemistry.yml | 32 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 2 ++ .../Prototypes/Recipes/Lathes/chemistry.yml | 8 +++++ Resources/Prototypes/Research/biochemical.yml | 1 + .../Chemistry/syringe.rsi/cryo_base0.png | Bin 0 -> 2176 bytes .../Specific/Chemistry/syringe.rsi/meta.json | 16 ++++++++- 6 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 9e8140943e..e940b6cb9f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -383,6 +383,38 @@ - Syringe - Trash +- type: entity + id: SyringeCryostasis + parent: BaseSyringe + name: cryostasis syringe + description: A syringe used to contain chemicals or solutions without reactions. + components: + - type: Sprite + layers: + - state: syringe1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: cryo_base0 + map: ["enum.SolutionContainerLayers.Base"] + - type: Icon + sprite: Objects/Specific/Chemistry/syringe.rsi + state: cryo_base0 + - type: SolutionContainerManager + solutions: + injector: + maxVol: 10 + canReact: false + - type: Injector + injectOnly: false + minTransferAmount: 5 + maxTransferAmount: 10 + transferAmount: 10 + - type: Tag + tags: + - Syringe + - Trash + + - type: entity name: pill parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 632056060a..a59eb40e44 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -220,6 +220,7 @@ - Beaker - LargeBeaker - CryostasisBeaker + - SyringeCryostasis - Dropper - Syringe - Implanter @@ -699,6 +700,7 @@ - BluespaceBeaker - SyringeBluespace - Jug + - SyringeCryostasis - type: Machine board: MedicalTechFabCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 959c8e30a0..6d69010a0c 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -20,6 +20,14 @@ Steel: 250 Plastic: 50 +- type: latheRecipe + id: SyringeCryostasis + result: SyringeCryostasis + completetime: 2 + materials: + Steel: 200 + Plastic: 50 + - type: latheRecipe id: Dropper result: Dropper diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index f9c7a27515..7dcbcea4a0 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -46,6 +46,7 @@ recipeUnlocks: - CryostasisBeaker - StasisBedMachineCircuitboard + - SyringeCryostasis - type: technology id: MechanizedTreatment diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png new file mode 100644 index 0000000000000000000000000000000000000000..57f12125b5acd20ba6865b905c8c5af6ef69b9e8 GIT binary patch literal 2176 zcmZ`)3s{op9*59rbkSqStYn6)?UGxO=P63f(iTY+Nd1D#q=z0Z67zyII=@_YZ^^W{W@ zhpa%ZL&9LN6`|W1k{AGv1lXGMODJYPL z(N??ccu6uy!C_zwdz|b5DKi!l7wt=A_b$wa(M~tWFd&5hO$E9{5~dpOa^APUPsSL zUpGny-r}EZ&6>0)k|&o4ldZf{2?3kPHZES1F1)}jBId1##nLws5qt?KfhtNS;Dm}n zo=hr(s%zHcoWFN#ylHE}d9+vnQVDYg-ViTBEqWbNkPK8vWJyuBmsp_johox?W+`1% zp|j<0qaUh&Dv}J$e@j$k@K#L;3}$ySlo1rAgb$tR4EsA9_0#YhKHwoTduYbU+uiAPx;g0H%O*GuwR0PEp$)k?5~M>it^$I?)2z?M8i|R zGilGa7SVv#AWxKCYWKg}#_C!8H9Ga1VZ-TU_% zRl2JEy7m{3O<`4aO`cy6*#i{MiSLanpFiredeYobw_avu+V=?>=m{HdWzLLH>Q#n{ zm1*7U&vI6A17b~@^I=~3+V;ev?DqIm*YDA<$xKP?H5p&rS(SV2$I^o0gMaqsCRa6# zkqR0tXVy=A^i^6h5nXiT=$5-4B9V(F^`K96Q*m6+G-B6lYVTwYMT5vS>IOqnw9FIKo}PV0xe?v1n^xVF1S z0`#eR@`AHU(_R`qE|~+F9);%j{T0tgkcm@Ri>Qa(Uv}pL8_NPd~*Uijgr zE>q?HG#9O2e<$Q;ugQWgMBdZQHykWukFF&poEk9)2GkF7eqTjO9pCDU9Vgu%_|y>h z{d6jp4(@Z?!zq~>e6jwZ=~*Q|NwB)RMlKB0+OGSKUb=kwZ{3~!jFQGM21cWtp0L-N z_@6AbJbR+QmKJ$nl(y}FXz25kt>s1U?Wnjqn!Go|=eTN_898o@eW)V3n8}JYZFyU9 zP5*PdFFki_5QyG;=y!wDc*=^UsHxE>`M-@Lniww!Qix_ZemczYT|Ei`ufMXq<525u zqwu3zvg6|&&12=+y&GF@E4F<2oa06F!q1%3M4YGk4<9QSp9D^bJ-cE zm<@9Ey&&{W)R)f;4^P*X^&=vCM}2fOG$PLw)#2d#{+1K9jxSaCK69mfu-&*U&&gO` zQ&=su#CN#rC%qyfo%m12Hx}(Q-f$U_Iv2C=6gjnMoDw%h)KMKce5G^cm}$U>MPAt8 zFJ;!Y-hR=1xDRF5BJ5B%n{RtxHgN~#_@hT1GGwjBUdpM0yqyCX_Kn-n50YG;w;Q+2 zBxhaWJx0iwwR_AC9{i)Cym87en>N|~-6c4~`@tf6sdC%38Bl)j6(8(muU*{!u^ zagW&$=;(UaPF=KpQccyaMo!yBbsl^8;mTkwtUd88EdyG9W}#F8@WM`J#*#pIVXk)b i1Px}l&}rBuX>deU-}34}R=V}?9~vCa_?CX)@c#k4lyuhs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json index 68413c692d..8c15361569 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989, bluespace syringe sprites modified by EmoGarbage404 (github)", + "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989, bluespace syringe sprites modified by EmoGarbage404 (github), cryo syringe sprites by Ubaser", "size": { "x": 32, "y": 32 @@ -16,6 +16,20 @@ ] ] }, + { + "name": "cryo_base0", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "syringe_base0" }, -- 2.51.2