update for glue/lube tube inhand

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index 80e7fa10cb488f1ad12c481bf1cb8a9fda4f0cee..c4e8b020e7bee8bb7662bcc8b49d8d4eaefc3868 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -18,7 +18,7 @@
   - type: Edible
     edible: Drink # Namesake. This entity is a sort of cup you can drink directly from.
     destroyOnEmpty: false
-    utensil: None
+    utensil: None # Spoons don't fit in cups, also conflicts with bar spoon stirring
     solution: &sol drink # solution name alias
   - type: Spillable
     solution: *sol
@@ -81,16 +81,17 @@
   parent: DrinkBaseOpenable
   id: DrinkBaseOpenableOpen
   components:
-  - type: Sprite
-    layers:
-    - state: icon_open
-      map: ["enum.OpenableVisuals.Layer"]
   - type: Openable
     opened: true
   - type: Sealable
     sealed: false
+#  - type: Sprite # Needs to be done manually, since most drinks have more than one layer. Or just let the visualizer handle it
+#    layers:
+#    - state: icon_open
+#      map: ["enum.OpenableVisuals.Layer"]
 
 ## Bases for visuals
+# TODO standardize state names for fill levels and openable visuals
 
 # Basic visualizer for an openable entity. Requires DrinkBaseOpenable
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index 504c336a21cafb31338868509e8ee50937da87a3..11973565533666accbfd085853214cde84b3b000 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ DrinkBaseMaterialPlastic, DrinkBase, DrinkBaseOpenable, DrinkVisualsOpenable ] # todo Should use DrinkVisualAll, but sprite has no inhand
+  parent: [ DrinkBaseMaterialPlastic, DrinkBase, DrinkBaseOpenable, DrinkVisualsAllFilled ]
   id: BaseSqueezeBottle
   components:
   - type: Openable
@@ -20,12 +20,15 @@
         maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 6
-    fillBaseName: fill
+    fillBaseName: fill # TODO rename to "fill-"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
   - type: TrashOnSolutionEmpty
     solution: drink
-  - type: ExaminableSolution # Remove when DrinkVisualAll is added
-    examinableWhileClosed: true
-    heldOnly: false
 
 - type: entity
   parent: BaseSqueezeBottle