Flask Visual Overhaul & YML Organizing (#38032)

* 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>

Resources/Audio/Items/attributions.yml

@@ -149,13 +149,23 @@
   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/"

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml

@@ -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
@@ -11,7 +17,31 @@
     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!
@@ -75,14 +106,14 @@
 - type: entity
   parent: FlaskBase
   id: DrinkFlaskOld
-  name: flask
+  name: old flask
-  description: ''
+  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.
@@ -91,35 +122,10 @@
     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-

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml

@@ -177,3 +177,33 @@
   - 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

Resources/Prototypes/SoundCollections/drink_close_sounds.yml

@@ -2,3 +2,8 @@
   id: bottleCloseSounds
   files:
   - /Audio/Items/bottle_close1.ogg
+
+- type: soundCollection
+  id: flaskCloseSounds
+  files:
+  - /Audio/Items/flask_close1.ogg

Resources/Prototypes/SoundCollections/drink_open_sounds.yml

@@ -19,3 +19,8 @@
   id: pop
   files:
   - /Audio/Items/pop.ogg
+
+- type: soundCollection
+  id: flaskOpenSounds
+  files:
+  - /Audio/Items/flask_open1.ogg

Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json

@@ -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

Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json

@@ -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"}]}
+{
+    "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
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json

@@ -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"}]}
+{
+    "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
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json

@@ -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"}]}
+{
+    "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
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json

@@ -1,14 +1,25 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by MrGreen06#0618 (discord), icon modified & icon_open/inhands by Prole0 (GitHub)",
-    "copyright": "Sprited by MrGreen06#0618 (discord)",
     "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
         }
     ]
 }

Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json

@@ -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"}]}
+{
+    "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
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json

@@ -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

Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json

@@ -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"}]}
+{
+    "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
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json

@@ -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