]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Flask Visual Overhaul & YML Organizing (#38032)
authorProle <172158352+Prole0@users.noreply.github.com>
Sat, 21 Jun 2025 14:52:36 +0000 (07:52 -0700)
committerGitHub <noreply@github.com>
Sat, 21 Jun 2025 14:52:36 +0000 (10:52 -0400)
* Adding Back Baseline V1 Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Readability Change

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* icon_open implementation, tidy up & attributions (fix lith/shiny flask ugly af open sprites)

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* good enough

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* No mo closed spills

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Inhands & Attributions Part 1

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Inhands & Attributions Part 2

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Flask Sounds & Attributions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Cap flask inhands change

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Lith flask Inhand Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Spacing

* Fix?

* Man...

* Attributions Back in...

* Im loosing it..

* REAL!

* :/

* Again...

* again :/

* Plz???

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
37 files changed:
Resources/Audio/Items/attributions.yml
Resources/Audio/Items/flask_close1.ogg [new file with mode: 0644]
Resources/Audio/Items/flask_open1.ogg [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Prototypes/SoundCollections/drink_close_sounds.yml
Resources/Prototypes/SoundCollections/drink_open_sounds.yml
Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json

index 9e44afac7d5e88338769cd498ac9eb65c2ee98c8..52f0a6c9a23cc9956abcf2db759f16410a3206bf 100644 (file)
   license: "CC0-1.0"
   copyright: "Original sound by Nox_Sound on freesound.org. Converted to ogg and edited by themias."
   source: "https://freesound.org/people/Nox_Sound/sounds/556648/"
-  
+
 - files: [ "toolbox_insert.ogg" ]
   license: "CC0-1.0"
   copyright: "Original sound by j1987 on freesound.org. Converted to ogg and edited by themias."
   source: "https://freesound.org/people/j1987/sounds/532137/"
-  
+
 - files: [ "toolbox_remove.ogg" ]
   license: "CC0-1.0"
   copyright: "Original sound by kooust on freesound.org. Converted to ogg and edited by themias."
   source: "https://freesound.org/people/kooust/sounds/452712/"
+
+- files: [ "flask_open1.ogg" ]
+  license: "CC-BY-3.0"
+  copyright: "Original sound by kwahmah_02 on freesound.org. Converted to ogg and edited by Prole0 (GitHub)"
+  source: "https://freesound.org/s/277503/"
+
+- files: [ "flask_close1.ogg" ]
+  license: "CC-BY-NC-4.0"
+  copyright: "Original sound by QEDionium on freesound.org. Coverted to ogg and edited by Prole0 (GitHub)"
+  source: "https://freesound.org/s/489803/"
diff --git a/Resources/Audio/Items/flask_close1.ogg b/Resources/Audio/Items/flask_close1.ogg
new file mode 100644 (file)
index 0000000..5458762
Binary files /dev/null and b/Resources/Audio/Items/flask_close1.ogg differ
diff --git a/Resources/Audio/Items/flask_open1.ogg b/Resources/Audio/Items/flask_open1.ogg
new file mode 100644 (file)
index 0000000..7e766d4
Binary files /dev/null and b/Resources/Audio/Items/flask_open1.ogg differ
index 2ebc20e36570ff378ac20303884dad4a60c9f8d7..9e1b100dbfcf83b8281e30ecb8c084fb87e5e756 100644 (file)
@@ -3,7 +3,13 @@
   id: FlaskBase
   abstract: true
   components:
-  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+  - type: Sprite
+    state: icon
+    sprite: Objects/Consumable/Drinks/flask.rsi
   - type: PhysicalComposition
     materialComposition:
       Steel: 300
     solution: drink
 
 - type: entity
-  parent: FlaskBase
+  id: DrinkFlaskVisualsOpenable
+  abstract: true
+  components:
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
+  - type: Appearance
+  - type: Sprite
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: Openable
+    sound:
+      collection: flaskOpenSounds
+    closeable: true
+    closeSound:
+      collection: flaskCloseSounds
+
+# Flasks
+
+- type: entity
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkShinyFlask
   name: shiny flask
   description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
@@ -20,8 +50,9 @@
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkMREFlask
+  suffix: Full
   name: MRE flask
   description: An old military flask, filled with the finest contents for soldiers.
   components:
@@ -37,7 +68,7 @@
     solution: drink
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkDetFlask
   name: inspector's flask
   description: A metal flask with a leather band and golden badge belonging to the inspector.
@@ -46,7 +77,7 @@
     sprite: Objects/Consumable/Drinks/detflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkHosFlask
   name: hos's flask
   description: A metal flask, fit for a hard working HoS.
@@ -55,7 +86,7 @@
     sprite: Objects/Consumable/Drinks/hosflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkFlask
   name: captain's flask
   description: A metal flask belonging to the captain.
@@ -64,7 +95,7 @@
     sprite: Objects/Consumable/Drinks/flask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkFlaskBar
   name: bar flask
   description: A metal flask often given out by the bartender on loan. Don't forget to return it!
 - type: entity
   parent: FlaskBase
   id: DrinkFlaskOld
-  name: flask
-  description: ''
+  name: old flask
+  description: A decrepit old flask, its lid seems to be missing.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkLithiumFlask
   name: lithium flask
   description: A flask with a Lithium Atom symbol on it.
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkVacuumFlask
   name: vacuum flask
   description: Keeping your drinks at the perfect temperature since 1892.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vacuumflask.rsi
-
-- type: entity
-  parent: FlaskBase
-  id: Pitcher
-  name: metal pitcher
-  description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 60
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/pitcher.rsi
-    layers:
-      - state: icon
-        map: ["enum.SolutionContainerLayers.Base"]
-      - state: fill-6
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 6
-    fillBaseName: fill-
-    inHandsMaxFillLevels: 2
-    inHandsFillBaseName: -fill-
index a7e3bf18cff4234d2aaf7079fd3b73fee8b29963..02a4346ebca8511626b9796b92623449a9fa8eac 100644 (file)
   - type: PhysicalComposition
     materialComposition:
       Steel: 75
+
+- type: entity
+  parent: DrinkBase
+  id: Pitcher
+  name: metal pitcher
+  description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 60
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/pitcher.rsi
+    layers:
+    - state: icon
+      map: ["enum.SolutionContainerLayers.Base"]
+    - state: fill-6
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: fill-
+    inHandsMaxFillLevels: 2
+    inHandsFillBaseName: -fill-
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300
+  - type: FitsInDispenser
+    solution: drink
index 9da4d281685753d7d2c250f43c35482d7e7e3e70..2fc1c01dd672aa92d19a70bb1370fa6219c45f59 100644 (file)
@@ -2,3 +2,8 @@
   id: bottleCloseSounds
   files:
   - /Audio/Items/bottle_close1.ogg
+
+- type: soundCollection
+  id: flaskCloseSounds
+  files:
+  - /Audio/Items/flask_close1.ogg
index fea78d04643bac24a3daf684b55d15304ebb934a..21c2f61003f4d47700600e42a83f00b91c4875cd 100644 (file)
@@ -19,3 +19,8 @@
   id: pop
   files:
   - /Audio/Items/pop.ogg
+
+- type: soundCollection
+  id: flaskOpenSounds
+  files:
+  - /Audio/Items/flask_open1.ogg
diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..13bec09
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png differ
index ffcf3da666bf52dbc202b194e4e11ff77ffb93d2..64bbee7a5afa07eeaec4ea1d0e7ea6ec657a9db9 100644 (file)
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..81d2536
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..3ce0418
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..569a216
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..41222914c78e73fab82b7cb97a043a6e9ae84aac 100644 (file)
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..89ded8c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7177a53
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2c508b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..41222914c78e73fab82b7cb97a043a6e9ae84aac 100644 (file)
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..051d741
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..f3a2c49
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..6491b2bc5dfffcd88605aa3c1ff334e5f0ebc12f 100644 (file)
@@ -1 +1,22 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
index d4ae3526750a5d8db09f3a062d13085ddf2364f6..5a098473dbc2f8a13609a95e6350f38e53ad0355 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..8e885ca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..c64ed19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..30d1758
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png differ
index fbbb5eadce98303815c83f2d25a192f9a3174560..a1a58ef52c9a01d63146dee205f9c3264112d82f 100644 (file)
@@ -1,14 +1,25 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by MrGreen06#0618 (discord)",
+    "copyright": "Sprited by MrGreen06#0618 (discord), icon modified & icon_open/inhands by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..61cc511
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..552b333
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6ac5217
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..41222914c78e73fab82b7cb97a043a6e9ae84aac 100644 (file)
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..92600e9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png differ
index ec2769b3b9d74714458b933411b81327fc087f29..53f0b3af2fa57467b153345e266a4faafad56796 100644 (file)
@@ -1,15 +1,18 @@
 {
     "version": 1,
+    "copyright": "Created by EmoGarbage, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by EmoGarbage, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..92e4559
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..f4dfd96
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..11f51eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..41222914c78e73fab82b7cb97a043a6e9ae84aac 100644 (file)
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..4ed9fb1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png differ
index b45677f9866ad997ae45e07c354e4dbe6e8d8898..1efdfb940a186c3ef08155d0b496f2ab0046033b 100644 (file)
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "license": "CC-BY-SA-3.0",
     "size":
     {
@@ -12,6 +12,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4