From 8efb70eca267fa93d1dbf0d43cc500b20d3f47b3 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 22 Dec 2024 09:48:40 -0800 Subject: [PATCH 1/8] Doubles default jug storage. --- .../Objects/Specific/chemical-containers.yml | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index d47d6899136..510adf8b4de 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -7,7 +7,7 @@ - type: SolutionContainerManager solutions: beaker: - maxVol: 200 + maxVol: 400 # 400>200 Frontier - type: Sprite sprite: Objects/Specific/Chemistry/jug.rsi layers: @@ -99,7 +99,7 @@ beaker: reagents: - ReagentId: Carbon - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -114,7 +114,7 @@ beaker: reagents: - ReagentId: Iodine - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -129,7 +129,7 @@ beaker: reagents: - ReagentId: Fluorine - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -144,7 +144,7 @@ beaker: reagents: - ReagentId: Chlorine - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -159,7 +159,7 @@ beaker: reagents: - ReagentId: Aluminium - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -174,7 +174,7 @@ beaker: reagents: - ReagentId: Phosphorus - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -189,7 +189,7 @@ beaker: reagents: - ReagentId: Sulfur - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -204,7 +204,7 @@ beaker: reagents: - ReagentId: Silicon - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -219,7 +219,7 @@ beaker: reagents: - ReagentId: Hydrogen - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -234,7 +234,7 @@ beaker: reagents: - ReagentId: Lithium - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -249,7 +249,7 @@ beaker: reagents: - ReagentId: Sodium - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -264,7 +264,7 @@ beaker: reagents: - ReagentId: Potassium - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -279,7 +279,7 @@ beaker: reagents: - ReagentId: Radium - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -294,7 +294,7 @@ beaker: reagents: - ReagentId: Iron - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -309,7 +309,7 @@ beaker: reagents: - ReagentId: Copper - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -324,7 +324,7 @@ beaker: reagents: - ReagentId: Gold - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -339,7 +339,7 @@ beaker: reagents: - ReagentId: Mercury - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -354,7 +354,7 @@ beaker: reagents: - ReagentId: Silver - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -369,7 +369,7 @@ beaker: reagents: - ReagentId: Ethanol - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -384,7 +384,7 @@ beaker: reagents: - ReagentId: Sugar - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -399,7 +399,7 @@ beaker: reagents: - ReagentId: Nitrogen - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -414,7 +414,7 @@ beaker: reagents: - ReagentId: Oxygen - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -429,7 +429,7 @@ beaker: reagents: - ReagentId: PlantBGone - Quantity: 200 + Quantity: 400 # Frontier - type: entity parent: Jug @@ -444,4 +444,4 @@ beaker: reagents: - ReagentId: WeldingFuel - Quantity: 200 + Quantity: 400 # Frontier From 6f63585bf4ecbb04642320ca3072035a670a5073 Mon Sep 17 00:00:00 2001 From: dustylens Date: Wed, 1 Jan 2025 09:41:58 -0800 Subject: [PATCH 2/8] Slight change --- .../Catalog/ReagentDispensers/chemical.yml | 22 +- .../Objects/Specific/chemical-containers.yml | 50 ++--- .../Entities/Structures/Machines/lathe.yml | 2 + .../Prototypes/Research/civilianservices.yml | 1 + .../Objects/Specific/chemical-containers.yml | 207 ++++++++++++++++++ .../_NF/Recipes/Lathes/chemistry.yml | 9 + .../reinforced_jug.rsi/equipped-BACKPACK.png | Bin 0 -> 1375 bytes .../Chemistry/reinforced_jug.rsi/fill-1.png | Bin 0 -> 130 bytes .../Chemistry/reinforced_jug.rsi/fill-2.png | Bin 0 -> 141 bytes .../Chemistry/reinforced_jug.rsi/fill-3.png | Bin 0 -> 142 bytes .../Chemistry/reinforced_jug.rsi/fill-4.png | Bin 0 -> 143 bytes .../Chemistry/reinforced_jug.rsi/fill-5.png | Bin 0 -> 144 bytes .../Chemistry/reinforced_jug.rsi/fill-6.png | Bin 0 -> 155 bytes .../Chemistry/reinforced_jug.rsi/icon.png | Bin 0 -> 910 bytes .../Chemistry/reinforced_jug.rsi/inhand-1.png | Bin 0 -> 150 bytes .../Chemistry/reinforced_jug.rsi/inhand-2.png | Bin 0 -> 192 bytes .../Chemistry/reinforced_jug.rsi/inhand-3.png | Bin 0 -> 207 bytes .../Chemistry/reinforced_jug.rsi/inhand-4.png | Bin 0 -> 219 bytes .../reinforced_jug.rsi/inhand-left-1.png | Bin 0 -> 150 bytes .../reinforced_jug.rsi/inhand-left-2.png | Bin 0 -> 192 bytes .../reinforced_jug.rsi/inhand-left-3.png | Bin 0 -> 207 bytes .../reinforced_jug.rsi/inhand-left-4.png | Bin 0 -> 219 bytes .../reinforced_jug.rsi/inhand-left-fill-1.png | Bin 0 -> 139 bytes .../reinforced_jug.rsi/inhand-left-fill-2.png | Bin 0 -> 150 bytes .../reinforced_jug.rsi/inhand-left-fill-3.png | Bin 0 -> 192 bytes .../reinforced_jug.rsi/inhand-left-fill-4.png | Bin 0 -> 207 bytes .../reinforced_jug.rsi/inhand-left-fill-5.png | Bin 0 -> 219 bytes .../reinforced_jug.rsi/inhand-left.png | Bin 0 -> 621 bytes .../reinforced_jug.rsi/inhand-right-1 - .png | Bin 0 -> 150 bytes .../reinforced_jug.rsi/inhand-right-2 - .png | Bin 0 -> 192 bytes .../reinforced_jug.rsi/inhand-right-3 - .png | Bin 0 -> 207 bytes .../reinforced_jug.rsi/inhand-right-4 - .png | Bin 0 -> 219 bytes .../inhand-right-fill-1.png | Bin 0 -> 139 bytes .../inhand-right-fill-2.png | Bin 0 -> 150 bytes .../inhand-right-fill-3.png | Bin 0 -> 192 bytes .../inhand-right-fill-4.png | Bin 0 -> 207 bytes .../inhand-right-fill-5.png | Bin 0 -> 219 bytes .../reinforced_jug.rsi/inhand-right.png | Bin 0 -> 621 bytes .../Chemistry/reinforced_jug.rsi/jug1.png | Bin 0 -> 130 bytes .../Chemistry/reinforced_jug.rsi/jug2.png | Bin 0 -> 141 bytes .../Chemistry/reinforced_jug.rsi/jug3.png | Bin 0 -> 142 bytes .../Chemistry/reinforced_jug.rsi/jug4.png | Bin 0 -> 143 bytes .../Chemistry/reinforced_jug.rsi/jug5.png | Bin 0 -> 144 bytes .../Chemistry/reinforced_jug.rsi/jug6.png | Bin 0 -> 155 bytes .../Chemistry/reinforced_jug.rsi/meta.json | 83 +++++++ .../Chemistry/reinforced_jug.rsi/stopper.png | Bin 0 -> 107 bytes 46 files changed, 338 insertions(+), 36 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-3 - .png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml index 2b0fdfae6ce..ba0b4cc565e 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml @@ -2,23 +2,23 @@ id: ChemDispenserStandardInventory inventory: - JugAluminium - - JugCarbon - - JugChlorine + - ReinforcedJugCarbon # Frontier + - JugChlorine - JugCopper - - JugEthanol + - JugEthanol # Frontier - JugFluorine - - JugSugar - - JugHydrogen + - ReinforcedJugSugar # Frontier + - ReinforcedJugHydrogen # Frontier - JugIodine - JugIron - - JugLithium + - JugLithium # Frontier - JugMercury - - JugNitrogen - - JugOxygen - - JugPhosphorus - - JugPotassium + - ReinforcedJugNitrogen # Frontier + - ReinforcedJugOxygen # Frontier + - ReinforcedJugPhosphorus # Frontier + - ReinforcedJugPotassium # Frontier - JugRadium - - JugSilicon + - ReinforcedJugSilicon # Frontier - JugSodium - JugSulfur diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 510adf8b4de..d47d6899136 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -7,7 +7,7 @@ - type: SolutionContainerManager solutions: beaker: - maxVol: 400 # 400>200 Frontier + maxVol: 200 - type: Sprite sprite: Objects/Specific/Chemistry/jug.rsi layers: @@ -99,7 +99,7 @@ beaker: reagents: - ReagentId: Carbon - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -114,7 +114,7 @@ beaker: reagents: - ReagentId: Iodine - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -129,7 +129,7 @@ beaker: reagents: - ReagentId: Fluorine - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -144,7 +144,7 @@ beaker: reagents: - ReagentId: Chlorine - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -159,7 +159,7 @@ beaker: reagents: - ReagentId: Aluminium - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -174,7 +174,7 @@ beaker: reagents: - ReagentId: Phosphorus - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -189,7 +189,7 @@ beaker: reagents: - ReagentId: Sulfur - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -204,7 +204,7 @@ beaker: reagents: - ReagentId: Silicon - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -219,7 +219,7 @@ beaker: reagents: - ReagentId: Hydrogen - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -234,7 +234,7 @@ beaker: reagents: - ReagentId: Lithium - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -249,7 +249,7 @@ beaker: reagents: - ReagentId: Sodium - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -264,7 +264,7 @@ beaker: reagents: - ReagentId: Potassium - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -279,7 +279,7 @@ beaker: reagents: - ReagentId: Radium - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -294,7 +294,7 @@ beaker: reagents: - ReagentId: Iron - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -309,7 +309,7 @@ beaker: reagents: - ReagentId: Copper - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -324,7 +324,7 @@ beaker: reagents: - ReagentId: Gold - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -339,7 +339,7 @@ beaker: reagents: - ReagentId: Mercury - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -354,7 +354,7 @@ beaker: reagents: - ReagentId: Silver - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -369,7 +369,7 @@ beaker: reagents: - ReagentId: Ethanol - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -384,7 +384,7 @@ beaker: reagents: - ReagentId: Sugar - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -399,7 +399,7 @@ beaker: reagents: - ReagentId: Nitrogen - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -414,7 +414,7 @@ beaker: reagents: - ReagentId: Oxygen - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -429,7 +429,7 @@ beaker: reagents: - ReagentId: PlantBGone - Quantity: 400 # Frontier + Quantity: 200 - type: entity parent: Jug @@ -444,4 +444,4 @@ beaker: reagents: - ReagentId: WeldingFuel - Quantity: 400 # Frontier + Quantity: 200 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b88f4904de5..1baddb369ef 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -363,6 +363,7 @@ - JugBluespace # Frontier - VialBluespace # Frontier - Jug + - ReinforcedJug # Frontier - WeaponCrusher - WeaponCrusherDagger - WeaponCrusherGlaive @@ -1041,6 +1042,7 @@ - CryostasisBeaker - BluespaceBeaker - JugBluespace # Frontier + - ReinforcedJug # Frontier - SyringeBluespace - Jug - SyringeCryostasis diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index d1b7f7b216f..6217d3f46c9 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -179,6 +179,7 @@ - AdvMopItem - MegaSprayBottle - NFBlueprintAdvMopItem # Frontier + - ReinforcedJug # Frontier- - type: technology id: HONKMech diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml index 7bb29f92987..1f325cf567a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -1,3 +1,58 @@ +- type: entity + name: reinforced jug + parent: Jug + id: ReinforcedJug + description: The sterile plastic of this jug has been reinforced with a metallic shell allowing it to contain an impressive amount of liquid. + components: + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 400 + - type: Sprite + sprite: _NF/Objects/Specific/Chemistry/reinforced_jug.rsi + layers: + - state: icon + - state: stopper + visible: true + map: ["enum.OpenableVisuals.Layer"] + - state: jug1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: Item + size: Large + shape: + - 0,0,2,2 + sprite: _NF/Objects/Specific/Chemistry/reinforced_jug.rsi + inhandVisuals: + left: + - state: inhand-left + - state: inhand-left-fill-1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + right: + - state: inhand-right + - state: inhand-right-fill-1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: Openable + sound: + collection: bottleOpenSounds + closeable: true + closeSound: + collection: bottleCloseSounds + - type: StaticPrice + price: 30 # Consistent with BaseBeakerMetallic + - type: Destructible # Hacky - takes damage, but shouldn't be destructible + thresholds: [] + - type: MultiHandedItem + - type: ItemSlots + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: { visible: false } + False: { visible: true } + - type: entity name: bluespace jug parent: Jug @@ -243,3 +298,155 @@ count: 1 - type: StaticPrice vendPrice: 0 + +#Reinforced Jug chem fills. + +- type: entity + parent: ReinforcedJug + suffix: aluminum + id: ReinforcedJugAluminum + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-aluminum + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Aluminum + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: carbon + id: ReinforcedJugCarbon + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-carbon + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Carbon + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: chlorine + id: ReinforcedJugChlorine + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-chlorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Chlorine + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: copper + id: ReinforcedJugCopper + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-copper + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Copper + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: ethanol + id: ReinforcedJugEthanol + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-ethanol + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Ethanol + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: fluorine + id: ReinforcedJugFluorine + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-fluorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Fluorine + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: sugar + id: ReinforcedJugSugar + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-sugar + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Sugar + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: hydrogen + id: ReinforcedJugHydrogen + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-hydrogen + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Hydrogen + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: chlorine + id: ReinforcedJugChlorine + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-chlorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Chlorine + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: chlorine + id: ReinforcedJugChlorine + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-chlorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Chlorine + Quantity: 400 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml index 7476b47670f..7cf219f24fd 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml @@ -28,3 +28,12 @@ materials: Plastic: 25 Steel: 25 + +- type: latheRecipe + id: ReinforcedJug + result: ReinforcedJug + completetime: 6 + materials: + Plastic: 400 + Steel: 100 + Silver: 25 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c61b4356e640ef7fee64b215ab887c1a09ee7b GIT binary patch literal 1375 zcmV-l1)%zgP)4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXx&xPg~000A)NklF|9LK+!B)HnP1!bkU zUJWD)M59B|X$k94^bdluG=^YLAtpj$Ah9f+mSm}=JV^vbCF@>_BqGE^gwR|fV(?EY z<~Z(J+Z0WQdei=yr~A@v9r}G>4)gy0-gn--H@xov1VIo4K@bE%5dR@XB86pHHpAgC zx6VrWt3{S&)4g+#b>G%<6nE}DvF`P$HxTW=Sfq1RRhKQJsw!kzHbnvu>0eP4sLC)J zo9a

&4UIG1S(2(b!ZERT+k&D8l^`UrWl%U2uCm&^0YBUDq_c zdq0QjZP~)Cgs=dGWO950-JKnl2<&ouJctfNu#gmg`y3;{?CczNRaXIkHE4FR8L@Lm zB_^ikgxW1x^GNeZBC!Mj*i~JH$?*v*oeA?dI7$Haq!Wpyv_Ugrran#!w<-JzG@ob{ zN?%LZ>aS}W5{V`2V#2uGTZP*c+Oq2E>P$sZxOG;_Uk&Hwc5~!K6oJrf07%;jm@pmw zi`akY7$UcBBch9034quiS)^;vX1$J;pUmZ4-Nf zy=KF{I?T++(@tNT4HqWudD!$^At7@4kdX<0e94O;x|hVx0gRcrLCnR{%BxGM(5|3cUmHVqozy*I57jja#4Z z4H~~IJ8%)S2A)IgwgSZCabTkh!J7dj4CjfEYM?fsXho&F6yJ<5wq=)}0UKS=XC}A{ z;CdzXKZ4|!IHvWl+_JU;+zkhdlF6jmcHxxmUs>y&bPN3hqK^i-uJN*qn4J^5-W^yc h#!L_dK@db?_z90_s>VKv1ib(N002ovPDHLkV1oF6d+h)K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..70ee5af31ad8967bda33f66f4270da6b061e0463 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ z&u!#oP~c%cs9@Ohef~-1CGD&lO0Fg!!mZ1cfT|ewXc&i^TIcuN)Vsf3-lEr2>TcWv Zd1;Pn-U+Xhluv?Gc)I$ztaD0e0svsQCBy&# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6fee971564398b8cd7deae80aeaf6cfdd31b325f GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BNy6?Q0o<3iXS=&zvi3edvtN-grHM*3J_< mnF4Qo8bg=d#Wzp$Pz=dNC9L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..e32d867059ab0665470942cd74fe19bb0c483b34 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP3=dr2*=^pO>^@`W((kAFT@saw o-Zg6Uu&py+uxf9W_>bdEh60ico|%Ze0-DL->FVdQ&MBb@0OKq%g#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..6d75661bf585901f657fadd1481452a917e74c68 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP40}%8O)o2Z!(qJnOWn^#4Ih_t owgRme8F*vz9YU+W>V4>Eef&v&g{xwp3eZpnPgg&ebxsLQ023oIvH$=8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6d82670de840d7a13cda6befa82bc741c23c75 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP4dOe0pE=hjo0vB3p1!?6Yv+lb q?28Pf7BEWfxYw}i+pE|I^4zO^RX6afi4+1&W$<+Mb6Mw<&;$TU?J?m1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png new file mode 100644 index 0000000000000000000000000000000000000000..d8ffa665b190d03213f17656b7df20bd097bc9f5 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY-_ zuWaN!;K1P==zdCq=fFSXN|s+s{52*7tojqKBpadU$Heg9ec#)rRlDXH-#&Hb;=5w$ z1K+a61RsBY&2V?4-j#I5j0QF!+Le4cU!p3xO6ec)I$ztaD0e0szzm BILrV5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eb54ff0dcd8999134efb678cbb9275cc3cf1bc32 GIT binary patch literal 910 zcmV;919AL`P)Px&NJ&INR9J=WmRo2PR~*KFGqW?NHhw`iMKrh%E)0r}$%WKzRG6A5&1T@V7w#&t1`aZ*{CMRTJJ5Bbxp z?zXG@XLsG|ZveP@<0FRw94K|p*-Hcbx^MS;wR{t(jcM%Iww=BM zy3jTD1EMuGY+5?Yl|;dwxGs4+B|C+J_ic>7`Y;3e zTo!;_W`w%B7_uy3Sq_pU(y{StPM*2Ni92b5cglTpTLXXI_1igw0V8iv8`FT&5oAWw zD5X0F(}By^$_X?eiNagenY^9y3>Az##&~Y(2B4BaeQXAfZ2}-kBK4BU`ZZtBe_?9xe;8kSu|jriBVmSqX+_)U1_ zDCm0i77R3C**4FfJ*T;O4r7@Vs@8xkgPu+M)Muje+YmJ@Z(QEc;ol~8LFB<*S4MVgtfky(xbF} kZAYj_X&B*YOyhrp*L!$nmR9>wIRF3v07*qoM6N<$f(uxyxBvhE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d553950cb3e8ff5b93eb5a69c64de653620bc20e GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png new file mode 100644 index 0000000000000000000000000000000000000000..897c8a801def21a5eff5a608734c56c5e1971e0c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d553950cb3e8ff5b93eb5a69c64de653620bc20e GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png new file mode 100644 index 0000000000000000000000000000000000000000..897c8a801def21a5eff5a608734c56c5e1971e0c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..16041d8f718bd0e401ce8cc2b8e77277fd641a74 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Ts>VJLn`LH zy=5rKV8FqA;2Q70s}GjV&1z^~`9FACLch-emFn{Jb(hQRGboFyt=akR{0IBXPeE@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..897c8a801def21a5eff5a608734c56c5e1971e0c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6d41cb381a4d4c29360c84c450d71e6510ee8b GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U{d#VaSW-L z^LCb_w{)OLtN$gF#vZd2#a+egA1pe$uIaynd1y)Ws(?G)T^CvvR9VcMlq5vTSp{8A z$_p%gaHuu<<)Wabi8CbTcV1p%p{K&ED)z~$cz(+qey4k9W>?;^ywm9OjG05RMZk$e z@vVo$_m-PSOPAZt`(@G8ySBDm@8{Fa->UR`!w!0{G);f-mf@cb%f#J#O23zX-{Yw9 zqha%9W1TZT+e0{f#dlAMD!#Y>wez|K0^P@@pLriuy7HEn>-wstP8^xCIY%$>Duip8 zotgXpMDm9H+^yM9!*ks@Udi0abTzc!-q5|K7l>_Ui9_0Nmg!6H*IiflyUdugZaLGoTF4!3@3xnC$J#)`4;+ZO9s2(tdRj4GvTJ(Isxp^R*sf{$WYxKh!FEme zx+gvt6DVQx`N0uYcc9qAidn6O#a~w8CC`jcf;RV=CY@{Gls{O^0HYV3YhaW=7!2ZT z${(E1H=&4)=Lg3;rU^hJesb)y;Rc%UMGzEuhH{LN9CJUM=UFHTOg{{su6{1-oD!M< Dgw6_- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png new file mode 100644 index 0000000000000000000000000000000000000000..d553950cb3e8ff5b93eb5a69c64de653620bc20e GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png new file mode 100644 index 0000000000000000000000000000000000000000..897c8a801def21a5eff5a608734c56c5e1971e0c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png new file mode 100644 index 0000000000000000000000000000000000000000..a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..16041d8f718bd0e401ce8cc2b8e77277fd641a74 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Ts>VJLn`LH zy=5rKV8FqA;2Q70s}GjV&1z^~`9FACLch-emFn{Jb(hQRGboFyt=akR{0IBXPeE@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..897c8a801def21a5eff5a608734c56c5e1971e0c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6d41cb381a4d4c29360c84c450d71e6510ee8b GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U{d#VaSW-L z^LCb_w{)OLtN$gF#vZd2#a+egA1pe$uIaynd1y)Ws(?G)T^CvvR9VcMlq5vTSp{8A z$_p%gaHuu<<)Wabi8CbTcV1p%p{K&ED)z~$cz(+qey4k9W>?;^ywm9OjG05RMZk$e z@vVo$_m-PSOPAZt`(@G8ySBDm@8{Fa->UR`!w!0{G);f-mf@cb%f#J#O23zX-{Yw9 zqha%9W1TZT+e0{f#dlAMD!#Y>wez|K0^P@@pLriuy7HEn>-wstP8^xCIY%$>Duip8 zotgXpMDm9H+^yM9!*ks@Udi0abTzc!-q5|K7l>_Ui9_0Nmg!6H*IiflyUdugZaLGoTF4!3@3xnC$J#)`4;+ZO9s2(tdRj4GvTJ(Isxp^R*sf{$WYxKh!FEme zx+gvt6DVQx`N0uYcc9qAidn6O#a~w8CC`jcf;RV=CY@{Gls{O^0HYV3YhaW=7!2ZT z${(E1H=&4)=Lg3;rU^hJesb)y;Rc%UMGzEuhH{LN9CJUM=UFHTOg{{su6{1-oD!M< Dgw6_- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png new file mode 100644 index 0000000000000000000000000000000000000000..70ee5af31ad8967bda33f66f4270da6b061e0463 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ z&u!#oP~c%cs9@Ohef~-1CGD&lO0Fg!!mZ1cfT|ewXc&i^TIcuN)Vsf3-lEr2>TcWv Zd1;Pn-U+Xhluv?Gc)I$ztaD0e0svsQCBy&# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png new file mode 100644 index 0000000000000000000000000000000000000000..6fee971564398b8cd7deae80aeaf6cfdd31b325f GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BNy6?Q0o<3iXS=&zvi3edvtN-grHM*3J_< mnF4Qo8bg=d#Wzp$Pz=dNC9L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png new file mode 100644 index 0000000000000000000000000000000000000000..e32d867059ab0665470942cd74fe19bb0c483b34 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP3=dr2*=^pO>^@`W((kAFT@saw o-Zg6Uu&py+uxf9W_>bdEh60ico|%Ze0-DL->FVdQ&MBb@0OKq%g#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png new file mode 100644 index 0000000000000000000000000000000000000000..6d75661bf585901f657fadd1481452a917e74c68 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP40}%8O)o2Z!(qJnOWn^#4Ih_t owgRme8F*vz9YU+W>V4>Eef&v&g{xwp3eZpnPgg&ebxsLQ023oIvH$=8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6d82670de840d7a13cda6befa82bc741c23c75 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP4dOe0pE=hjo0vB3p1!?6Yv+lb q?28Pf7BEWfxYw}i+pE|I^4zO^RX6afi4+1&W$<+Mb6Mw<&;$TU?J?m1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png new file mode 100644 index 0000000000000000000000000000000000000000..d8ffa665b190d03213f17656b7df20bd097bc9f5 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY-_ zuWaN!;K1P==zdCq=fFSXN|s+s{52*7tojqKBpadU$Heg9ec#)rRlDXH-#&Hb;=5w$ z1K+a61RsBY&2V?4-j#I5j0QF!+Le4cU!p3xO6ec)I$ztaD0e0szzm BILrV5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json new file mode 100644 index 00000000000..0c3d1c58266 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "edited by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "jug1" + }, + { + "name": "jug2" + }, + { + "name": "jug3" + }, + { + "name": "jug4" + }, + { + "name": "jug5" + }, + { + "name": "jug6" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-left-fill-4", + "directions": 4 + }, + { + "name": "inhand-left-fill-5", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 + }, + { + "name": "inhand-right-fill-4", + "directions": 4 + }, + { + "name": "inhand-right-fill-5", + "directions": 4 + }, + { + "name": "stopper" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png new file mode 100644 index 0000000000000000000000000000000000000000..8c7ab129438bec29fd22ae497b597578d304ea7e GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_ z&nYr8FmNz$FkiOcN>N~j?m?l3X1`mW`{fxJ4xD6a&t$pn+uiaLsDZ)L)z4*}Q$iB} DGTt4f literal 0 HcmV?d00001 From 5c06a8f0cbb23344155bf55577ffebbfc4ac07e8 Mon Sep 17 00:00:00 2001 From: dustylens Date: Wed, 1 Jan 2025 09:50:51 -0800 Subject: [PATCH 3/8] Sprite cleanup. Whups. --- .../reinforced_jug.rsi/equipped-BACKPACK.png | Bin 1375 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-1.png | Bin 130 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-2.png | Bin 141 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-3.png | Bin 142 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-4.png | Bin 143 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-5.png | Bin 144 -> 0 bytes .../Chemistry/reinforced_jug.rsi/fill-6.png | Bin 155 -> 0 bytes .../Chemistry/reinforced_jug.rsi/inhand-1.png | Bin 150 -> 0 bytes .../Chemistry/reinforced_jug.rsi/inhand-2.png | Bin 192 -> 0 bytes .../Chemistry/reinforced_jug.rsi/inhand-3.png | Bin 207 -> 0 bytes .../Chemistry/reinforced_jug.rsi/inhand-4.png | Bin 219 -> 0 bytes .../reinforced_jug.rsi/inhand-right-1 - .png | Bin 150 -> 0 bytes .../reinforced_jug.rsi/inhand-right-2 - .png | Bin 192 -> 0 bytes .../reinforced_jug.rsi/inhand-right-3 - .png | Bin 207 -> 0 bytes .../reinforced_jug.rsi/inhand-right-4 - .png | Bin 219 -> 0 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-3.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-3 - .png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/equipped-BACKPACK.png deleted file mode 100644 index c4c61b4356e640ef7fee64b215ab887c1a09ee7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1375 zcmV-l1)%zgP)4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXx&xPg~000A)NklF|9LK+!B)HnP1!bkU zUJWD)M59B|X$k94^bdluG=^YLAtpj$Ah9f+mSm}=JV^vbCF@>_BqGE^gwR|fV(?EY z<~Z(J+Z0WQdei=yr~A@v9r}G>4)gy0-gn--H@xov1VIo4K@bE%5dR@XB86pHHpAgC zx6VrWt3{S&)4g+#b>G%<6nE}DvF`P$HxTW=Sfq1RRhKQJsw!kzHbnvu>0eP4sLC)J zo9a

&4UIG1S(2(b!ZERT+k&D8l^`UrWl%U2uCm&^0YBUDq_c zdq0QjZP~)Cgs=dGWO950-JKnl2<&ouJctfNu#gmg`y3;{?CczNRaXIkHE4FR8L@Lm zB_^ikgxW1x^GNeZBC!Mj*i~JH$?*v*oeA?dI7$Haq!Wpyv_Ugrran#!w<-JzG@ob{ zN?%LZ>aS}W5{V`2V#2uGTZP*c+Oq2E>P$sZxOG;_Uk&Hwc5~!K6oJrf07%;jm@pmw zi`akY7$UcBBch9034quiS)^;vX1$J;pUmZ4-Nf zy=KF{I?T++(@tNT4HqWudD!$^At7@4kdX<0e94O;x|hVx0gRcrLCnR{%BxGM(5|3cUmHVqozy*I57jja#4Z z4H~~IJ8%)S2A)IgwgSZCabTkh!J7dj4CjfEYM?fsXho&F6yJ<5wq=)}0UKS=XC}A{ z;CdzXKZ4|!IHvWl+_JU;+zkhdlF6jmcHxxmUs>y&bPN3hqK^i-uJN*qn4J^5-W^yc h#!L_dK@db?_z90_s>VKv1ib(N002ovPDHLkV1oF6d+h)K diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-1.png deleted file mode 100644 index 70ee5af31ad8967bda33f66f4270da6b061e0463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ z&u!#oP~c%cs9@Ohef~-1CGD&lO0Fg!!mZ1cfT|ewXc&i^TIcuN)Vsf3-lEr2>TcWv Zd1;Pn-U+Xhluv?Gc)I$ztaD0e0svsQCBy&# diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-2.png deleted file mode 100644 index 6fee971564398b8cd7deae80aeaf6cfdd31b325f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BNy6?Q0o<3iXS=&zvi3edvtN-grHM*3J_< mnF4Qo8bg=d#Wzp$Pz=dNC9L diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-3.png deleted file mode 100644 index e32d867059ab0665470942cd74fe19bb0c483b34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP3=dr2*=^pO>^@`W((kAFT@saw o-Zg6Uu&py+uxf9W_>bdEh60ico|%Ze0-DL->FVdQ&MBb@0OKq%g#Z8m diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-4.png deleted file mode 100644 index 6d75661bf585901f657fadd1481452a917e74c68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP40}%8O)o2Z!(qJnOWn^#4Ih_t owgRme8F*vz9YU+W>V4>Eef&v&g{xwp3eZpnPgg&ebxsLQ023oIvH$=8 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-5.png deleted file mode 100644 index 1a6d82670de840d7a13cda6befa82bc741c23c75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_ zFC63qs%m}MbgY2k`}~uFd#*Fdv8-J1@BJFP%C(FP4dOe0pE=hjo0vB3p1!?6Yv+lb q?28Pf7BEWfxYw}i+pE|I^4zO^RX6afi4+1&W$<+Mb6Mw<&;$TU?J?m1 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/fill-6.png deleted file mode 100644 index d8ffa665b190d03213f17656b7df20bd097bc9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY-_ zuWaN!;K1P==zdCq=fFSXN|s+s{52*7tojqKBpadU$Heg9ec#)rRlDXH-#&Hb;=5w$ z1K+a61RsBY&2V?4-j#I5j0QF!+Le4cU!p3xO6ec)I$ztaD0e0szzm BILrV5 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-1.png deleted file mode 100644 index d553950cb3e8ff5b93eb5a69c64de653620bc20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-2.png deleted file mode 100644 index 897c8a801def21a5eff5a608734c56c5e1971e0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-4.png deleted file mode 100644 index a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-1 - .png deleted file mode 100644 index d553950cb3e8ff5b93eb5a69c64de653620bc20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-2 - .png deleted file mode 100644 index 897c8a801def21a5eff5a608734c56c5e1971e0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-4 - .png deleted file mode 100644 index a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s From 66a57c5ea4f165836f5f1de59a775a40893bb7f3 Mon Sep 17 00:00:00 2001 From: dustylens Date: Wed, 1 Jan 2025 09:52:09 -0800 Subject: [PATCH 4/8] Additional sprite sanitation. I need to establish a better sprite process. --- .../reinforced_jug.rsi/inhand-left-1.png | Bin 150 -> 0 bytes .../reinforced_jug.rsi/inhand-left-2.png | Bin 192 -> 0 bytes .../reinforced_jug.rsi/inhand-left-3.png | Bin 207 -> 0 bytes .../reinforced_jug.rsi/inhand-left-4.png | Bin 219 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-3.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-1.png deleted file mode 100644 index d553950cb3e8ff5b93eb5a69c64de653620bc20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|t0|fB^@KL%Q_0`E9wA%+?B?*i>@;bJMJNZlEd#hHWX&s;k;pEw}n%Z>4m~5-i5R rP_XgjIfwMJ*YWk6j2HAXFqHge$owldgX6WL5lDrntDnm{r-UW|)#5O{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-2.png deleted file mode 100644 index 897c8a801def21a5eff5a608734c56c5e1971e0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0I!GMRwVSVfr=SE+?ey(?ymC{(b^sS zcdO68eAe)R>D$8VQJQDx2*e$*+rs_hJGVq~P0%hzkZOj8?<>#nq+H|s&-*WErsRrM zb9XhIl7GDF)=KUbXLv%cmN8~djmk}PkYi*x@r^Zs!D^r2qr2@Ojh?Q4F6*2UngHi6 BQ2+n{ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-4.png deleted file mode 100644 index a7f308c8d09853f3e437a8bcb9056bdb31e2c0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut;nvmp;_0DDjs3-5!!%Re&QQ(ieKW};Vw%<;Y9J11Jq<`4H+%LvqQ=Ztc+#q*ll zbAlJE-oK1XuS(-qepDToo%?f!@e=t56)ztr$MmwKaH~2n)lHX6j`_q7)C2?t+R^G( zQ>~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s From 111192532ce0606e173ceebf40547ee6ed7bce4c Mon Sep 17 00:00:00 2001 From: dustylens Date: Wed, 1 Jan 2025 10:16:03 -0800 Subject: [PATCH 5/8] and one more cleanup pass --- .../Catalog/ReagentDispensers/chemical.yml | 6 +- .../Objects/Specific/chemical-containers.yml | 95 +++++++++++-------- 2 files changed, 58 insertions(+), 43 deletions(-) diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml index ba0b4cc565e..99878bb9be0 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml @@ -3,15 +3,15 @@ inventory: - JugAluminium - ReinforcedJugCarbon # Frontier - - JugChlorine + - ReinforcedJugChlorine # Frontier - JugCopper - - JugEthanol # Frontier + - ReinforcedJugEthanol # Frontier - JugFluorine - ReinforcedJugSugar # Frontier - ReinforcedJugHydrogen # Frontier - JugIodine - JugIron - - JugLithium # Frontier + - ReinforcedJugLithium # Frontier - JugMercury - ReinforcedJugNitrogen # Frontier - ReinforcedJugOxygen # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml index 1f325cf567a..31bdc0f55f6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -303,150 +303,165 @@ - type: entity parent: ReinforcedJug - suffix: aluminum - id: ReinforcedJugAluminum + suffix: carbon + id: ReinforcedJugCarbon categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-aluminum + currentLabel: reagent-name-carbon - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Aluminum + - ReagentId: Carbon Quantity: 400 - type: entity parent: ReinforcedJug - suffix: carbon - id: ReinforcedJugCarbon + suffix: chlorine + id: ReinforcedJugChlorine categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-carbon + currentLabel: reagent-name-chlorine - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Carbon + - ReagentId: Chlorine Quantity: 400 - type: entity parent: ReinforcedJug - suffix: chlorine - id: ReinforcedJugChlorine + suffix: ethanol + id: ReinforcedJugEthanol categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-chlorine + currentLabel: reagent-name-ethanol - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Chlorine + - ReagentId: Ethanol Quantity: 400 - type: entity parent: ReinforcedJug - suffix: copper - id: ReinforcedJugCopper + suffix: sugar + id: ReinforcedJugSugar categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-copper + currentLabel: reagent-name-sugar - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Copper + - ReagentId: Sugar Quantity: 400 - type: entity parent: ReinforcedJug - suffix: ethanol - id: ReinforcedJugEthanol + suffix: hydrogen + id: ReinforcedJugHydrogen categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-ethanol + currentLabel: reagent-name-hydrogen - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Ethanol + - ReagentId: Hydrogen Quantity: 400 - type: entity parent: ReinforcedJug - suffix: fluorine - id: ReinforcedJugFluorine + suffix: lithium + id: ReinforcedJugLithium categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-fluorine + currentLabel: reagent-name-lithium - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Fluorine + - ReagentId: Lithium Quantity: 400 - type: entity parent: ReinforcedJug - suffix: sugar - id: ReinforcedJugSugar + suffix: nitrogen + id: ReinforcedJugNitrogen categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-sugar + currentLabel: reagent-name-nitrogen - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Sugar + - ReagentId: Nitrogen Quantity: 400 - type: entity parent: ReinforcedJug - suffix: hydrogen - id: ReinforcedJugHydrogen + suffix: oxygen + id: ReinforcedJugOxygen categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-hydrogen + currentLabel: reagent-name-oxygen - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Hydrogen + - ReagentId: Oxygen Quantity: 400 - type: entity parent: ReinforcedJug - suffix: chlorine - id: ReinforcedJugChlorine + suffix: phosphorus + id: ReinforcedJugPhosphorus categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-chlorine + currentLabel: reagent-name-phosphorus - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Chlorine + - ReagentId: Phosphorus Quantity: 400 - type: entity parent: ReinforcedJug - suffix: chlorine - id: ReinforcedJugChlorine + suffix: potassium + id: ReinforcedJugPotassium categories: [ HideSpawnMenu ] components: - type: Label - currentLabel: reagent-name-chlorine + currentLabel: reagent-name-potassium - type: SolutionContainerManager solutions: beaker: reagents: - - ReagentId: Chlorine + - ReagentId: Potassium + Quantity: 400 + +- type: entity + parent: ReinforcedJug + suffix: silicon + id: ReinforcedJugSilicon + categories: [ HideSpawnMenu ] + components: + - type: Label + currentLabel: reagent-name-potassium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Silicon Quantity: 400 From 94412ceeb5f5a5b4118829f34a3bcbb1c7295b8b Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 3 Jan 2025 20:28:19 +0200 Subject: [PATCH 6/8] Update civilianservices.yml --- Resources/Prototypes/Research/civilianservices.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 6217d3f46c9..d720455fbac 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -179,7 +179,7 @@ - AdvMopItem - MegaSprayBottle - NFBlueprintAdvMopItem # Frontier - - ReinforcedJug # Frontier- + - ReinforcedJug # Frontier - type: technology id: HONKMech From 32dbbf159ec79d038ff1d84c71ddc9f9dd7c086c Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 12 Jan 2025 14:54:10 -0800 Subject: [PATCH 7/8] Sprite update. --- .../Objects/Specific/chemical-containers.yml | 4 ++-- .../Chemistry/reinforced_jug.rsi/icon.png | Bin 910 -> 414 bytes .../reinforced_jug.rsi/inhand-left-fill-1.png | Bin 139 -> 161 bytes .../reinforced_jug.rsi/inhand-left-fill-2.png | Bin 150 -> 168 bytes .../reinforced_jug.rsi/inhand-left-fill-3.png | Bin 192 -> 204 bytes .../reinforced_jug.rsi/inhand-left-fill-4.png | Bin 207 -> 191 bytes .../reinforced_jug.rsi/inhand-left-fill-5.png | Bin 219 -> 0 bytes .../reinforced_jug.rsi/inhand-left.png | Bin 621 -> 439 bytes .../reinforced_jug.rsi/inhand-right-fill-1.png | Bin 139 -> 160 bytes .../reinforced_jug.rsi/inhand-right-fill-2.png | Bin 150 -> 168 bytes .../reinforced_jug.rsi/inhand-right-fill-3.png | Bin 192 -> 206 bytes .../reinforced_jug.rsi/inhand-right-fill-4.png | Bin 207 -> 191 bytes .../reinforced_jug.rsi/inhand-right-fill-5.png | Bin 219 -> 0 bytes .../reinforced_jug.rsi/inhand-right.png | Bin 621 -> 438 bytes .../Chemistry/reinforced_jug.rsi/jug1.png | Bin 130 -> 117 bytes .../Chemistry/reinforced_jug.rsi/jug2.png | Bin 141 -> 131 bytes .../Chemistry/reinforced_jug.rsi/jug3.png | Bin 142 -> 150 bytes .../Chemistry/reinforced_jug.rsi/jug4.png | Bin 143 -> 152 bytes .../Chemistry/reinforced_jug.rsi/jug5.png | Bin 144 -> 170 bytes .../Chemistry/reinforced_jug.rsi/jug6.png | Bin 155 -> 167 bytes .../Chemistry/reinforced_jug.rsi/meta.json | 10 +--------- .../Chemistry/reinforced_jug.rsi/stopper.png | Bin 107 -> 114 bytes 22 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-5.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-5.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml index 31bdc0f55f6..2b73d185d74 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -4,6 +4,8 @@ id: ReinforcedJug description: The sterile plastic of this jug has been reinforced with a metallic shell allowing it to contain an impressive amount of liquid. components: + - type: SolutionContainerVisuals + inHandsMaxFillLevels: 4 - type: SolutionContainerManager solutions: beaker: @@ -44,8 +46,6 @@ price: 30 # Consistent with BaseBeakerMetallic - type: Destructible # Hacky - takes damage, but shouldn't be destructible thresholds: [] - - type: MultiHandedItem - - type: ItemSlots - type: GenericVisualizer visuals: enum.OpenableVisuals.Opened: diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png index eb54ff0dcd8999134efb678cbb9275cc3cf1bc32..f532f78a07d3d0a645b519a9ca3fb072d8a69222 100644 GIT binary patch delta 387 zcmV-}0et?B2c83vB!3BTNLh0L01m_e01m_fl`9S#0003tNkl1pw6o&sm zA*16Vm@I~zA&YL2#j~!Uv%D*4DU@tEK{hYBfT6Q_WH3H~yHu^?NKeLTp-}zfdwTjm z{m2%Ol$4b8-?fsOL^OnY#u#z7>$*iy3wa=_fUH(fic7!RfpUQwJ3q9=A`iB3HTs@@DJu!6Yzof%zRL> z1jGjg_@oH+v^U9KUz_MDac&KjFXa*{)|2V4JU$E`SPe20000EWmrjO hO-%qQ00008000000002eQd1C9rfB!2;OQb$4nuFf3k0009>Nklqmzp0UfegU53KYi2kd?~W&uMOXFSlr$Sf+uQ*8%zC4P;Wo zKobdca9t1r%Eomujd4<0nMHG>3=jF!tM0a|`)7CE>TdwJdgCeaL=y?k3i1m;Dl0QQ z^c*O4&e=-?{JL-Vd$oKMsEujt*tVU%1HD|m@svy|lz+a5OQ(<0{_R0uPE`Zx)Cj{P zIRI3xfmL5t=Avp0fc^^uSPNE6TD!Sz7JnZ-8_J|_0!^QlghWxqeA9i31csiY|H=cR zH8pHnI?I(r!JfD-c{?RLg@X5OjKBIY1NmGQfLvyTy1E#$EMZv=k|ffx@oP?=xy6Y) zX@PgjeSdRX1ApH2+c|^*BX3X}(}2v*2{a&y!dumuyq)q46^uN_ zcy8(jpprm+YzB^P0w75u^^(Z?HDAzwVSp2N((q0K-!IlU{jmuEps4g6=w&oJh7?iI zvuRAHR0owBn4G}52V(&8FZ=gl2mF8f-YRQ0Y=3n-yF09xe;8kSu|jriBVmSqX+_)U1_DCm0i77R3C**4FfJ*T;O4r7@Vs@8xk zgK(Zr`_@3Y3mUbWpx+n#AZcIQ;dbxYfm&B;NlB713I%4=L;`DI@X0-r#}4^w1RlZp zQ-2763-IGlKX~K!{~4;9K-adN@`Sa%n9`%PeQigmM`;-0X-wmPgV%d_WtLX^Q8@qr N002ovPDHLkV1gv0tA+po diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png index 16041d8f718bd0e401ce8cc2b8e77277fd641a74..42945934ac4dd39108e95b5da034ae3c3b4c4501 100644 GIT binary patch delta 119 zcmeBXT*x@Vuprvg#WAE}&f8mtyhja0m>tUbTNpU%P52!YQv8?a&0Q51|7#a>f^>s0 z0~kD5x$0Kv*80875H5qqB$<5H*!qTh)lu2&pWchieruUNDW&IQruc{Zes3=e39R}M Q$qG{I>FVdQ&MBb@0NnB`*Z=?k delta 97 zcmZ3;*v&Y>Fv``_#WAE}&f8mtf(!;6%m=RV{=52M+1#v#=9T}0rzJG3VPyb;`!}v8 wrOlhJyr_m9%x7Sbxc=+<{5w21lo=TA>h-emFn{Jb(hQRGboFyt=akR{08f}CDF6Tf diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png index d553950cb3e8ff5b93eb5a69c64de653620bc20e..bf026b22d9f326144b54c50b9f15c4bd63b430e3 100644 GIT binary patch delta 126 zcmbQnxPozlVR@3Li(^Q|oVT|Oc@G%yxLo9GP5d{5M?qlE^5A1$p-(kVS2OsrKZqA+ z0E0hap_^Addnq4($J*_LlO+jgwTD)ru8)L>t Yh7H%%o*HZtz6w(7>FVdQ&MBb@0P|Ka8vpua|X*ducaZ5T+w}k5Aqt0 z`+HAgVgP{yg?qo>te#)~y>RxKIWvEXb63O(S{>V=BnFmcXjm+_yXl&}gUght*W2#+ z8x^nPF3ElyvNrem#}199f1a7x9jmx*oqe0>+JoIvzh%^v{wOd+?_prNs!_LWp4}vn NA)c;&F6*2UngFVrL=yl2 delta 151 zcmX@Zcz|(&VSSaSi(^Q|oVT|&@-`UousBSRP-af~pK0Xqt-*|yciLKxm+Sh!md&>3 zV*rAN{$mo~-|+;7e|fm8BwJVgEZaloHQwhfgActCusg7;zopr0MT4N AcK`qY diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png index 657369a39fa7052c0b5edbb29b11344d30387d06..3df175a0854555252ffe945e3923995b50f676df 100644 GIT binary patch delta 150 zcmX@lxSw%?VSS~ii(^Q|oVPbO@;VvvI2?>OX!}0@By$SO_k~`aEiH$|pX4!UZ@jbj zH4_5}{BQ_8yJ}YX{>QTYvd+gPtdITU6EFD13YKGF_@6EM@XVdKR^#F_(HGmS_H-4v zl=RkUD&68Lxy^L#`2LBVbWY!M<4gOM@8K|nAx`4_b~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png index 4d6d41cb381a4d4c29360c84c450d71e6510ee8b..24725612014a0d96290d870a0c7bfe2567d6d21a 100644 GIT binary patch delta 401 zcmV;C0dD^71h)f_FnZq}7zN^hy(3ya~@8>_v8Fwi{t+f#V+P1}NwYvHq`yakJIYdN6L_|bHL_|bH zL`it>qxU{poxPtgA_uMU@%bfGyFn3&Aq3QQtr>fuu4{x4#@48+Dmdq&wKi5&H91eM z8+6XybQ8nz%YWv1j=t}Q-{YlKn%V*k`vJ-#gE2-c_7`Ie-s9ugKEFOcjo0!#pPZ+* z07E0(bOA35t<=++F8tX*Z#J7rMXK5Y4F5=3WWYz-y#ZyBot%Jc>hym<0e$~AD@(0& vANB+Qz;d}v+U4)xt8LqZYurabG|4wdHoiVtsu8dl)1){qBm*TD@;Y;$gq#mT z-preM+&SEVOy&a!A%qY@2qEoAK=*{%#dW7Xp87a~jjermE`Ryuv-Wx~jaI=+sWoTd z?EwBf1d+SEb@zAoyg?}VfV0yxEX+)|R0vHMyOdgU-oNWZuAmT$#~bEL#Uj-04GPz) zr9ud49c;zW4Io!2Hq4#>$YZd-3x#XtS8YZJ>Kxo@MKM3OfQzh+i>!^(-D~%g*-ax7 z?U1TdjHWx_>VGN^Rj#<(Ln8@yymRyu0Pree;a4{AV|nsu-2$Cf)E(C^8UV%;y*OU+ zuPBpf1yJvRntg|{M6bKQ9!9BB^RYBDXa#_3*&ViB2Pmb0u!Yoe5{KW<8#-WkbP_$W z2x`@PkwT@=?|`rc`(8D4KxX>{m!;o+*C$TX0c@_P0)Mt`J5!&=0pPC=$ZYRCeeWG0 zz52Cfegpyk@htFRV$%87-0rt@OIrgyvoIUfo3I}cxMLl9OXOtAz8|p+lNdA@ z8NguDl2v7)Z{y!Xcnl13*7w+A?l<16j>=yD`Q4hW-{u&58Xfzwh5HA;`j(SI0(_>o Q9)Q$(y85}Sb4q9e0Lq*zmjD0& delta 97 zcmZ3$*v&Y>Fv``_#WAE}&f8mtf(!;6%m=RV{=52M+1#v#=9T}0rzJG3VPyb;`!}v8 wrOlhJyr_m9%x7Sbxc=+<{5w21lo=TA>h-emFn{Jb(hQRGboFyt=akR{08ck0C;$Ke diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png index d553950cb3e8ff5b93eb5a69c64de653620bc20e..c03542abbdfa42e16c1c19bb3a3708c00ecbc4d8 100644 GIT binary patch delta 126 zcmbQnxPozlVR@3Li(^Q|oVT~M85sJ>X4>`P$Nk6_eiVgLgr zrA52b%g?W`w|RPl_n1WfABZqRgMIX0hfv#l0wGuT><+*2jnR6w{E0KC)60y4*E8IC Y#j;_K+Ed$;Z0sQAp00i_>zopr0OG?iQ~&?~ delta 108 zcmZ3%IE`_FVQPSua|X*dFF}jY1o5C8g&nI| zKOLQ>!^!{x4co8X%2?aGyZDZpv3uITw+!>r`K#WCKLJZJFg%zpx0&_Z?Zys`+uMAv zTThyqd_U}Z)buY_vHkNqJAzJ`W`DW&d-;8>%gi_I_sLn^Fc*9n#~AU7)%BuAo!BDx PUXU@Ku6{1-oD!M3 zV*rAN{$mo~-|+;7e|fm8BwJVgEZaloHQwhfgActCusg7;zopr0Md#+ Ac>n+a diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png index 657369a39fa7052c0b5edbb29b11344d30387d06..0e04b0a5dda8bf065ff2527cd84ec284b8fc07b4 100644 GIT binary patch delta 150 zcmX@lxSw%?VSS~ii(^Q|oVPa@3LZA#aR_YgTlhEq5`&bZjp|uZsUx1%&%bYITqFED znE?!HO1@vbdwl)#9jCLuEm$>g#^d^(4R`e+atsMQ`L^fI+~zJylUtqrbqnA5IbSW5 y^!Sa11y5&xeabpVzFui@_|;FY`Spwk?%flAVjFDDFF7|Jq}$Wg&t;ucLK6VQXh6UK delta 166 zcmV;X09pUP0nY)DF@K3kL_t(|obB4N4a6V}1yD}P7!1Jv(=Y&gVbWY!M<4gOM@8K|nAx`4_b~dp_g-GSv0m$WYv|tXb`DRE>{zv(CFk`O6$d7*a<(_h3=F&XGS1xKv}o^^{Z$}+ Mp00i_>zopr0Of{HivR!s diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png index 4d6d41cb381a4d4c29360c84c450d71e6510ee8b..2b5250278d2d52a984312cb2ca890f118a6e4a97 100644 GIT binary patch delta 400 zcmV;B0dM~81hxZ^FnwU;KWt^00n!I#$$0Kg$qfm<`%fPXU2008%gB6%^_Fx!Bp z^#FjUe>wt-Cjjq0buH0!UAOqyn@eA+YAA~H=$}rfi^p!s_`z3I)o$u0A|fIpA|fIp zA|j#-fEME;#3sCCI7Pzg_zS5rHu#SZjlb05~_odyl%VW7jvR>l)sB#E$6~ zH$YW`h@k5_9Dk3;;d2o|--y2;BCys*Yr+BN643wv00{s|MNUMnLSTZl1iVZD delta 584 zcmV-O0=NCP1MLKmFn8dl)1){qBm*TD@;Y;$gq#mT z-preM+&SEVOy&a!A%qY@2qEoAK=*{%#dW7Xp87a~jjermE`Ryuv-Wx~jaI=+sWoTd z?EwBf1d+SEb@zAoyg?}VfV0yxEX+)|R0vHMyOdgU-oNWZuAmT$#~bEL#Uj-04GPz) zr9ud49c;zW4Io!2Hq4#>$YZd-3x#XtS8YZJ>Kxo@MKM3OfQzh+i>!^(-D~%g*-ax7 z?U1TdjHWx_>VGN^Rj#<(Ln8@yymRyu0Pree;a4{AV|nsu-2$Cf)E(C^8UV%;y*OU+ zuPBpf1yJvRntg|{M6bKQ9!9BB^RYBDXa#_3*&ViB2Pmb0u!Yoe5{KW<8#-WkbP_$W z2x`@PkwT@=?|`rc`(8D4KxX>{m!;o+*C$TX0c@_P0)Mt`J5!&=0pPC=$ZYRCeeWG0 zz52Cfegpyk@htFRV$%87-0rt@OI6u5i2(@qXc&i^ pTIcuN)Vsf3-lEr2>TcWvd1;Pn-U+Xhluv?Gc)I$ztaD0e0sv6x9(Vu% diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png index 6fee971564398b8cd7deae80aeaf6cfdd31b325f..1949d2ed13d678fbf31a53911910100f4fc5be87 100644 GIT binary patch delta 89 zcmeBWY-XHb7-Z||;usRq`u5yHK?VgL=Zi(h4er)2>k;7RVr24>{l7CrrI!H+>aMTq r%IW{CrfKwf*TvOx6Sh3PZor@;TzQa7d$VibW{?t3S3j3^P6>7nh2et6Z~*t8$q~HQ0v-gZp#JZyzK5*= z0000la`%~?9XrCzEWKYY5QT}zxdKtx^$)0Ouigdzu>g{Z6PP-#uM_|P002ovPDHLk FV1iB4DeV9N diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png index e32d867059ab0665470942cd74fe19bb0c483b34..07a6e425f6728abb6de0cafd9f8d065f79b32766 100644 GIT binary patch delta 108 zcmV-y0F(cY0hR%fF=bFmL_t(oh3(L>4Ztu6L{TDn3>7nh2et6Z~*t8$q~HQ0v-gZp#JZyK6$MH z007`c?mn}#V@H^orT5DZL}4Ow?tv(b2Cg@ts=ay__{Rb<5E-E6G!*Ip0000tyY%^L_0ZE^kyC3(;3ar9brG6{G1?I5R=L3M(0Fx~iI|yHP Q+yDRo07*qoM6N<$g3m)NumAu6 delta 101 zcmV-r0Gj`p0gnNYF>7nh2et6Z~*t8$q~HQ0v-gZp#JZyK6$MH z006wm-Dh@o>nyPU5!g&bL`42>t9&do`}IuHB4V0RR-m=k?=t}A?$eCDssMn;jO6lOS%Fd5sMKo( iw1LlUVD>7nh2et6Z~*t8$q~HQ0v-gZp#JZyK6$MH z0Du>{`^?Uc9bsmc-Y-88g^9?y2cj?RsR;3#&~fun#5_aR2}S07*qo IM6N<$g7law=Kufz diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png index d8ffa665b190d03213f17656b7df20bd097bc9f5..cb3a0e490d5dca1ba00ce0a28108ade9367eb882 100644 GIT binary patch delta 125 zcmV-@0D}LU0jB|wF?L}|L_t(oh3(V92>>As1i%RQObJ^+`mZJhq=fv>0+iE7ghO_o zV%WH#2oVtx-7GWT)t%>LU_>luT2;8a53dCvs`{Bx)&PLvY^Q;;1!iHhrH(DY27cFo fnU(!8BDz}#>y;p-Pe20d00000NkvXXu0mjfBwjU1 delta 113 zcmV-%0FM8s0hgnPb64CnhoFXFw0|)a4^JV+36a{AJ9u#V5_Pgb|U!H;Cz)7a|OqSce S-7P;EfWXt$&t;ucLK6VK5f&!^ From 783ef45a30c48744bd3a4bd122e5f66e2deab6ba Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 12 Jan 2025 15:08:49 -0800 Subject: [PATCH 8/8] Slight lid edit for better placement and consistency. --- .../Chemistry/reinforced_jug.rsi/icon.png | Bin 414 -> 376 bytes .../Chemistry/reinforced_jug.rsi/stopper.png | Bin 114 -> 113 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png index f532f78a07d3d0a645b519a9ca3fb072d8a69222..98d7e52967624214c8e7662262540a940d86764a 100644 GIT binary patch delta 349 zcmV-j0iyn%1NZ`vB!2;OQb$4nuFf3k0003pNkl-WH6 z6+p_|uXzX}!tJ^1$MyD9;{M5>%L0t!=VB)!Z0lp+*01Z=hsB=v4+AKrHd<>Zga8pO zy3yB%ovpocgj$urR7+C$@dQE;K>P>us|kcaLS`YTR07FC;s52SyRfZ~ vFQ4H3ay|g*p|yBYrH0B>DdViHtUseKQ(K_2BN4!P00000NkvXXu0mjfPF|}= delta 387 zcmV-}0et@W0-ghqB!3BTNLh0L01m_e01m_fl`9S#0003tNkl1pw6o&sm zA*16Vm@I~zA&YL2#j~!Uv%D*4DU@tEK{hYBfT6Q_WH3H~yHu^?NKeLTp-}zfdwTjm z{m2%Ol$4b8-?fsOL^OnY#u#z7>$*iy3wa=_fUH(fic7!RfpUQwJ3q9=A`iB3HTs@@DJu!6Yzof%zRL> z1jGjg_@oH+v^U9KUz_MDac&KjFXa*{)|2V4JU$E`SPe20000EWmrjO hO-%qQ00008000000002eQyo{E-pQFi85kV8 Yxr3fDGsTu``Z554r>mdKI;Vst0H7KfQUCw| delta 70 zcmXRcnqcUt