lint after losing a LocId in the merge

diff --git a/Resources/Locale/en-US/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
index ab458746ddfb2dfa028f6cba0340fae768dd2980..d83252d8426400e5863aae2e046787ff90725cf0 100644 (file)
--- a/Resources/Locale/en-US/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
@@ -2,6 +2,8 @@ drink-component-on-use-is-empty = {CAPITALIZE(THE($owner))} is empty!
 drink-component-on-examine-is-opened = [color=yellow]Opened[/color]
 drink-component-on-examine-is-sealed = The seal is intact.
 drink-component-on-examine-is-unsealed = The seal is broken.
+drink-component-on-examine-is-unsealed-no-cork = The seal is broken, and the cork is gone.
+drink-component-on-examine-is-unsealed-crown-cap = The seal is broken, and the crown cap is bent.
 drink-component-try-use-drink-not-open = Open {$owner} first!
 drink-component-try-use-drink-is-empty = {CAPITALIZE(THE($entity))} is empty!
 drink-component-try-use-drink-cannot-drink = You can't drink anything!

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index eb5a3e367e441a4584676129e793bc48752a375c..aeabba5f5aa954d3f359d66d0e3955df2b2d2b97 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -15,7 +15,8 @@
       types:
         Blunt: 0
   - type: DnaSubstanceTrace
-  - type: Drink
+  - type: Drink # Namesake. You are able to directly drink from this entity.
+    solution: drink
   - type: Spillable
     solution: drink
   - type: MixableSolution
@@ -26,7 +27,7 @@
     solution: drink
   - type: DrainableSolution
     solution: drink
-  - type: InjectableSolution # Injectors (syringe) will fallback to RefillableSolution. This adds support for hyposprays and liquid anomalies.
+  - type: InjectableSolution # Injectors (syringe) will fall back to RefillableSolution. This adds support for hyposprays and liquid anomalies.
     solution: drink
   - type: ExaminableSolution
     solution: drink
@@ -80,6 +81,7 @@
   - type: Sprite
     layers:
     - state: icon_open
+      map: ["enum.OpenableVisuals.Layer"]
   - type: Openable
     opened: true
   - type: Sealable

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
index 6b215c5d6924f9215259803336edc8fa910242d7..9e3ddcb7bc54b615bddb2f1ea2ea0853b5d8c089 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -1,5 +1,6 @@
 ## Material costs to apply to a drink
-# These bases should always be the first parent
+# These bases should always be the parented before DrinkBase, or before a prototype inheriting DrinkBase.
+# - That way they override any previously inherited material, and material specific sounds aren't overridden by BaseItem.
 
 # Fragile glass
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
index aefa55d67a2b86353181f5389679b217bdf719de..ccaf2987195d4fb2eabd2715144689bf475009f0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
@@ -149,7 +149,7 @@
   - type: Openable
     closeable: false # Champagne corks are fat. Not worth the effort.
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-no-cork # tell the player why it can't close
+    examineTextUnsealed: "drink-component-on-examine-is-unsealed-no-cork" # tell the player why it can't close
 
 - type: entity
   parent: [DrinkVisualsAllFilled, DrinkBottleGlassBaseFull]
@@ -431,7 +431,7 @@
   - type: Openable
     closeable: false # sprite is just a beer bottle, but this should be removed when there's a more appropriate sprite
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
+    examineTextUnsealed: "drink-component-on-examine-is-unsealed-crown-cap" # tell the player why it can't close
   - type: Tag
     tags:
     - Beer
@@ -457,7 +457,7 @@
   - type: Openable
     closeable: false # sprite is just a beer bottle, but this should be removed when there's a more appropriate sprite
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
+    examineTextUnsealed: "drink-component-on-examine-is-unsealed-crown-cap" # tell the player why it can't close
 
 
 # Small glass bottles
@@ -481,7 +481,7 @@
   - type: Openable
     closeable: false # can't put the cap back on
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
+    examineTextUnsealed: "drink-component-on-examine-is-unsealed-crown-cap" # tell the player why it can't close
   - type: Tag
     tags:
     - Beer
@@ -505,7 +505,7 @@
   - type: Openable
     closeable: false # can't put the cap back on
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
+    examineTextUnsealed: "drink-component-on-examine-is-unsealed-crown-cap" # tell the player why it can't close
 
 - type: entity
   parent: [DrinkVisualsOpenable, DrinkBottleGlassSmallBaseFull]