From 8f580ecc1bcf7acab88c66514a82544363b23b37 Mon Sep 17 00:00:00 2001 From: Injazz Date: Thu, 9 Apr 2020 16:43:56 +0500 Subject: [PATCH] Visually updates contents of the beaker also adds new syringe sprite from eris also adds colors to ALL reagents --- .../Components/Chemistry/SolutionComponent.cs | 102 +++++++++++------- .../TransformableContainerComponent.cs | 5 + .../Entities/items/Consumables/drinks.yml | 1 + .../Prototypes/Entities/items/chemistry.yml | 10 +- Resources/Prototypes/Reagents/chemicals.yml | 4 + Resources/Prototypes/Reagents/drinks.yml | 22 ++++ Resources/Prototypes/Reagents/elements.yml | 4 + .../Chemistry/fillings.rsi/backpack1.png | Bin 0 -> 127 bytes .../Chemistry/fillings.rsi/backpack2.png | Bin 0 -> 149 bytes .../Chemistry/fillings.rsi/backpackmob1.png | Bin 0 -> 164 bytes .../Chemistry/fillings.rsi/backpackmob2.png | Bin 0 -> 173 bytes .../Chemistry/fillings.rsi/beaker1.png | Bin 0 -> 137 bytes .../Chemistry/fillings.rsi/beaker2.png | Bin 0 -> 145 bytes .../Chemistry/fillings.rsi/beaker3.png | Bin 0 -> 151 bytes .../Chemistry/fillings.rsi/beaker4.png | Bin 0 -> 162 bytes .../Chemistry/fillings.rsi/beaker5.png | Bin 0 -> 160 bytes .../Chemistry/fillings.rsi/beaker6.png | Bin 0 -> 167 bytes .../Chemistry/fillings.rsi/beakerlarge1.png | Bin 0 -> 129 bytes .../Chemistry/fillings.rsi/beakerlarge2.png | Bin 0 -> 146 bytes .../Chemistry/fillings.rsi/beakerlarge3.png | Bin 0 -> 166 bytes .../Chemistry/fillings.rsi/beakerlarge4.png | Bin 0 -> 164 bytes .../Chemistry/fillings.rsi/beakerlarge5.png | Bin 0 -> 171 bytes .../Chemistry/fillings.rsi/beakerlarge6.png | Bin 0 -> 164 bytes .../Chemistry/fillings.rsi/bottle-1-1.png | Bin 0 -> 109 bytes .../Chemistry/fillings.rsi/bottle-1-2.png | Bin 0 -> 121 bytes .../Chemistry/fillings.rsi/bottle-1-3.png | Bin 0 -> 134 bytes .../Chemistry/fillings.rsi/bottle-1-4.png | Bin 0 -> 136 bytes .../Chemistry/fillings.rsi/bottle-1-5.png | Bin 0 -> 136 bytes .../Chemistry/fillings.rsi/bottle-1-6.png | Bin 0 -> 142 bytes .../Chemistry/fillings.rsi/bottle-2-1.png | Bin 0 -> 109 bytes .../Chemistry/fillings.rsi/bottle-2-2.png | Bin 0 -> 126 bytes .../Chemistry/fillings.rsi/bottle-2-3.png | Bin 0 -> 126 bytes .../Chemistry/fillings.rsi/bottle-2-4.png | Bin 0 -> 134 bytes .../Chemistry/fillings.rsi/bottle-2-5.png | Bin 0 -> 153 bytes .../Chemistry/fillings.rsi/bottle-2-6.png | Bin 0 -> 151 bytes .../Chemistry/fillings.rsi/bottle-3-1.png | Bin 0 -> 109 bytes .../Chemistry/fillings.rsi/bottle-3-2.png | Bin 0 -> 101 bytes .../Chemistry/fillings.rsi/bottle-3-3.png | Bin 0 -> 109 bytes .../Chemistry/fillings.rsi/bottle-3-4.png | Bin 0 -> 112 bytes .../Chemistry/fillings.rsi/bottle-3-5.png | Bin 0 -> 127 bytes .../Chemistry/fillings.rsi/bottle-3-6.png | Bin 0 -> 124 bytes .../Chemistry/fillings.rsi/bottle-4-1.png | Bin 0 -> 109 bytes .../Chemistry/fillings.rsi/bottle-4-2.png | Bin 0 -> 125 bytes .../Chemistry/fillings.rsi/bottle-4-3.png | Bin 0 -> 142 bytes .../Chemistry/fillings.rsi/bottle-4-4.png | Bin 0 -> 147 bytes .../Chemistry/fillings.rsi/bottle-4-5.png | Bin 0 -> 146 bytes .../Chemistry/fillings.rsi/bottle-4-6.png | Bin 0 -> 155 bytes .../Chemistry/fillings.rsi/dropper1.png | Bin 0 -> 113 bytes .../Objects/Chemistry/fillings.rsi/glass1.png | Bin 0 -> 131 bytes .../Objects/Chemistry/fillings.rsi/glass2.png | Bin 0 -> 152 bytes .../Objects/Chemistry/fillings.rsi/glass3.png | Bin 0 -> 152 bytes .../Objects/Chemistry/fillings.rsi/glass4.png | Bin 0 -> 164 bytes .../Objects/Chemistry/fillings.rsi/glass5.png | Bin 0 -> 155 bytes .../Objects/Chemistry/fillings.rsi/glass6.png | Bin 0 -> 154 bytes .../Chemistry/fillings.rsi/largebottle1.png | Bin 0 -> 141 bytes .../Chemistry/fillings.rsi/largebottle2.png | Bin 0 -> 168 bytes .../Chemistry/fillings.rsi/largebottle3.png | Bin 0 -> 177 bytes .../Chemistry/fillings.rsi/largebottle4.png | Bin 0 -> 180 bytes .../Chemistry/fillings.rsi/largebottle5.png | Bin 0 -> 193 bytes .../Chemistry/fillings.rsi/largebottle6.png | Bin 0 -> 213 bytes .../Objects/Chemistry/fillings.rsi/meta.json | 1 + .../Chemistry/fillings.rsi/smallbottle1.png | Bin 0 -> 123 bytes .../Chemistry/fillings.rsi/smallbottle2.png | Bin 0 -> 144 bytes .../Chemistry/fillings.rsi/smallbottle3.png | Bin 0 -> 163 bytes .../Chemistry/fillings.rsi/smallbottle4.png | Bin 0 -> 165 bytes .../Chemistry/fillings.rsi/smallbottle5.png | Bin 0 -> 160 bytes .../Chemistry/fillings.rsi/smallbottle6.png | Bin 0 -> 163 bytes .../Chemistry/fillings.rsi/syringe1.png | Bin 0 -> 131 bytes .../Chemistry/fillings.rsi/syringe2.png | Bin 0 -> 131 bytes .../Chemistry/fillings.rsi/syringe3.png | Bin 0 -> 131 bytes .../Chemistry/fillings.rsi/syringe4.png | Bin 0 -> 153 bytes .../Objects/Chemistry/fillings.rsi/vial1.png | Bin 0 -> 102 bytes .../Objects/Chemistry/fillings.rsi/vial2.png | Bin 0 -> 104 bytes .../Objects/Chemistry/fillings.rsi/vial3.png | Bin 0 -> 105 bytes .../Objects/Chemistry/fillings.rsi/vial4.png | Bin 0 -> 106 bytes .../Objects/Chemistry/fillings.rsi/vial5.png | Bin 0 -> 105 bytes .../Objects/Chemistry/fillings.rsi/vial6.png | Bin 0 -> 106 bytes .../Objects/Chemistry/syringe.rsi/0.png | Bin 0 -> 331 bytes .../Objects/Chemistry/syringe.rsi/1.png | Bin 0 -> 331 bytes .../Objects/Chemistry/syringe.rsi/10.png | Bin 0 -> 330 bytes .../Objects/Chemistry/syringe.rsi/15.png | Bin 0 -> 284 bytes .../Objects/Chemistry/syringe.rsi/5.png | Bin 0 -> 338 bytes .../Chemistry/syringe.rsi/autoinjector.png | Bin 0 -> 301 bytes .../Chemistry/syringe.rsi/autoinjector0.png | Bin 0 -> 381 bytes .../syringe.rsi/autoinjector_black.png | Bin 0 -> 304 bytes .../syringe.rsi/autoinjector_black0.png | Bin 0 -> 370 bytes .../syringe.rsi/autoinjector_red.png | Bin 0 -> 304 bytes .../syringe.rsi/autoinjector_red0.png | Bin 0 -> 376 bytes .../Chemistry/syringe.rsi/borghypo.png | Bin 0 -> 587 bytes .../Chemistry/syringe.rsi/borghypo_s.png | Bin 0 -> 517 bytes .../Objects/Chemistry/syringe.rsi/broken.png | Bin 0 -> 341 bytes .../Chemistry/syringe.rsi/combat_hypo.png | Bin 0 -> 665 bytes .../Objects/Chemistry/syringe.rsi/draw.png | Bin 0 -> 181 bytes .../Objects/Chemistry/syringe.rsi/hypo.png | Bin 0 -> 429 bytes .../Objects/Chemistry/syringe.rsi/inject.png | Bin 0 -> 175 bytes .../Objects/Chemistry/syringe.rsi/meta.json | 1 + 96 files changed, 107 insertions(+), 43 deletions(-) create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/backpack1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/backpack2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/backpackmob1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/backpackmob2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beaker6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/dropper1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/glass6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/meta.json create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle6.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/syringe1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/syringe2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/syringe3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/syringe4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial1.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial2.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial3.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial4.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial5.png create mode 100644 Resources/Textures/Objects/Chemistry/fillings.rsi/vial6.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/0.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/1.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/10.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/15.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/5.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector0.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_black.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_black0.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_red.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_red0.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/borghypo.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/borghypo_s.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/broken.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/combat_hypo.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/draw.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/hypo.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/inject.png create mode 100644 Resources/Textures/Objects/Chemistry/syringe.rsi/meta.json diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index 87c15bd061..66843b3b54 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -9,6 +9,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.Chemistry; using Content.Shared.GameObjects; +using Content.Shared.Utility; +using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -38,11 +40,17 @@ namespace Content.Server.GameObjects.Components.Chemistry private AudioSystem _audioSystem; private ChemistrySystem _chemistrySystem; + private SpriteComponent _spriteComponent; + [ViewVariables] protected Solution _containedSolution = new Solution(); protected int _maxVolume; private SolutionCaps _capabilities; - + private string _fillInitState; + private int _fillInitSteps; + private string _fillPathString = "Objects/Chemistry/fillings.rsi"; + private ResourcePath _fillPath; + private SpriteSpecifier _fillSprite; /// /// The maximum volume of the container. /// @@ -108,6 +116,8 @@ namespace Content.Server.GameObjects.Components.Chemistry serializer.DataField(ref _maxVolume, "maxVol", 0); serializer.DataField(ref _containedSolution, "contents", _containedSolution); serializer.DataField(ref _capabilities, "caps", SolutionCaps.None); + serializer.DataField(ref _fillInitState, "fillingState", ""); + serializer.DataField(ref _fillInitSteps, "fillingSteps", 7); } public override void Initialize() @@ -116,23 +126,20 @@ namespace Content.Server.GameObjects.Components.Chemistry _audioSystem = _entitySystemManager.GetEntitySystem(); _chemistrySystem = _entitySystemManager.GetEntitySystem(); _reactions = _prototypeManager.EnumeratePrototypes(); - } protected override void Startup() { base.Startup(); RecalculateColor(); - } - - /// - /// Initializes the SolutionComponent if it doesn't have an owner - /// - public void InitializeFromPrototype() - { - // Because Initialize needs an Owner, Startup isn't called, etc. - IoCManager.InjectDependencies(this); - _reactions = _prototypeManager.EnumeratePrototypes(); + if (!string.IsNullOrEmpty(_fillInitState)) + { + _spriteComponent = Owner.GetComponent(); + _fillPath = new ResourcePath(_fillPathString); + _fillSprite = new SpriteSpecifier.Rsi(_fillPath, _fillInitState + (_fillInitSteps - 1)); + _spriteComponent.AddLayerWithSprite(_fillSprite); + UpdateFillIcon(); + } } /// @@ -147,7 +154,7 @@ namespace Content.Server.GameObjects.Components.Chemistry public void RemoveAllSolution() { _containedSolution.RemoveAllSolution(); - OnSolutionChanged(); + OnSolutionChanged(false); } public bool TryRemoveReagent(string reagentId, int quantity) @@ -155,7 +162,7 @@ namespace Content.Server.GameObjects.Components.Chemistry if (!ContainsReagent(reagentId, out var currentQuantity)) return false; _containedSolution.RemoveReagent(reagentId, quantity); - OnSolutionChanged(); + OnSolutionChanged(false); return true; } @@ -170,21 +177,24 @@ namespace Content.Server.GameObjects.Components.Chemistry return false; _containedSolution.RemoveSolution(quantity); - OnSolutionChanged(); + OnSolutionChanged(false); return true; } public Solution SplitSolution(int quantity) { var solutionSplit = _containedSolution.SplitSolution(quantity); - OnSolutionChanged(); + OnSolutionChanged(false); return solutionSplit; } protected void RecalculateColor() { - if(_containedSolution.TotalVolume == 0) - SubstanceColor = Color.White; + if (_containedSolution.TotalVolume == 0) + { + SubstanceColor = Color.Transparent; + return; + } Color mixColor = default; float runningTotalQuantity = 0; @@ -195,25 +205,15 @@ namespace Content.Server.GameObjects.Components.Chemistry if(!_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto)) continue; - if (mixColor == default) mixColor = proto.SubstanceColor; - - mixColor = BlendRGB(mixColor, proto.SubstanceColor, reagent.Quantity / runningTotalQuantity); + mixColor = Color.InterpolateBetween(mixColor, proto.SubstanceColor, + (1 / runningTotalQuantity) * reagent.Quantity); } + + SubstanceColor = mixColor; } - private Color BlendRGB(Color rgb1, Color rgb2, float amount) - { - var r = (float)Math.Round(rgb1.R + (rgb2.R - rgb1.R) * amount, 1); - var g = (float)Math.Round(rgb1.G + (rgb2.G - rgb1.G) * amount, 1); - var b = (float)Math.Round(rgb1.B + (rgb2.B - rgb1.B) * amount, 1); - var alpha = (float)Math.Round(rgb1.A + (rgb2.A - rgb1.A) * amount, 1); - - return new Color(r, g, b, alpha); - } - - /// /// Transfers solution from the held container to the target container. /// @@ -400,12 +400,9 @@ namespace Content.Server.GameObjects.Components.Chemistry } _containedSolution.AddReagent(reagentId, acceptedQuantity); - if (!skipColor) { - RecalculateColor(); - } if(!skipReactionCheck) CheckForReaction(); - OnSolutionChanged(); + OnSolutionChanged(skipColor); return true; } @@ -415,12 +412,9 @@ namespace Content.Server.GameObjects.Components.Chemistry return false; _containedSolution.AddSolution(solution); - if (!skipColor) { - RecalculateColor(); - } if(!skipReactionCheck) CheckForReaction(); - _chemistrySystem.HandleSolutionChange(Owner); + OnSolutionChanged(skipColor); return true; } @@ -519,6 +513,32 @@ namespace Content.Server.GameObjects.Components.Chemistry return majorReagent.ReagentId; } - protected virtual void OnSolutionChanged() => _chemistrySystem.HandleSolutionChange(Owner); + protected void UpdateFillIcon() + { + if (string.IsNullOrEmpty(_fillInitState)) return; + + var percentage = (double)CurrentVolume / MaxVolume; + var level = ContentHelpers.RoundToLevels(percentage * 100, 100, _fillInitSteps); + + //Transformed glass uses special fancy sprites so we don't bother + if (level == 0 || Owner.TryGetComponent(out var transformableContainerComponent) + && transformableContainerComponent.Transformed) + { + _spriteComponent.LayerSetColor(1, Color.Transparent); + return; + } + _fillSprite = new SpriteSpecifier.Rsi(_fillPath, _fillInitState+level); + _spriteComponent.LayerSetSprite(1, _fillSprite); + _spriteComponent.LayerSetColor(1,SubstanceColor); + } + + protected virtual void OnSolutionChanged(bool skipColor) + { + if (!skipColor) + RecalculateColor(); + + UpdateFillIcon(); + _chemistrySystem.HandleSolutionChange(Owner); + } } } diff --git a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs index 27e2d338bc..380ac24bff 100644 --- a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs @@ -20,6 +20,9 @@ namespace Content.Server.GameObjects.Components.Chemistry public override string Name => "TransformableContainer"; + private bool _transformed = false; + public bool Transformed { get => _transformed; } + private SpriteSpecifier _initialSprite; private string _initialName; private string _initialDescription; @@ -46,6 +49,7 @@ namespace Content.Server.GameObjects.Components.Chemistry public void CancelTransformation() { _currentReagent = null; + _transformed = false; _sprite.LayerSetSprite(0, _initialSprite); Owner.Name = _initialName; //Owner.Description = _initialDescription; @@ -79,6 +83,7 @@ namespace Content.Server.GameObjects.Components.Chemistry Owner.Name = proto.Name + " glass"; //Owner.Description = proto.Description; _currentReagent = proto; + _transformed = true; } } } diff --git a/Resources/Prototypes/Entities/items/Consumables/drinks.yml b/Resources/Prototypes/Entities/items/Consumables/drinks.yml index 6451742780..bb5562b769 100644 --- a/Resources/Prototypes/Entities/items/Consumables/drinks.yml +++ b/Resources/Prototypes/Entities/items/Consumables/drinks.yml @@ -29,6 +29,7 @@ - type: Icon sprite: Objects/Drinks/glass_clear.rsi - type: Solution + fillingState: glass maxVol: 50 caps: 16 - type: Drink diff --git a/Resources/Prototypes/Entities/items/chemistry.yml b/Resources/Prototypes/Entities/items/chemistry.yml index cca0065844..be043ad008 100644 --- a/Resources/Prototypes/Entities/items/chemistry.yml +++ b/Resources/Prototypes/Entities/items/chemistry.yml @@ -9,6 +9,7 @@ - type: Icon texture: Objects/Chemistry/chemicals.rsi/beaker.png - type: Solution + fillingState: beaker maxVol: 50 caps: 27 - type: Pourable @@ -25,6 +26,7 @@ - type: Icon texture: Objects/Chemistry/chemicals.rsi/beakerlarge.png - type: Solution + fillingState: beakerlarge maxVol: 100 caps: 27 - type: Pourable @@ -41,6 +43,8 @@ - type: Icon texture: Objects/Chemistry/chemicals.rsi/dropper.png - type: Solution + fillingState: dropper + fillingSteps: 2 maxVol: 5 caps: 19 - type: Pourable @@ -53,10 +57,12 @@ id: Syringe components: - type: Sprite - texture: Objects/Chemistry/chemicals.rsi/syringeproj.png + texture: Objects/Chemistry/syringe.rsi/0.png - type: Icon - texture: Objects/Chemistry/chemicals.rsi/syringeproj.png + texture: Objects/Chemistry/syringe.rsi/0.png - type: Solution + fillingState: syringe + fillingSteps: 5 maxVol: 15 caps: 19 - type: Injector diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index a5e29b8487..e8d0b18dd3 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -2,6 +2,7 @@ id: chem.Nutriment name: Nutriment desc: Generic nutrition + color: "#664330" metabolism: - !type:DefaultFood rate: 1 @@ -10,11 +11,13 @@ id: chem.H2SO4 name: Sulfuric Acid desc: A highly corrosive, oily, colorless liquid. + color: "#BF8C00" - type: reagent id: chem.H2O name: Water desc: A tasty colorless liquid. + color: "#808080" metabolism: - !type:DefaultDrink rate: 1 @@ -29,6 +32,7 @@ id: chem.Plasma name: Plasma desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways. + color: "#500064" - type: reagent id: chem.Ethanol diff --git a/Resources/Prototypes/Reagents/drinks.yml b/Resources/Prototypes/Reagents/drinks.yml index 7c79af86b5..4cffd3be62 100644 --- a/Resources/Prototypes/Reagents/drinks.yml +++ b/Resources/Prototypes/Reagents/drinks.yml @@ -2,101 +2,118 @@ id: chem.Whiskey name: Whiskey desc: An alcoholic beverage made from fermented grain mash + color: "#664300" spritePath: whiskeyglass.rsi - type: reagent id: chem.Ale name: Ale desc: A type of beer brewed using a warm fermentation method, resulting in a sweet, full-bodied and fruity taste. + color: "#664300" spritePath: aleglass.rsi - type: reagent id: chem.Wine name: Wine desc: An alcoholic drink made from fermented grapes + color: "#7E4043" spritePath: wineglass.rsi - type: reagent id: chem.Beer name: Beer desc: A cold pint of pale lager. + color: "#664300" spritePath: beerglass.rsi - type: reagent id: chem.Vodka name: Vodka desc: The glass contain wodka. Xynta. + color: "#664300" - type: reagent id: chem.Kahlua name: Kahlua desc: A widely known, Mexican coffee-flavoured liqueur. In production since 1936! + color: "#664300" spritePath: kahluaglass.rsi - type: reagent id: chem.Cognac name: Cognac desc: A sweet and strongly alcoholic drink, twice distilled and left to mature for several years. Classy as fornication. + color: "#AB3C05" spritePath: cognacglass.rsi - type: reagent id: chem.ManlyDorf name: Manly Dorf desc: A dwarfy concoction made from ale and beer. Intended for stout dwarves only. + color: "#664300" spritePath: manlydorfglass.rsi - type: reagent id: chem.CubaLibre name: Cuba Libre desc: A classic mix of rum and cola. + color: "#3E1B00" spritePath: cubalibreglass.rsi - type: reagent id: chem.IrishCarBomb name: Irish Car Bomb desc: A troubling mixture of irish cream and ale. + color: "#2E6671" spritePath: irishcarbomb.rsi - type: reagent id: chem.IrishCoffee name: Irish Coffee desc: Coffee served with irish cream. Regular cream just isn't the same! + color: "#664300" spritePath: irishcoffeeglass.rsi - type: reagent id: chem.IrishCream name: Irish Cream desc: Whiskey-imbued cream. What else could you expect from the Irish. + color: "#664300" spritePath: irishcreamglass.rsi - type: reagent id: chem.B52 name: B-52 desc: Coffee, irish cream, and cognac. You will get bombed. + color: "#664300" spritePath: b52glass.rsi - type: reagent id: chem.AtomicBomb name: Atomic Bomb desc: Nuclear proliferation never tasted so good. + color: "#666300" spritePath: atomicbombglass.rsi - type: reagent id: chem.WhiskeyCola name: Whiskey Cola desc: An innocent-looking mixture of cola and whiskey. Delicious. + color: "#3E1B00" spritePath: whiskeycolaglass.rsi - type: reagent id: chem.SyndicateBomb name: Syndicate Bomb desc: Somebody set us up the bomb! + color: "#2E6671" spritePath: syndicatebomb.rsi - type: reagent id: chem.Antifreeze name: Antifreeze desc: The ultimate refreshment. + color: "#664300" spritePath: antifreeze.rsi @@ -104,6 +121,7 @@ id: chem.Cola name: Cola desc: A sweet, carbonated soft drink. Caffeine free. + color: "#100800" metabolism: - !type:DefaultDrink rate: 1 @@ -112,6 +130,7 @@ id: chem.Coffee name: Coffee desc: A drink made from brewed coffee beans. Contains a moderate amount of caffeine. + color: "#664300" metabolism: - !type:DefaultDrink rate: 1 @@ -120,6 +139,7 @@ id: chem.Tea name: Tea desc: A made by boiling leaves of the tea tree, Camellia sinensis. + color: "#101000" metabolism: - !type:DefaultDrink rate: 1 @@ -128,6 +148,7 @@ id: chem.Cream name: Cream desc: The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh? + color: "#DFD7AF" metabolism: - !type:DefaultDrink rate: 1 @@ -136,6 +157,7 @@ id: chem.Milk name: Milk desc: An opaque white liquid produced by the mammary glands of mammals. + color: "#DFDFDF" metabolism: - !type:DefaultDrink rate: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index 0465c71cc1..f60bb120d0 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -2,11 +2,13 @@ id: chem.H name: Hydrogen desc: A light, flammable gas. + color: "#808080" - type: reagent id: chem.O name: Oxygen desc: An oxidizing, colorless gas. + color: "#808080" - type: reagent id: chem.S @@ -36,6 +38,7 @@ id: chem.N name: Nitrogen desc: A colorless, odorless unreactive gas. Highly stable. + color: "#808080" - type: reagent id: chem.Fe @@ -47,6 +50,7 @@ id: chem.F name: Fluorine desc: A highly toxic pale yellow gas. Extremely reactive. + color: "#808080" - type: reagent id: chem.Si diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/backpack1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/backpack1.png new file mode 100644 index 0000000000000000000000000000000000000000..87af9277bb94955ea26ce84437bcc8a785ae9e39 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzH%}MGkcv5P&u!!dO1K1?PUCs< zZ)&pv6Z4J+)b7tiHr%IQ?@~56?n0!xW!K!s<7Pm!7^D{DB Zm;4&SBe3-{>vo`t44$rjF6*2UngAwEDr5iv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/backpack2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/backpack2.png new file mode 100644 index 0000000000000000000000000000000000000000..b77569d5ed307778d7c061d70afecd181c699dc8 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kcv6U2@z4X&WazW?%yXNl8hOf0NbyPZ+g#N= t-J_FdbDucZ_9V)J%k7{B$gm5H46OV44+Z~N69BY_!PC{xWt~$(697Z!FE9WA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/backpackmob1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/backpackmob1.png new file mode 100644 index 0000000000000000000000000000000000000000..1cc753cd78155e4702ce9e446d8fbec896c0e10e GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*`6+rAr*7p-rUIBV8FxT;5=8* z$iXe)f0v_?6Wf9X?n*99Q+A*0{aUrNn1zAiK+Cl4%wMwBzTJB5gr&Pz=Igtg`*^;( zb5&R$5MDav-DP&5i9pcN@%ew9Y5mQ)Z}$J=>o=%n1d1J~;S1Ll^I7{WV>U>Mr>mdK II;Vst00ka8!T8wk$X_HuUelwOfB_e||ovCFiwVV)VADGbd}w kE}pXFxwul&9cBjc*JtDdZ`fuo1FC26boFyt=akR{03I4I#sB~S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker2.png new file mode 100644 index 0000000000000000000000000000000000000000..40209c2f669e0275956f906aefc600b6b2a7517a GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~Nskcv5PFKpy(NZ@F>csb&q z@`nFDJO#=Zl2@zE^7y-V(i6TW7NE*MA)#|;*3L~$3lH6&x=&_ufXj=W7rrg=`mItD sn-;xIRB$o#wm`34wFzrY-!V1_Cm&b*|7vOBSD;P?Pgg&ebxsLQ0JQ`*^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker3.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker3.png new file mode 100644 index 0000000000000000000000000000000000000000..62c4528ae1e6cd2147e1a9b4d9ea41479208dd6e GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI8PVHkcv5PFKpyIV8G*Y(c9yt zpiRT~`Nx>=aJ-v)D&dk!n1aBM^+HT@TU3C`|M+IFy&m;D_WjDoXB8)aZillU+qCoF7v{r%I;R9#urv65_@uq&)ygCPfLa+mUHx3vIVCg!08-;T AqyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker4.png new file mode 100644 index 0000000000000000000000000000000000000000..489b48b78a089734fbe7238fb8189f1a0f27d57d GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJOivfbkcv5PFC64NV8Fo|5M6bK zL-N4i<%JFQP36^G9*V5GU%uSe6x`RPbP0l+XkK=6OL& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker5.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beaker5.png new file mode 100644 index 0000000000000000000000000000000000000000..ca719e883afb18d9c3bd5913c33b4154f8494eb5 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcv5PFD>LfV8G*Y@%}0U z<%)(k_LJQ?@&i@0gATGz`69=)v3L`28W7Z%uV78?u{Q4HU@#JH=vc5-?fdR4O;@F! zd}b(RvfdWr4g18WtBI__u6Ikb7yl{I&Zr+P?4Ng1s0RCNVUW z-QVQ!e&>mAtozgoT%^#rDFPWmR1#>fe5;)9`tJ^z1XB O#SEUVelF{r5}E)*GeLF$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge4.png new file mode 100644 index 0000000000000000000000000000000000000000..c16054a21ac87e9683dc4342f96067a837643148 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJY)==*kcv5PFFA5G81S$h5ViTn zS?loc|1ulJa$8QJ9M2}MN9Qb44sT-+6coHTea6kQ=Q0dyrYeVs?*0C-XI0zxrTiT% z=lZIjFv!oyOgPEXd+*z-#%oa-?cmJ#zp6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge5.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge5.png new file mode 100644 index 0000000000000000000000000000000000000000..363e3a1bfc02caba22ec6151120c13a83587119b GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJB2O2`kcv5PFCFA;FyLXmpkMKZ zLsH?l|7Auar}tGsSs9ADS{?soZ%=6PXHZg7TEw_?if+*KV!o@42dp-?%ye`)XKuXv z%9Z-<`WGIt|7w+se{h*oN4dGm{f3vqQju4-Qyc6LT^F+Wq4KJ6mDSbB9sjb~`wr`c USUtRN544@Z)78&qol`;+0He=8x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge6.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/beakerlarge6.png new file mode 100644 index 0000000000000000000000000000000000000000..64126589dae45658feee3fa70772277a345a6d0b GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJY)==*kcv5PFFSG_FyLT0p!?;8 za81Mi`pNzu?#*Lzyfr~YXUe-ds(Rim9UUDn-fx@wu)~7kz}l9nWbH zbwj#Un{$HrGl!>)c6Sdf_MZ`Js-RRl-yr^AHm}Lf&bo(hehLbjsvk_zlDKASp9Hj) N!PC{xWt~$(6967eJx>4t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-1.png new file mode 100644 index 0000000000000000000000000000000000000000..aaed076693827a751d2ee7294c4553cbc1c3362b GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcv5P&n@I-P~dU7_{dt| zw>H}=2Au$B0giiS4Tl=oT;P(OpGtDnm{ Hr-UW|Ey*E= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-2.png new file mode 100644 index 0000000000000000000000000000000000000000..2243651f0dfb6b6ef9155f2d0ea563bdf4662bbd GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz2TvErkcv5P&lw6b7;rcTM#*wG zIQ{h(ZDL{BuzBk1WA(}JCUtWF6)uZj-`cUmw7A@G^JU8o)=RxY>(4M82;l6=VUKwC SxkwkNgu&C*&t;ucLK6V8IVLaw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-3.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-3.png new file mode 100644 index 0000000000000000000000000000000000000000..a58b538a8125d9e118af76bb1f36a4601981be0a GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzUr!gukcv5P&u!#wFyLXm$Q)SJ z!gJ`KXmbS%zXNO6i$`tG;xb>JW}l?u`RnF3s}-xXjTt49_k8cLux4~mH?e1{XtMhD ht>_c)B$c&07&m)x#axn3JqR?I!PC{xWt~$(69A5eEwlgt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-4.png new file mode 100644 index 0000000000000000000000000000000000000000..a71c865d5835e4ca8cae70fa9372c93ba3ec1e16 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdze@_?3kcv5PFKpy(aNu#i$e+~1 zQ=q(|zO*@|g~y?kS5{Dn_5asty3Hz{m+t5KGl!ZQ3paEyC>Tp7&zZ|utzNRdtwbhY iWSzT}UA@Dk62|qZyqn%K9_RoX&EVbP0l+XkKF0e0( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-6.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-1-6.png new file mode 100644 index 0000000000000000000000000000000000000000..21e86f3d5fb2efe81d0aff8f3c05e6c56fc62e21 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJP)`@fkcv5PFRm7BaNu#h*y^~f zMa1cU7I&rU9;OQ%EH`J&-Fe*gi9Jxujj3-ltJht#v~G(m{NwxMmX*@GQw&SFJ)|bZ p6^5SXHrhO=y42*(FD8Ztb`M{1rk0lJqCg86JYD@<);T3K0RUWLF$Vwu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1ecd5cffc02b42a52c371bfdb2688f3bd876f6 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcv5P&lw6bDDW^J;QMjC zb%NIl29YmS1wH?hjZ_2~7z!4yDw|$@H|4L@#F_fP8ICai+alRCrUEu*LWEI@FsruV)$^5B&<@rzdiB7n3>TH(6>|MJV7!sIw X>4>=U?g=acs$=kU^>bP0l+XkK)kr9u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-4.png new file mode 100644 index 0000000000000000000000000000000000000000..925bf0a4228e604a787bdd582e3ea7c00bc5a099 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzUr!gukcv5PFCF9rO0+)gI9BjK zQtBY1%t1!0GEF6Jr62nje|n&}jD>;WgK+u!%{y1|m23Z86Qr)R@Xl7Iv~SxSzA&Yl g8~kp5!3wlR-b%zh=Z5(k-=_&#n@7Cc)o>!ChhXFE`vne~)_v~S;UpUK;LV5ildU%y>VHH@oW yJXDvN2NafTevfQ4Ja&)i72CR-4yEj`fExJcew3fYz_SEoC4;A{pUXO@geCw$Av9|M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-6.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-2-6.png new file mode 100644 index 0000000000000000000000000000000000000000..d82ea80c1f4acef86f631112c8547d57ac8a3213 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI8PVHkcv5PFKy&)FyL{y$YI#_ zeZH!41w(%UbHK%!P0Czn>qA9Oemr?jf`Q?HN~YJW`1_W3p53kVZdmuQ%k#$B_rK3< zaf;A>;nEViUB@Bxuk?Yr2YzmQ@KSzH}=2Au$B0giiS4Tl=oT;P(OpGtDnm{ Hr-UW|Ey*E= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3704a1363d492ec199155f1c7012a722666cb086 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz9Zwg>kcv5P&lw6b81Nj~!1J(w zb%UIP#*)2#mtLFpFyLX{5b*1N ztgQxn$$ODWD;0X#nq?Uo4&)ns4%xKIbhhz!>!l}?8REoe?C1I%eEd%}P(OpGtDnm{ Hr-UW|GJGP0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-4.png new file mode 100644 index 0000000000000000000000000000000000000000..ee9ef2c432b496290fa6f55c57bfc4521f488da5 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzb59q?kcv5PFBoz$DDW^JQ2O^j z)@}uVLHVk(f}PULjT1N+81zz~tx5@9Y`*;c?}nd2uVVNPWHJZFa(&%ynK&P41cRrm KpUXO@geCx?MkCY! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-5.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-3-5.png new file mode 100644 index 0000000000000000000000000000000000000000..6cb238455c40322d6c4242090d960ff1c597aa97 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzH%}MGkcv5PFBozGC0Y}^-T1Hk zUC#G}F-n=kiFNw_+ahvyB8&_S8rN(TjiaBhS!KMu@9~f9@2ii$IxH}=2Au$B0giiS4Tl=oT;P(OpGtDnm{ Hr-UW|Ey*E= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6e62bae22cada2937cf1f82e86d121327feea7c5 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcv5PFKiS9N;qH4IP35( z-jYMvph5UVY);OyWl<;oH$WHU( V+E{;R%`Tui22WQ%mvv4FO#q4uDEj~a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-3.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-3.png new file mode 100644 index 0000000000000000000000000000000000000000..dd1a77ce62c0d632cfd8d138b35e5206720e7eb1 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJP)`@fkcv5PFYe}TFyLXh$Q+o) z!hh&rDBDR6xdx`diN_p{@4X~{bCcsFm6z|Qc@?I8Gh|~BEIhsa+P7Cs(OVPEe)Mj= qRS^3?d#U(=pKXzUPX1K&WMGfo#K#%l*8dV{0fVQjpUXO@geCxtb~Ic7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/bottle-4-4.png new file mode 100644 index 0000000000000000000000000000000000000000..379c84c5bdbc29c471eaee71651bcc7a2c88a354 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcv5PFKy&)aNuybxPIdv zL5U-Owb>I}qz{~u@YUH7lk_>Bn}w-C#q-knXTbkxyhCB5i%!=wgg${65i3@W7I&bzBXbXdyi?*YKK&GCV$froE44OwYnmI-5(ZCKKbLh*2~7ZE6>upZ-A7EIyVvz@<^3tELKkgT7=;-JW+4;NZ`_|v*ZU&|upD0`Ld+W^DsZ1+* zT`W8&{0UjJ)uDy?z?{vKz8h>}jy;#{uO8&gQu&X%Q~lo FCII@gKs*2d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/dropper1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/dropper1.png new file mode 100644 index 0000000000000000000000000000000000000000..999d333ab8435e12d73dd3a080706d31c840719a GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz3r`ovkcv5P&l(CcDDW^l6a;hr zm@g2-DSF_X;YNcG_Rl7HXEPi~{+kvOT72H<^Nrq)!q1Ehf07xU)7hEso%?+bXa<9) LtDnm{r-UW|wwffO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/glass1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/glass1.png new file mode 100644 index 0000000000000000000000000000000000000000..d9ee584491978f604a738640c9685cbb7204c090 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kcv5P&u!#AV8G!LI3dP} zsk!3+DQSZPx|6hAy_CK6KE>C6I15zzq5Pg?=+&bCe#V!TlHT2un%nUGA?I2KPqmjG d3=A>f8QyVmZfH8Cd;qAF!PC{xWt~$(695HyEW`i+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/glass2.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/glass2.png new file mode 100644 index 0000000000000000000000000000000000000000..6d5dc6152c0e6879dedbd2bc50fa3b6dd6230148 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJcuyC{kcv5PFBtMQIB>8WxayHv z%4`4df4{-?j~ss*zGgmsCd6HC<~(9zLx;=b;gfcJmbta7(k`nG+ynHmGbmTPUd z?yj^gVfgmo?kS#`H>W&i_}O^I#;7=oLvW&hY;G9uM;qJtvp}mDJYD@<);T3K0RW}5 BI~o80 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/glass3.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/glass3.png new file mode 100644 index 0000000000000000000000000000000000000000..229015775568a4103757e776f905ebdaed5e1939 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJcuyC{kcv5PFBtMQIB>8ym~0C( zG1=4n-~2oCVfzov*Rq~gah~-nSJ|E;ps1vzl(kJ^zR~A3tFGH9eOn(X9pvER5}KcH z++6g4>BXVtrCz7_FRLfV8G*YF*`I$ zBxw?-Rl|4ndkUxIUNR}BI@-D#?PS+|`o)n!P*Bjb%%H#O{dcW2-HS$aK?lYv37a!%;h zEz4yBY74e)&q-up{>LYgyoGhjzJ8iwuAh>T@6Nw({Z!_5qp`k}p<-U;ku$Gyo^h5l%n;B0{r@tb Z`LsT#hZnCU{sp>$!PC{xWt~$(699+0M5q7& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/largebottle4.png new file mode 100644 index 0000000000000000000000000000000000000000..61fd62c4dbe566cd2a7df8fcbc530cbfbdcb60ea GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJYEKu(kcv5PFCFAOpuod=;r^v$ zw*m(Dg8!41EgalVFxZOZOLc^JJ=~woRQHwH#l_{zM&(U+qE>6Fmb-^eEY^!=`Xaz! zz$Ii`(>e3%)SG9%hH(f+?)oVi`R@Gt)=y<_HyFzrWPgOSH$0!|erC*;znmFnGH9xvXRxE6hI&9%+8S6O!do^0e0%$DY>$^54F{;7tW rhR?(pc7{tYG)}n2f9v({>E>@d`LlMp|JtRu- z4xR%X@9JNHD4qu=k7W7i7=C1t=qKh~wHEDYuO$2ZU9)mIP{WXRb&NhDQ$dx9F!Rt8U3 KKbLh*2~7aIAUvi3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle4.png new file mode 100644 index 0000000000000000000000000000000000000000..149f77ad9aa36ae9e8f72b40677126122130dc78 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ98VX=kcv5Pubky=>PGC zppk=H!T(_Q7YwqB%oRd^95*}N@ds|cF zHi-W@G{pUd@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle5.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle5.png new file mode 100644 index 0000000000000000000000000000000000000000..78ebfcc3a44c89ba50ea42dd6d0406eff9e994aa GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcv5PuWaOPFc4sNXqGt4 zoWk;Ly~IQI4+h7W~@Ey|9;jSMh~Y; zE1zv(tN5IdUoz|0{rIczJXks(eCAl=%93+BqrPlffC~%58q<#o#}A}hRsgMJ@O1Ta JS?83{1OPyZI}HE; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle6.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/smallbottle6.png new file mode 100644 index 0000000000000000000000000000000000000000..4f392a2288b20f85e6c9a9a667202155b2848de3 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kcv5PukPh-aNuBluzX_* z3tIxq_w_Q3j1rBEYrg8dyO7~?FMQI6$$OX@Iy&skLT4Ej?_Sk?!pbUpoy>PA& zv0LT5mwJZIZe8{39%H%KJVPe80~}ua85r*T{lI@F=Lf%lAmaf(Z*OJQt^o6sKwB9+ MUHx3vIVCg!0OV3RfdBvi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/syringe1.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/syringe1.png new file mode 100644 index 0000000000000000000000000000000000000000..74cfa72ab4831e7514d2eeb8180dae0d69d6f858 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kcv5PFIaOOFyLVc)L#B2 z@_2i6xngXH1XE(%;%C) edB))RYbh`D9%%C) edB))RYbh`D9%s^|QhL?nuNm|X=T83g%r6~iDubu1pUXO@geCwUv@Q?; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/syringe4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/syringe4.png new file mode 100644 index 0000000000000000000000000000000000000000..d8b7e8a701b086365b192639d62dc4ce25b167f9 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1Wy;okcv5PuN>q(puofIuzGhY z`}tWs)Ay|inCI%d@)EtJuRSXOXt5s}`|K75+PYdH`h~aT%`za^B_Zv_vgQu&X%Q~loCIC=e B9nt^* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/vial3.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/vial3.png new file mode 100644 index 0000000000000000000000000000000000000000..997d2dae2f9271d4b600f0ea413ba74155328149 GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz15X#nkcv5P&pGlk81Nj~koBig z)TvRXq49>@)EtJuRSXO_v^>xI>@PdlFUh=`ok36a2;1Mk6Pf#fdKo-j{an^LB{Ts5 DlsF%S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/fillings.rsi/vial4.png b/Resources/Textures/Objects/Chemistry/fillings.rsi/vial4.png new file mode 100644 index 0000000000000000000000000000000000000000..fdd0af6277b8a14252b8c7d6c9e7eacbb8b7a725 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcv5P&pGlk81Nj~koBig z)TvRXq49>@)EtJuRSXQLVZwn1#)e+*@3QRdYftti05vmsy85}Sb4q9e E0ONEaUH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/0.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/0.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf92274d4b7ad8e567d67704611d6289cfab32f GIT binary patch literal 331 zcmV-R0kr;!P)!T( zgw&lEvuwgGixtf<$(ha`pu$Yt!{hl~10R)uSvD;fb0q>?g6&G)gO(OKw?<@2%-zod z7bXs_6asgqv!v0a!U3S!>JqbTDg+JyuD_w!MA}`?qfFoNVHcoYS8+Op03?6AQd3>R dOL(cj)D?jnmNS`0sXoEc&NaGU)CxWv8L z7~J)iX{{5uEDX+0;gJJCw{JY`_`GrBDnE=VYvPyiQe$}9AEBxW0E1Lj0UJRf5}N7; d-oP8xQa3#`lRRa-eTe`7002ovPDHLkV1jz0k5m8v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/10.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/10.png new file mode 100644 index 0000000000000000000000000000000000000000..35e22c64542f76398d4c4148f9e54714b041cfa3 GIT binary patch literal 330 zcmV-Q0k!^#P)e|>Wg zIHsEekS!-<2G!GmzPZPLJ1Y~0lA=bUqJ-i&L-u8SL;%B~V`mudKYBuRdZ0K26y;Z<}aUz6;#KILD;0cfJg%iya+kgXTYNrVx zD)Bsc@Q7CS69;x5J^tUo)Qu*gKvXuoeCi^Df`S|a1B2Ut1qC@+7Nidt&=fvu`N*?; c6pTm!09vzpQTH|xaR2}S07*qoM6N<$f)#0l`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/15.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/15.png new file mode 100644 index 0000000000000000000000000000000000000000..834ae95f9f67cc4e4216a6bbb38dab01db3a127d GIT binary patch literal 284 zcmV+%0ptFOP)e|>Wg zIHsEekS!-<2G!GmzPZPLJ1Y~0lA=bUqJ-i&L-u8SL;%B~V`mudKYBuRdZ1dO*?si* z|EUw^GT2#}Ff3fL0WMD0gxS|W10&uEr30#_fuh0;l6^bi1rbf+XFv<5;RymlQ>b5z zLIF{U@WF#ew6dQ#u>0uo{|2URGzkTws^iP2E;1-6$T2W5xcyg9kYm`edJg?kHchJ0 iQOidy9|fZT2><}8?_osFS+RQn0000UtP)e|>Wg zIHsEekS!-<2G!GmzPZPLJ1Y~0lA=bUqJ-i&L-u8SL;%B~V`mudKYBuRdZ0K26y;={|pREY32xY%V9LB4j?NE z0zy;%Z&*Et8EV1bizjz5lVc890GrQ|*bGod(I)Q)gr@xO>z@G+Zm8ufG*4{kj=<$} znp%p^$Cl!01`JHyFf5{LuCGhPC zgu(KD$mS^yg~4_u0PyXIP#7{}G#ZUY^BX(>^&?va@GCQX00000NkvXXu0mjfF5`cs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector0.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector0.png new file mode 100644 index 0000000000000000000000000000000000000000..c19b268183007cbf9b7daba6536b07e09db1dbae GIT binary patch literal 381 zcmV-@0fPRCP)1u{hYrp~Bp|V15TS*Zii2BmlG3rIiJ7S{4qNHxx{uEo!%zDFqoe}d?3sN{e~ bqtSc;wR3R?Tf>Kf00000NkvXXu0mjfmFJ}d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_black.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/autoinjector_black.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c55e28ca5729a71f26dcf3be6c9372598a0046 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ@18D>Ar*6y6C_v{Cy4Zv9PsE& z3zuH}zw6Yif`4mTPkWm6w+5XSo_tvX1lGk_oj!2jz=!!E?h~FefYdz{4CK)c*Gb+{ z^-|~XDbdqlW$)~3oHj+Kv@=*WxE`H*e7(n|<1V`FclK9LUL&Azn-QqK`L~sgQkP?3 za4KtmM`7!(J$;@G*RTPgGpxHhtQBkG`$c6@3UOaCFh)%H!l|y3dMg%lW9IbI|_BfjO**0yVUbmWd!Jk zNv+-hz;hjdFs%qF0Rz8}=Q=#x-$wOYka~ucfFz4w@%lbW)wi$}|pOtL`ajECZhFuzwgWmT_Qd z0RUH*7eM5IZkXu1B3l9FN>!#ENdFXv#@+!NTiZ5y2%05(MoPt!%9Y8^ulp7h+-O2JCENvIZfo_(>D6Q2ZcThzqbX#6k>W zml+9ybGix4%bh!i0fj>G@5E#_S1Scy&*p>ma5N4*FCqK$cBc!#%5?zzupxv3R4WC) z(QILv1}oRWG7SI@$8+de!VP@#x{B@T8fstsTLBKcwNL}X0W8x9PTgp>(6f2;Ogg#% z?*h&jj&K9Q4zxSnm-&=S#o&8n4!qkh(}0wOz5W1rHW0Z35IjCo2suz&T&Sm}04!%V zn_Ch*jmdo<%~R}p8o8Mbz~+|3^)!(&3WY+U_zfQ5_gJnt8_~1?0000P#oNfW9OD`rI0`1=HL&>=HkcX4{+(^&^CjC4lTyE zSP?ooRRv2NNEED~Tho@vM-{Q0Zzk;=fIVDd7RazLR_D82x~ WR&S||AC@`*0000kdUjOQzyK%XKjn4w2YH!J9FGE+NT~t)4x!BpAAQ_EemuYfDx` z2IJt0*mP0{OKY{n?ULBWDS-^v#d^rjS#n!>({H(dy7ztW-H8JtA|fIpB9@@lYROf_ zUJLp_N-4XBu`2yw1HT4?m5BpD%y02SwJJ9f3G9?g=-W2UTb6}%I!&#Ld_M0R+vS0G z;CI%UREqjt!$2;Vqt?Y+EpIG8Gqmt|_fP_WUaO*S+cSayaMEa?-RUgMWLwwq?&#>A z5davRrSS4#q%=Vlc(VV7vgzA4o@&}muy&_|LZL9Tc|0Cd|LesC^}TxsXDNL8et=p{ zla)&4o(VGWar6T1ZzH^Y_FI|7wyvYuY$~&N*Hsr*du?M6iz_fQx$OVmH4MBGf?5@p zWl_IeE(hNM74>>u0>DnGgfFM3G(Wn!!bT!NtqMQUr40bU&&x}B(rDoQ@o@|QIOlSB z7pL|3`VgjRE+wX7O$gEZn+>LE#^UQk{OF&@-0{DP6P$Bj6Z3aN2q6I=nJtF%MkKSv zo)Dt9nb``g2IrhaH#1xRZ@?9Gs}N)&^z6O3CX(5r(nRRlW9~I%jA;OHdvmR+K4y$z zYEZhDFmyQQ&Q!#in-4wvg$N;>sgN@rlVI3qzp#v)bB8g8$z+1zUHtjOM~`uPbB(Y| Z{|6q|*2fsk`QHEl002ovPDHLkV1lnT6~q7l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/borghypo_s.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/borghypo_s.png new file mode 100644 index 0000000000000000000000000000000000000000..4adc13c448a40cf02e1cbe10c87b518aee3c501b GIT binary patch literal 517 zcmV+g0{Z=lP)BdF16XyFAEr~? z>-TZTW7K|c#+6dowrye+o6V;7?1DkLQ}?Xxt1HvquWsEtITez8JJ8am2-6&cr|$L`@YL_-i$^jR-u$K?d^8kTmx0i zW-|@oj>n{rk7oS$^E17E-^42FM9($=@OiP&Ns{p6{@wx*LTEQl&3x**L{W5>SQR}f zOAM{3Dh@u#!@)ZszmGYzQHY=*@io z{{{-tA`49>TEBgn!o)HNDowP0dyf8wj^lU$4@!Aei;M66G6-~0gsmflhz}z1(Rk~( zKZ%qwJ_yB!z7cHu*`G|K5F&OQhb+r*)AZw8+vY(j+D`oob|uWwd*bsY00000NkvXX Hu0mjfRqp;x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/broken.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..aee78e21a54b12442025cd688b6154d3be0eed0a GIT binary patch literal 341 zcmV-b0jmCqP)Yx-H9HnEHf}2ZEAnxKWb#?FtE{=t6g;o@o;sGqhbND-GOVEnd znpCh4N|Pnu%lrQ%K&gLMMKnOwbc)Bp))vlt3QwB@fFjRMx~h2>_}Pe=VUpu*NY(V@ zlV*U2zgpw#J)mkj^}210N7GCt$z3ykm%{;r>+f-lPMP~5cLL3N4FE8+CUE^ddfj$n zOi0~%F~cNWQ>>_(PS$+!02OB99v=VSHSkdhm|@a-wN!3^bFj7LU1(`L=f=315_9&m zz=er}D}}(V`66jFsc-;jb^62%lL~Ymu||mgb5({6BGH_&U(^CtG& zwjJ8L-EM6BsR+2P8$2o$0NC$zcvG&iY-K|Gm)R zr4#@UmX^3PKTp5k=eg&x8IvQHK(y_??{nn)juU>@8;uDcZPx^Py&m_w-P<{Ym)9wf zxf}p8m*X^bkAwPFGR1}GJa z!P4?FN-0{c)>JQStPmahK1Ii2w^rj_tHmbZ7Ybt}Ow&XuH6}v0MnL1_~34VFrMo{7UZ&muzb;00000NkvXXu0mjfmd!4R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/draw.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/draw.png new file mode 100644 index 0000000000000000000000000000000000000000..1bc212413e4e6d8542a89e38cd4c136a07a2b7ae GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8c!F;kcv6U2@)?G1m`c=xAS;? z&LeUEcL!GYiyUzBaP*J2<=Vew#l)yGV*?Nn3ak(u6{1-oD!M1wNA3KCfK@OyN14*acLhe8pS2u6K!AlTtz)^8?@(wyGbjj2ls!*s^kPHfK zl-450rHRslm~*5K=3P!Q9v!LZNcCNbC6)7-1FY9- z#BrRNkCKG@;Shk~<7+N+Fz5jx1a;dck`jP!6lvAU6+x;n46XOsjPc8hkvZguU{T%q zpPNdH+;iQfPK%^mO$46ns;1*`E+tLJq2+m4mUaSqJ+Rwu18_87mC84I#sC*VKnNTL zfwr*`Knl@lH0Var>LVysD%rDTSw>^1y#wWH6)?-+2;jG*4WN|DPQsM}qzz}%ct!y5 zc@^Ic2F4&-0GmS4@Aug`yEZb{2Dt6@D3?myJdD{sy`trL+M}R-87*$T$yrdS(4Xo9 XF~@m1n0(H*00000NkvXXu0mjf=b6JS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/inject.png b/Resources/Textures/Objects/Chemistry/syringe.rsi/inject.png new file mode 100644 index 0000000000000000000000000000000000000000..e03bd1d144af40012c4f254d36c4f68979bc594c GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGEW!Bkcv6U2@*sT|I1n1fA8(8=DgY`Uo-9SBZ)N0yS05eihFgA&*Z57^-9vK zOG;92-kpOUzopr00A{XiU0rr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Chemistry/syringe.rsi/meta.json new file mode 100644 index 0000000000..a07d2954f6 --- /dev/null +++ b/Resources/Textures/Objects/Chemistry/syringe.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "0", "directions": 1, "delays": [[1.0]]}, {"name": "1", "directions": 1, "delays": [[1.0]]}, {"name": "10", "directions": 1, "delays": [[1.0]]}, {"name": "15", "directions": 1, "delays": [[1.0]]}, {"name": "5", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector0", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector_black", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector_black0", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector_red", "directions": 1, "delays": [[1.0]]}, {"name": "autoinjector_red0", "directions": 1, "delays": [[1.0]]}, {"name": "borghypo", "directions": 1, "delays": [[1.0]]}, {"name": "borghypo_s", "directions": 1, "delays": [[1.0]]}, {"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "combat_hypo", "directions": 1, "delays": [[1.0]]}, {"name": "draw", "directions": 1, "delays": [[1.0]]}, {"name": "hypo", "directions": 1, "delays": [[1.0]]}, {"name": "inject", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file