]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cryostasis syringe (#22021)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Fri, 1 Dec 2023 00:40:34 +0000 (01:40 +0100)
committerGitHub <noreply@github.com>
Fri, 1 Dec 2023 00:40:34 +0000 (19:40 -0500)
* 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

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Lathes/chemistry.yml
Resources/Prototypes/Research/biochemical.yml
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json

index 9e8140943ee94c8bc2b7699077aea988e07c3ab6..e940b6cb9f711c94a133acfcf0a4cb59a6f39112 100644 (file)
     - 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
index 632056060a12e67d2c161c5b74e40f713184eb65..a59eb40e442f3c1f610378c5bc2b43f3abd13434 100644 (file)
       - Beaker
       - LargeBeaker
       - CryostasisBeaker
+      - SyringeCryostasis
       - Dropper
       - Syringe
       - Implanter
       - BluespaceBeaker
       - SyringeBluespace
       - Jug
+      - SyringeCryostasis
   - type: Machine
     board: MedicalTechFabCircuitboard
 
index 959c8e30a0f92799a74ce08977992657159ea093..6d69010a0c006eefabad3b6fc86b33a0ec8ee8d9 100644 (file)
     Steel: 250
     Plastic: 50
 
+- type: latheRecipe
+  id: SyringeCryostasis
+  result: SyringeCryostasis
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 50
+
 - type: latheRecipe
   id: Dropper
   result: Dropper
index f9c7a27515570e9ed991cae3522c7811ae2f4949..7dcbcea4a014dc459d96d4d055e73e71a228960f 100644 (file)
@@ -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 (file)
index 0000000..57f1212
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/cryo_base0.png differ
index 68413c692dbda65117c699d90a535d5a03a194d9..8c15361569d6505f772048d399054204553f1292 100644 (file)
@@ -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
                          ]
                        ]
                },
+               {
+                       "name": "cryo_base0",
+                       "delays": [
+                         [
+                               0.1,
+                               0.1,
+                               0.1,
+                               0.1,
+                               0.1,
+                               0.1,
+                               0.1
+                         ]
+                       ]
+               },
                {
                        "name": "syringe_base0"
                },