diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index 0a24240e7d00..cac4e5c642ab 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml @@ -42,7 +42,7 @@ id: BulkPlantBGone icon: sprite: Objects/Specific/Chemistry/jug.rsi - state: jug + state: icon product: CratePlantBGone cost: 750 category: cargoproduct-category-name-hydroponics diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml similarity index 97% rename from Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml index 1bbe05944fa4..7f2157f58531 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml @@ -1,6 +1,6 @@ - type: entity name: jug - parent: BaseItem + parent: [BaseItem, DrinkBottleVisualsOpenable] id: Jug description: Used to contain a very large amount of chemicals or solutions. Chugging is extremely ill-advised. components: @@ -11,10 +11,17 @@ - type: Sprite sprite: Objects/Specific/Chemistry/jug.rsi layers: - - state: jug + - state: icon + map: [ "enum.OpenableVisuals.Layer" ] - state: jug1 map: [ "enum.SolutionContainerLayers.Fill" ] visible: false + - type: Openable + sound: + collection: bottleOpenSounds + closeable: true + closeSound: + collection: bottleCloseSounds - type: Item size: Normal sprite: Objects/Specific/Chemistry/jug.rsi @@ -79,6 +86,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Label + - type: Sealable - type: Tag tags: - ChemDispensable diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Specific/chemistry.yml rename to Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon.png new file mode 100644 index 000000000000..7c70bba71e52 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png new file mode 100644 index 000000000000..dbb64e074493 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png deleted file mode 100644 index 1fda41e3b542..000000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json index 85c293d34dfa..f271baa1c528 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json @@ -8,7 +8,10 @@ }, "states": [ { - "name": "jug" + "name": "icon" + }, + { + "name": "icon_open" }, { "name": "inhand-left",