Nullable messydrinker tag (#40002)

init

diff --git a/Content.Shared/Nutrition/Components/MessyDrinkerComponent.cs b/Content.Shared/Nutrition/Components/MessyDrinkerComponent.cs
index ea145019c2c44f2822f2672d6315ad5a9a554a76..11342727994b2d7c73aa7b408e216936cb616e59 100644 (file)
--- a/Content.Shared/Nutrition/Components/MessyDrinkerComponent.cs
+++ b/Content.Shared/Nutrition/Components/MessyDrinkerComponent.cs
@@ -32,7 +32,7 @@ public sealed partial class MessyDrinkerComponent : Component
     /// For example, a spill-immune bottle.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public ProtoId<TagPrototype> SpillImmuneTag = "MessyDrinkerImmune";
+    public ProtoId<TagPrototype>? SpillImmuneTag = "MessyDrinkerImmune";
 
     [DataField, AutoNetworkedField]
     public LocId? SpillMessagePopup;

diff --git a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
index d75e7bf018863a0d5573a381dce5f3cbd6a4c220..7bfb7a5633de581a68874e773a5fbf1e3ae0c4a0 100644 (file)
--- a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
@@ -25,7 +25,7 @@ public sealed class MessyDrinkerSystem : EntitySystem
 
     private void OnIngested(Entity<MessyDrinkerComponent> ent, ref IngestingEvent ev)
     {
-        if (_tag.HasTag(ev.Food, ent.Comp.SpillImmuneTag))
+        if (ent.Comp.SpillImmuneTag != null && _tag.HasTag(ev.Food, ent.Comp.SpillImmuneTag.Value))
             return;
 
         // Cannot spill if you're being forced to drink.