From 1f62f9e62d2f0d7e2e271ffe3522a47eef61ed20 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 26 Mar 2024 12:30:09 -0400 Subject: [PATCH] Stop Drink verb appearing if the solution can't be accessed. --- Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f41ca44437b1e6..49de654e4ac9c1 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -411,6 +411,10 @@ private void AddDrinkVerb(Entity entity, ref GetVerbsEvent(ev.User, out var stomachs, body)) return; + // Make sure the solution exists + if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solution)) + return; + // no drinking from living drinks, have to kill them first. if (_mobState.IsAlive(entity)) return;