cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some code fixes

This commit is contained in:
null 2024-06-08 20:37:53 +02:00
parent 27b6ccbb6a
commit 303e71d84c
No known key found for this signature in database
GPG Key ID: 212F05528FD678BE
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,8 +170,11 @@ public partial class ChatSystem
if (!_wordEmoteDict.TryGetValue(actionLower, out var emotes)) if (!_wordEmoteDict.TryGetValue(actionLower, out var emotes))
return; return;
if (!AllowedToUseEmote(uid, emote)) foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger
return; {
if (!AllowedToUseEmote(uid, emote))
return;
}
foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger
{ {

2
Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
View File

@ -36,7 +36,7 @@ public sealed class SpawnPointSystem : EntitySystem
if (args.DesiredSpawnPointType != SpawnPointType.Unset) if (args.DesiredSpawnPointType != SpawnPointType.Unset)
{ {
var isMatchingJob = spawnPoint.SpawnType == SpawnPointType.Job && 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) switch (args.DesiredSpawnPointType)
{ {