fixed conflicts

diff --git a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
index e826e174efc3200f2974b8bd879bb253d662f6b3..be37b91ce218177f92f5aec3d01c9e757861659f 100644 (file)
--- a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
@@ -1,2 +1,4 @@
 sealable-component-on-examine-is-sealed = The seal is intact.
 sealable-component-on-examine-is-unsealed = The seal is broken.
+sealable-component-on-examine-is-unsealed-no-cork = The seal is broken, and the cork is gone.
+sealable-component-on-examine-is-unsealed-crown-cap = The seal is broken, and the crown cap is bent.

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index aeabba5f5aa954d3f359d66d0e3955df2b2d2b97..a856e91611043cc8d854b27bba5f460ad1c07ebb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -15,8 +15,10 @@
       types:
         Blunt: 0
   - type: DnaSubstanceTrace
-  - type: Drink # Namesake. You are able to directly drink from this entity.
+  - type: Edible
+    edible: Drink # Namesake. This entity is a sort of cup you can drink directly from.
     solution: drink
+    destroyOnEmpty: false
   - type: Spillable
     solution: drink
   - type: MixableSolution

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 ccaf2987195d4fb2eabd2715144689bf475009f0..ec6bdf8002b5bfdff47d3fcddfec728a92e65e02 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: "sealable-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: "sealable-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: "sealable-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: "sealable-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: "sealable-component-on-examine-is-unsealed-crown-cap" # tell the player why it can't close
 
 - type: entity
   parent: [DrinkVisualsOpenable, DrinkBottleGlassSmallBaseFull]