From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:40:34 +0000 (+0100) Subject: Cryostasis syringe (#22021) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a263a17f7217d659914f767527881d91c479a2a3;p=space-station-14.git 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 --- 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 0000000000..57f12125b5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png differ 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" },