From: iaada Date: Wed, 6 Aug 2025 16:43:47 +0000 (-0500) Subject: lint after losing a LocId in the merge X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=26509b879b19f11500e5b328c027939a6248fc5e;p=space-station-14.git 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 ab458746dd..d83252d842 100644 --- 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 eb5a3e367e..aeabba5f5a 100644 --- 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 6b215c5d69..9e3ddcb7bc 100644 --- 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 aefa55d67a..ccaf298719 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: "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]