diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs index 8d8ab442b6..837b00b3ad 100644 --- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs +++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs @@ -170,8 +170,11 @@ public partial class ChatSystem if (!_wordEmoteDict.TryGetValue(actionLower, out var emotes)) return; - if (!AllowedToUseEmote(uid, emote)) - return; + foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger + { + if (!AllowedToUseEmote(uid, emote)) + return; + } foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger { diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs index c9ea683f0c..ca41f5ce4e 100644 --- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs +++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs @@ -36,7 +36,7 @@ public sealed class SpawnPointSystem : EntitySystem if (args.DesiredSpawnPointType != SpawnPointType.Unset) { var isMatchingJob = spawnPoint.SpawnType == SpawnPointType.Job && - (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype); + (args.Job == null || spawnPoint.Job?.Id == args.Job.Prototype); switch (args.DesiredSpawnPointType) {