tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19254

Browse Source 
* Fix emote chirps

* named args time
This commit is contained in:
metalgearsloth
2023-08-18 06:40:10 +10:00
committed by GitHub
parent 89f60a4ee6
commit 0a945a6803
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Chat/Systems/ChatSystem.Emote.cs
View File

@@ -66,7 +66,7 @@ public partial class ChatSystem
{ {
if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto)) if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
return; return;
TryEmoteWithChat(source, proto, range, hideLog, nameOverride, ignoreActionBlocker); TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker);
} }
/// <summary> /// <summary>
@@ -92,7 +92,7 @@ public partial class ChatSystem
{ {
// not all emotes are loc'd, but for the ones that are we pass in entity // not all emotes are loc'd, but for the ones that are we pass in entity
var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source)); var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source));
SendEntityEmote(source, action, range, nameOverride, false, hideLog, ignoreActionBlocker); SendEntityEmote(source, action, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
} }
// do the rest of emote event logic here // do the rest of emote event logic here

2
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -232,7 +232,7 @@ public sealed partial class ChatSystem : SharedChatSystem
SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker); SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker);
break; break;
case InGameICChatType.Emote: case InGameICChatType.Emote:
SendEntityEmote(source, message, range, nameOverride, hideLog, ignoreActionBlocker); SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
break; break;
} }
} }