From 0bd8ad43ab2f364053d83a272412a6e261061412 Mon Sep 17 00:00:00 2001 From: iaada Date: Wed, 6 Aug 2025 12:52:18 -0500 Subject: [PATCH] fixed conflicts --- .../en-US/nutrition/components/sealable-component.ftl | 2 ++ .../Entities/Objects/Consumable/Drinks/drinks_base.yml | 4 +++- .../Objects/Consumable/Drinks/drinks_bottles_glass.yml | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl index e826e174ef..be37b91ce2 100644 --- 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 aeabba5f5a..a856e91611 100644 --- 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 ccaf298719..ec6bdf8002 100644 --- 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] -- 2.51.2