From: iaada Date: Tue, 29 Jul 2025 23:03:03 +0000 (-0500) Subject: more solution status X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e58103bac643c7475e8563f1ea9437622db6d649;p=space-station-14.git more solution status --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index e445abb88c..d6ad3c65f9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -40,6 +40,8 @@ fillBaseName: icon- - type: ExaminableSolution # If you can see the fill levels, you can see the unit count solution: drink + - type: SolutionItemStatus # Remove when comp is uncommented on DrinkBase or DrinkVisualsFill is added as a base + solution: drink ## Misc Cups @@ -127,6 +129,8 @@ - HEAD quickEquip: false sprite: Clothing/Head/Hats/party_water_cup.rsi + - type: SolutionItemStatus # Remove when comp is uncommented on DrinkBase or DrinkVisualsFill is added as a base + solution: drink # Mugs - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index 427943a029..8c1029a9f4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -4,7 +4,7 @@ # Transformable container - normal glass - type: entity - parent: [DrinkBaseCup, DrinkBaseMaterialGlass] + parent: [DrinkBaseCup, DrinkBaseMaterialGlass] # todo parent to DrinkVisualsFillOverlay after in-hands are added id: DrinkGlass name: metamorphic glass description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom. @@ -38,6 +38,8 @@ - DrinkCup # Do these tags - DrinkGlass # even do anything? - type: TransformableContainer + - type: SolutionItemStatus # Remove when comp is uncommented on DrinkBase or DrinkVisualsFillOverlay is added + solution: drink - type: entity parent: DrinkGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index cb5d71665d..42bc056d37 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -147,6 +147,8 @@ mixOnInteract: false reactionTypes: - Shake + - type: SolutionItemStatus # Remove when comp is uncommented on DrinkBase + solution: drink - type: entity parent: [DrinkBase, DrinkBaseMaterialMetal] @@ -172,6 +174,8 @@ - type: PhysicalComposition materialComposition: Steel: 20 + - type: SolutionItemStatus # Remove when comp is uncommented on DrinkBase + solution: drink - type: entity parent: [DrinkBase, DrinkBaseMaterialStrongMetal, DrinkVisualsFill]