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

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2025-01-12 00:21:09 +03:00
parent 3052f9c15c cf21b8b7b1
commit 5e227c9100
13 changed files with 250 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs
View File

@@ -7,6 +7,7 @@ using Content.Server._White.AspectsSystem.Base;
using Content.Server.GameTicking.Components;
using Content.Shared.Mind.Components;
using Robust.Shared.Random;
using Content.Server._White.Accent.BomzhAccent;
namespace Content.Server._White.AspectsSystem.Aspects;
@@ -69,6 +70,8 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
Moth,
French,
Gnome,
Bomzh,
Frontallisp
}
private void ApplyRandomAccent(EntityUid uid)
@@ -100,7 +103,7 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
case AccentType.Pirate:
EntityManager.EnsureComponent<PirateAccentComponent>(uid);
break;
case AccentType.Russian:
case AccentType.Russian: // Untranslated
EntityManager.EnsureComponent<RussianAccentComponent>(uid);
break;
case AccentType.OwO:
@@ -127,12 +130,18 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
case AccentType.Moth:
EntityManager.EnsureComponent<MothAccentComponent>(uid);
break;
case AccentType.French:
case AccentType.French: // Untranslated
EntityManager.EnsureComponent<FrenchAccentComponent>(uid);
break;
case AccentType.Gnome:
EntityManager.EnsureComponent<GnomeAccentComponent>(uid);
break;
case AccentType.Bomzh:
EntityManager.EnsureComponent<BomzhAccentComponent>(uid);
break;
case AccentType.Frontallisp:
EntityManager.EnsureComponent<FrontalLispComponent>(uid);
break;
}
}

11
Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
View File

@@ -72,8 +72,16 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
{
base.Started(uid, component, gameRule, args);
if (component.TargetStation == null || component.IsBlocked || IsDisabled)
if (component.TargetStation == null)
{
ForceEndSelf(uid, gameRule);
_adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Target Station is missing");
return;
}
if (component.IsBlocked || IsDisabled)
{
DeclineERT(component.TargetStation.Value);
ForceEndSelf(uid, gameRule);
_adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Event disabled");
return;
@@ -82,6 +90,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
if (_recruitment.GetEventSpawners(ERTRecruitmentRuleComponent.EventName).Count() < component.MinPlayers)
{
DeclineERT(component.TargetStation.Value);
ForceEndSelf(uid, gameRule);
_adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Not enough spawners");
return;
}