diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 79aac8bcd7..4d3fc0b941 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Numerics; +using Content.Server.Advertise; using Content.Server.Cargo.Systems; using Content.Server.Chat.Systems; using Content.Server.Emp; @@ -386,8 +387,11 @@ namespace Content.Server.VendingMachines _throwingSystem.TryThrow(ent, direction, vendComponent.NonLimitedEjectForce); } - // Send message after dispensing - _chat.TrySendInGameICMessage(uid, Loc.GetString("vending-machine-thanks", ("name", Name(uid))), InGameICChatType.Speak, true); + // Only vendors that advertise will send message after dispensing + if (TryComp(uid, out var advertise)) + { + _chat.TrySendInGameICMessage(uid, Loc.GetString("vending-machine-thanks", ("name", Name(uid))), InGameICChatType.Speak, true); + } vendComponent.NextItemToEject = null; vendComponent.ThrowNextItem = false;