Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ChatManager murder (#7337)

Browse Source
This commit is contained in:
mirrorcult
2022-03-30 22:21:58 -07:00
committed by GitHub
parent a11e8b676c
commit 70f0fffed2
16 changed files with 587 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Advertise/AdvertiseSystem.cs
View File

@@ -1,5 +1,6 @@
using System;
using Content.Server.Advertisements;
using Content.Server.Chat;
using Content.Server.Chat.Managers;
using Content.Server.Power.Components;
using Content.Server.VendingMachines;
@@ -16,8 +17,8 @@ namespace Content.Server.Advertise
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly ChatSystem _chat = default!;
private const float UpdateTimer = 5f;
@@ -60,7 +61,7 @@ namespace Content.Server.Advertise
return;
if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out AdvertisementsPackPrototype? advertisements))
_chatManager.EntitySay(advertise.Owner, Loc.GetString(_random.Pick(advertisements.Advertisements)), hideChat: true);
_chat.TrySendInGameICMessage(advertise.Owner, Loc.GetString(_random.Pick(advertisements.Advertisements)), InGameICChatType.Speak, true);
if(refresh)
RefreshTimer(uid, true, advertise);