From 4455bab4c5ff8e9330a4111b74583c16f5bda174 Mon Sep 17 00:00:00 2001 From: Alex Evgrashin Date: Thu, 11 Mar 2021 12:24:17 +0300 Subject: [PATCH] Reagent container visualizer (#3529) * Started working on beakers * Working sprite change * Fixed large beaker * Add bluepsace beaker * Add cryostasis beaker * Removed old rsi * Fixed dropper * No dropper problems * Working on syrigine * Better syr visualizer * Add dropper inhand * Syringe in-hands * Add base empty bottle for chemistry * Deleted old fillings * Simplified beaker in hand * Moved chemical bottles to seperate .yml * Fixed chem master * Serv3 when * Fixed grammar * Removed delays Co-authored-by: Alex Evgrashin Co-authored-by: Metal Gear Sloth --- .../Chemistry/SolutionContainerVisualizer.cs | 53 ++++++++ .../Chemistry/ChemMasterComponent.cs | 2 +- .../SharedSolutionContainerComponent.cs | 9 ++ .../Catalog/Research/technologies.yml | 2 +- .../Objects/Specific/chemistry-bottles.yml | 93 ++++++++++++++ .../Entities/Objects/Specific/chemistry.yml | 118 +++++++++++++----- .../Prototypes/Recipes/Lathes/chemistry.yml | 8 +- .../{beakers.rsi => beaker.rsi}/beaker.png | Bin .../{fillings.rsi => beaker.rsi}/beaker1.png | Bin .../{fillings.rsi => beaker.rsi}/beaker2.png | Bin .../{fillings.rsi => beaker.rsi}/beaker3.png | Bin .../{fillings.rsi => beaker.rsi}/beaker4.png | Bin .../{fillings.rsi => beaker.rsi}/beaker5.png | Bin .../{fillings.rsi => beaker.rsi}/beaker6.png | Bin .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../lid_beaker.png | Bin .../Specific/Chemistry/beaker.rsi/meta.json | 43 +++++++ .../beakerbluespace.png | Bin .../Chemistry/beaker_bluespace.rsi/meta.json | 20 +++ .../beakernoreact.png | Bin .../lid_beakernoreact.png | Bin .../Chemistry/beaker_cryostasis.rsi/meta.json | 39 ++++++ .../beakerlarge.png | Bin .../beakerlarge1.png | Bin .../beakerlarge2.png | Bin .../beakerlarge3.png | Bin .../beakerlarge4.png | Bin .../beakerlarge5.png | Bin .../beakerlarge6.png | Bin .../lid_beakerlarge.png | Bin .../Chemistry/beaker_large.rsi/meta.json | 35 ++++++ .../Specific/Chemistry/beakers.rsi/meta.json | 1 - .../bottle-1-1.png | Bin .../bottle-1-2.png | Bin .../bottle-1-3.png | Bin .../bottle-1-4.png | Bin .../bottle-1-5.png | Bin .../bottle-1-6.png | Bin .../bottle-2-1.png | Bin .../bottle-2-2.png | Bin .../bottle-2-3.png | Bin .../bottle-2-4.png | Bin .../bottle-2-5.png | Bin .../bottle-2-6.png | Bin .../bottle-3-1.png | Bin .../bottle-3-2.png | Bin .../bottle-3-3.png | Bin .../bottle-3-4.png | Bin .../bottle-3-5.png | Bin .../bottle-3-6.png | Bin .../bottle-4-1.png | Bin .../bottle-4-2.png | Bin .../bottle-4-3.png | Bin .../bottle-4-4.png | Bin .../bottle-4-5.png | Bin .../bottle-4-6.png | Bin .../Specific/Chemistry/bottle.rsi/meta.json | 2 +- .../dropper1.png | Bin .../Chemistry/dropper.rsi/inhand-left.png | Bin 0 -> 426 bytes .../Chemistry/dropper.rsi/inhand-right.png | Bin 0 -> 421 bytes .../Specific/Chemistry/dropper.rsi/meta.json | 26 +++- .../Specific/Chemistry/fillings.rsi/meta.json | 95 +++++++++++++- .../Chemistry/syringe.rsi/inhand-left.png | Bin 0 -> 183 bytes .../Chemistry/syringe.rsi/inhand-right.png | Bin 0 -> 185 bytes .../Specific/Chemistry/syringe.rsi/meta.json | 53 +++++++- .../syringe1.png | Bin .../syringe2.png | Bin .../syringe3.png | Bin .../syringe4.png | Bin .../syringe.rsi/{0.png => syringe_base0.png} | Bin .../syringe.rsi/{1.png => syringe_base1.png} | Bin .../syringe.rsi/{5.png => syringe_base2.png} | Bin .../syringe.rsi/{10.png => syringe_base3.png} | Bin .../syringe.rsi/{15.png => syringe_base4.png} | Bin 75 files changed, 559 insertions(+), 40 deletions(-) create mode 100644 Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs create mode 100644 Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker.rsi}/beaker.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker.rsi}/beaker6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{bottle.rsi/beaker-inhand-left.png => beaker.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/{bottle.rsi/beaker-inhand-right.png => beaker.rsi/inhand-right.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker.rsi}/lid_beaker.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker_bluespace.rsi}/beakerbluespace.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker_cryostasis.rsi}/beakernoreact.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker_cryostasis.rsi}/lid_beakernoreact.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker_large.rsi}/beakerlarge.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => beaker_large.rsi}/beakerlarge6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{beakers.rsi => beaker_large.rsi}/lid_beakerlarge.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/meta.json rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-1-6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-2-6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-3-6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-5.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => bottle.rsi}/bottle-4-6.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => dropper.rsi}/dropper1.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => syringe.rsi}/syringe1.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => syringe.rsi}/syringe2.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => syringe.rsi}/syringe3.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/{fillings.rsi => syringe.rsi}/syringe4.png (100%) rename Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/{0.png => syringe_base0.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/{1.png => syringe_base1.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/{5.png => syringe_base2.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/{10.png => syringe_base3.png} (100%) rename Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/{15.png => syringe_base4.png} (100%) diff --git a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs b/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs new file mode 100644 index 0000000000..00421218bf --- /dev/null +++ b/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs @@ -0,0 +1,53 @@ +#nullable enable +using System; +using Content.Shared.GameObjects.Components.Chemistry; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Client.GameObjects.Components.Chemistry +{ + [UsedImplicitly] + public class SolutionContainerVisualizer : AppearanceVisualizer + { + [DataField("maxFillLevels")] private int _maxFillLevels = 0; + [DataField("fillBaseName")] private string? _fillBaseName = null; + [DataField("emptySpriteName")] private string? _emptySpriteName = null; + [DataField("layer")] private SolutionContainerLayers _layer = SolutionContainerLayers.Fill; + [DataField("changeColor")] private bool _changeColor = true; + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (_maxFillLevels <= 0 || _fillBaseName == null) return; + + if (!component.TryGetData(SolutionContainerVisuals.VisualState, + out SolutionContainerVisualState state)) return; + + if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return; + if (!sprite.LayerMapTryGet(_layer, out var fillLayer)) return; + + var fillPercent = state.FilledVolumePercent; + var closestFillSprite = (int) Math.Round(fillPercent * _maxFillLevels); + + if (closestFillSprite > 0) + { + sprite.LayerSetVisible(fillLayer, true); + + var stateName = _fillBaseName + closestFillSprite; + sprite.LayerSetState(fillLayer, stateName); + + if (_changeColor) + sprite.LayerSetColor(fillLayer, state.Color); + } + else + { + if (_emptySpriteName == null) + sprite.LayerSetVisible(fillLayer, false); + else + sprite.LayerSetState(fillLayer, _emptySpriteName); + } + } + } +} diff --git a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs index 2b65d6c35c..e3c83a8a32 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs @@ -278,7 +278,7 @@ namespace Content.Server.GameObjects.Components.Chemistry var actualVolume = ReagentUnit.Min(individualVolume, ReagentUnit.New(30)); for (int i = 0; i < bottleAmount; i++) { - var bottle = Owner.EntityManager.SpawnEntity("bottle", Owner.Transform.Coordinates); + var bottle = Owner.EntityManager.SpawnEntity("ChemistryEmptyBottle01", Owner.Transform.Coordinates); var bufferSolution = BufferSolution.SplitSolution(actualVolume); diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs index 160bc95eb4..65bfd5d2d2 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs @@ -290,6 +290,9 @@ namespace Content.Shared.GameObjects.Components.Chemistry /// public readonly byte FilledVolumeFraction; + // do we really need this just to save three bytes? + public float FilledVolumePercent => (float) FilledVolumeFraction / byte.MaxValue; + /// The fraction of the container's volume that is filled. public SolutionContainerVisualState(Color color, float filledVolumeFraction) { @@ -298,6 +301,12 @@ namespace Content.Shared.GameObjects.Components.Chemistry } } + public enum SolutionContainerLayers : byte + { + Fill, + Base + } + [Serializable, NetSerializable] public class SolutionContainerComponentState : ComponentState { diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 5d25606523..c92189f9f3 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -54,7 +54,7 @@ id: ChemistryTechnology description: A crash course in chemistry. icon: - sprite: Objects/Specific/Chemistry/beakers.rsi + sprite: Objects/Specific/Chemistry/beaker_large.rsi state: beakerlarge requiredPoints: 1000 requiredTechnologies: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml new file mode 100644 index 0000000000..918ebe9b26 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -0,0 +1,93 @@ +- type: entity + name: bottle + parent: BaseItem + id: BaseChemistryEmptyBottle + abstract: true + description: A small bottle. + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + netsync: false + state: bottle-1 + - type: Drink + isOpen: true + - type: SolutionContainer + maxVol: 30 + caps: OpenContainer + - type: SolutionTransfer + transferAmount: 5 + - type: Item + sprite: Objects/Specific/Chemistry/beaker.rsi + - type: Spillable + +- type: entity + name: bottle + parent: BaseChemistryEmptyBottle + id: ChemistryEmptyBottle01 + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + layers: + - state: bottle-1 + - state: bottle-1-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: bottle-1- + +- type: entity + name: bottle + parent: BaseChemistryEmptyBottle + id: ChemistryEmptyBottle02 + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + layers: + - state: bottle-2 + - state: bottle-2-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: bottle-2- + +- type: entity + name: bottle + parent: BaseChemistryEmptyBottle + id: ChemistryEmptyBottle03 + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + layers: + - state: bottle-3 + - state: bottle-3-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: bottle-3- + +- type: entity + name: bottle + parent: BaseChemistryEmptyBottle + id: ChemistryEmptyBottle04 + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + layers: + - state: bottle-4 + - state: bottle-4-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: bottle-4- diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 3125e36cd0..d9afefcf83 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -1,4 +1,3 @@ -# TODO: Add description (1) - type: entity name: beaker parent: BaseItem @@ -9,11 +8,15 @@ tags: - GlassBeaker - type: Sprite - sprite: Objects/Specific/Chemistry/beakers.rsi - state: beaker + sprite: Objects/Specific/Chemistry/beaker.rsi + netsync: false + layers: + - state: beaker + - state: beaker1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: Item - sprite: Objects/Specific/Chemistry/beakers.rsi - HeldPrefix: beaker + sprite: Objects/Specific/Chemistry/beaker.rsi - type: SolutionContainer maxVol: 50 caps: OpenContainer, FitsInDispenser # can add and remove solutions and fits in the chemmaster. @@ -22,6 +25,11 @@ - type: Spillable - type: Drink isOpen: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: beaker - type: entity name: large beaker @@ -30,17 +38,46 @@ id: LargeBeaker components: - type: Sprite - state: beakerlarge - - type: Item - HeldPrefix: beaker + sprite: Objects/Specific/Chemistry/beaker_large.rsi + layers: + - state: beakerlarge + - state: beakerlarge1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: SolutionContainer maxVol: 100 - caps: OpenContainer, FitsInDispenser - - type: SolutionTransfer - transferAmount: 5.0 - - type: Spillable - - type: Drink - isOpen: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: beakerlarge + +- type: entity + name: cryostasis beaker + parent: Beaker + description: Used to contain chemicals or solutions without reactions. + id: CryostasisBeaker + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi + layers: + - state: beakernoreact + - type: SolutionContainer + maxVol: 60 + canReact: false + +- type: entity + name: bluespace beaker + parent: Beaker + description: Powered by experimental bluespace technology. + id: BluespaceBeaker + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi + layers: + - state: beakerbluespace + - type: SolutionContainer + maxVol: 300 - type: entity name: dropper @@ -50,12 +87,25 @@ components: - type: Sprite sprite: Objects/Specific/Chemistry/dropper.rsi - state: dropper + netsync: false + layers: + - state: dropper + - state: dropper1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: SolutionContainer + caps: OpenContainer maxVol: 5 - type: SolutionTransfer transferAmount: 5.0 - type: Spillable + - type: Item + sprite: Objects/Specific/Chemistry/dropper.rsi + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 1 + fillBaseName: dropper - type: entity name: syringe @@ -65,27 +115,33 @@ components: - type: Sprite sprite: Objects/Specific/Chemistry/syringe.rsi - state: 0 + netsync: false + layers: + - state: syringe1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: syringe_base0 + map: ["enum.SolutionContainerLayers.Base"] - type: SolutionContainer maxVol: 15 - type: Injector injectOnly: false - type: Spillable - -- type: entity - name: bottle - parent: BaseItem - id: bottle - components: - - type: Sprite - sprite: Objects/Specific/Chemistry/bottle.rsi - state: bottle - - type: Drink - - type: SolutionContainer - maxVol: 30 - - type: SolutionTransfer - transferAmount: 5 - - type: Spillable + - type: Item + sprite: Objects/Specific/Chemistry/syringe.rsi + - type: Appearance + visuals: + # this visualizer used for reagent inside + - type: SolutionContainerVisualizer + maxFillLevels: 4 + fillBaseName: syringe + # this one for syrigine itself (plunger) + - type: SolutionContainerVisualizer + maxFillLevels: 4 + fillBaseName: syringe_base + emptySpriteName: syringe_base0 + layer: Base + changeColor: false - type: entity name: pill diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 29f0cd047d..3afb8b22b2 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -1,6 +1,8 @@ - type: latheRecipe id: Beaker - icon: Objects/Specific/Chemistry/beakers.rsi + icon: + sprite: Objects/Specific/Chemistry/beaker.rsi + state: beaker result: Beaker completetime: 500 materials: @@ -8,7 +10,9 @@ - type: latheRecipe id: LargeBeaker - icon: Objects/Specific/Chemistry/beakers.rsi + icon: + sprite: Objects/Specific/Chemistry/beaker_large.rsi + state: beakerlarge result: LargeBeaker completetime: 500 materials: diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beaker.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker1.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker2.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker3.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker4.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker5.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beaker6.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/beaker-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/beaker-inhand-left.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/beaker-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/beaker-inhand-right.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/lid_beaker.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beaker.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/lid_beaker.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json new file mode 100644 index 0000000000..a772e4aa00 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "beaker" + }, + { + "name": "lid_beaker" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "beaker1" + }, + { + "name": "beaker2" + }, + { + "name": "beaker3" + }, + { + "name": "beaker4" + }, + { + "name": "beaker5" + }, + { + "name": "beaker6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakerbluespace.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakerbluespace.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json new file mode 100644 index 0000000000..66713ed66b --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "beakerbluespace", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakernoreact.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/beakernoreact.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakernoreact.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/beakernoreact.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beakernoreact.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/lid_beakernoreact.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beakernoreact.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/lid_beakernoreact.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json new file mode 100644 index 0000000000..2fec1bc53f --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "beakernoreact", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "lid_beakernoreact" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge1.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge2.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge3.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge4.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge5.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/beakerlarge6.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/lid_beakerlarge.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/lid_beakerlarge.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/lid_beakerlarge.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json new file mode 100644 index 0000000000..e56fe43226 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "beakerlarge" + }, + { + "name": "lid_beakerlarge" + }, + { + "name": "beakerlarge1" + }, + { + "name": "beakerlarge2" + }, + { + "name": "beakerlarge3" + }, + { + "name": "beakerlarge4" + }, + { + "name": "beakerlarge5" + }, + { + "name": "beakerlarge6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/meta.json deleted file mode 100644 index 1a6e463f51..0000000000 --- a/Resources/Textures/Objects/Specific/Chemistry/beakers.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"beaker","directions":1,"delays":[[1]]},{"name":"beakerbluespace","directions":1,"delays":[[0.1,0.1]]},{"name":"beakerlarge","directions":1,"delays":[[1]]},{"name":"beakernoreact","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]},{"name":"lid_beaker","directions":1,"delays":[[1]]},{"name":"lid_beakerlarge","directions":1,"delays":[[1]]},{"name":"lid_beakernoreact","directions":1,"delays":[[1]]}]} diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-1.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-2.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-3.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-4.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-5.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-1-6.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-1.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-2.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-3.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-4.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-5.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-2-6.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-2-6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-1.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-2.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-3.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-4.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-5.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-3-6.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-3-6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-1.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-2.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-3.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-4.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-5.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-5.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/bottle-4-6.png rename to Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-4-6.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json index 0b9a21cd05..305333f89c 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json @@ -1 +1 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"bottle","directions":1,"delays":[[1]]},{"name":"bottle-1","directions":1,"delays":[[1]]},{"name":"bottle-2","directions":1,"delays":[[1]]},{"name":"bottle-3","directions":1,"delays":[[1]]},{"name":"bottle-4","directions":1,"delays":[[1]]},{"name":"bottle1","directions":1,"delays":[[1]]},{"name":"bottle10","directions":1,"delays":[[1]]},{"name":"bottle11","directions":1,"delays":[[1]]},{"name":"bottle12","directions":1,"delays":[[1]]},{"name":"bottle13","directions":1,"delays":[[1]]},{"name":"bottle14","directions":1,"delays":[[1]]},{"name":"bottle15","directions":1,"delays":[[1]]},{"name":"bottle16","directions":1,"delays":[[1]]},{"name":"bottle17","directions":1,"delays":[[1]]},{"name":"bottle18","directions":1,"delays":[[1]]},{"name":"bottle19","directions":1,"delays":[[1]]},{"name":"bottle2","directions":1,"delays":[[1]]},{"name":"bottle20","directions":1,"delays":[[1]]},{"name":"bottle3","directions":1,"delays":[[1]]},{"name":"bottle4","directions":1,"delays":[[1]]},{"name":"bottle5","directions":1,"delays":[[1]]},{"name":"bottle6","directions":1,"delays":[[1]]},{"name":"bottle7","directions":1,"delays":[[1]]},{"name":"bottle8","directions":1,"delays":[[1]]},{"name":"bottle9","directions":1,"delays":[[1]]},{"name":"lid_bottle","directions":1,"delays":[[1]]}]} +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"bottle","directions":1,"delays":[[1]]},{"name":"bottle-1","directions":1,"delays":[[1]]},{"name":"bottle-2","directions":1,"delays":[[1]]},{"name":"bottle-3","directions":1,"delays":[[1]]},{"name":"bottle-4","directions":1,"delays":[[1]]},{"name":"bottle1","directions":1,"delays":[[1]]},{"name":"bottle10","directions":1,"delays":[[1]]},{"name":"bottle11","directions":1,"delays":[[1]]},{"name":"bottle12","directions":1,"delays":[[1]]},{"name":"bottle13","directions":1,"delays":[[1]]},{"name":"bottle14","directions":1,"delays":[[1]]},{"name":"bottle15","directions":1,"delays":[[1]]},{"name":"bottle16","directions":1,"delays":[[1]]},{"name":"bottle17","directions":1,"delays":[[1]]},{"name":"bottle18","directions":1,"delays":[[1]]},{"name":"bottle19","directions":1,"delays":[[1]]},{"name":"bottle2","directions":1,"delays":[[1]]},{"name":"bottle20","directions":1,"delays":[[1]]},{"name":"bottle3","directions":1,"delays":[[1]]},{"name":"bottle4","directions":1,"delays":[[1]]},{"name":"bottle5","directions":1,"delays":[[1]]},{"name":"bottle6","directions":1,"delays":[[1]]},{"name":"bottle7","directions":1,"delays":[[1]]},{"name":"bottle8","directions":1,"delays":[[1]]},{"name":"bottle9","directions":1,"delays":[[1]]},{"name":"lid_bottle","directions":1,"delays":[[1]]}, {"name": "bottle-1-1", "delays": [[1.0]]}, {"name": "bottle-1-2", "delays": [[1.0]]}, {"name": "bottle-1-3", "delays": [[1.0]]}, {"name": "bottle-1-4", "delays": [[1.0]]}, {"name": "bottle-1-5", "delays": [[1.0]]}, {"name": "bottle-1-6", "delays": [[1.0]]}, {"name": "bottle-2-1", "delays": [[1.0]]}, {"name": "bottle-2-2", "delays": [[1.0]]}, {"name": "bottle-2-3", "delays": [[1.0]]}, {"name": "bottle-2-4", "delays": [[1.0]]}, {"name": "bottle-2-5", "delays": [[1.0]]}, {"name": "bottle-2-6", "delays": [[1.0]]}, {"name": "bottle-3-1", "delays": [[1.0]]}, {"name": "bottle-3-2", "delays": [[1.0]]}, {"name": "bottle-3-3", "delays": [[1.0]]}, {"name": "bottle-3-4", "delays": [[1.0]]}, {"name": "bottle-3-5", "delays": [[1.0]]}, {"name": "bottle-3-6", "delays": [[1.0]]}, {"name": "bottle-4-1", "delays": [[1.0]]}, {"name": "bottle-4-2", "delays": [[1.0]]}, {"name": "bottle-4-3", "delays": [[1.0]]}, {"name": "bottle-4-4", "delays": [[1.0]]}, {"name": "bottle-4-5", "delays": [[1.0]]}, {"name": "bottle-4-6", "delays": [[1.0]]}]} diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/dropper1.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/dropper1.png rename to Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..52c7c7807f1f1e66d88895a1842274ff37d7dfe8 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8K107!5pK978H@y}5lb ztJy)M^Yha*LoCP zFV(*)b=>gQwy&G=UP?~Tx}Ric>g&=X&--9|&7Joj%XaSgX1w4Q&yUFOkqu8jW*>j| zNiyO0OGkUAzvinQRx)0Zvv|*l=>~+zfrmkVP6xQWm=@&msdV1zd4I~^H>kW%W4ja7 z_1Pfg|2qAtFJ%kX?mxCH^VSvV4bxKJA6S>ysQPa8UdC+Ao7M^cq*EkWz@|Oe@Ds@R b|DTy5Vs6a#v-;~6f`mO?{an^LB{Ts5F6o~B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6d68c573404d78188b0b523eb8fb03d734b930a8 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8K107_~iJ978H@y}5m` z>yUv+>qBAV1)o*+{eQee6fzS+I*>4@ za{RdN(kY8N3S7=y%ZScgx8q^Wx91NhESv74y>acn_ghc@43{;ZUUl}(wy-}E51;OK zSbg;Ryx(uQGIoA&4`Zrt!L%M(B&+DuP5Zq+%AZ%S`M;fM)$b45J<2CnZ+|uY8~c@% zJMH!1$9{{7na+|J~%bMD_=GS2Fo zeGT-UBYXeGjrfPR)Bdfh1Sw}=NQfvYPdL)G=vRTC_Z#*#|0d>^vrppR`1Hp9$r@kM dXR$MU`^NHHMY?l`>yw8d^`5SNF6*2UngGKTN2mY* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9f582ffb210bbef3b459c7f5cc1812adf7bde53c GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4W2HJAr*7p-g4w>RS;nf_#K_~ zKfBtuPQfuXa9I(bMbMYHf@PYFK$Q&AhVDnME3W(TT=$gC+%wN-&sm%6S@pv@$q)pFN#k~CAV7v7{uSxCgdpy@mKHiab e+^xya@FkT|UPZc7=klqIAPt_belF{r5}E*ucSR-u 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 d1df4d8152..3359fc4d09 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -1 +1,52 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "0", "delays": [[1.0]]}, {"name": "1", "delays": [[1.0]]}, {"name": "10", "delays": [[1.0]]}, {"name": "15", "delays": [[1.0]]}, {"name": "5", "delays": [[1.0]]}, {"name": "broken", "delays": [[1.0]]}, {"name": "syringeproj", "delays": [[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/syringe.dmi", + "states": [ + { + "name": "syringe_base0" + }, + { + "name": "syringe_base1" + }, + { + "name": "syringe_base2" + }, + { + "name": "syringe_base3" + }, + { + "name": "syringe_base4" + }, + { + "name": "broken" + }, + { + "name": "syringeproj" + }, + { + "name": "syringe1" + }, + { + "name": "syringe2" + }, + { + "name": "syringe3" + }, + { + "name": "syringe4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe1.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe1.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe2.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe2.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe3.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe3.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe4.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/syringe4.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe4.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base0.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base0.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base1.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/5.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/5.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base2.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/10.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/10.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base3.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/15.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/15.png rename to Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringe_base4.png