From 945a402d109ca5b5f5fd40fa86030da3bd37a787 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 8 Jan 2024 09:54:05 +0100 Subject: [PATCH] Make only advertise vendors say thanks for using (#23726) * :trollface: * :trollface: 2 --- Content.Server/VendingMachines/VendingMachineSystem.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; -- 2.51.2