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

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-07-26 21:32:42 +03:00
parent be8545d181 2e0704bb13
commit 53e4d2bfe5
790 changed files with 5278 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/_White/Explosion/TriggerOnLandComponent.cs
View File

@@ -4,5 +4,5 @@
public sealed partial class TriggerOnLandComponent : Component
{
[DataField]
public float Delay = 0.3f;
public float Delay = 1f;
}

35
Content.Server/_White/WeaponModules/WeaponModulesSystem.cs
View File

@@ -12,7 +12,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{
protected static readonly Dictionary<string, Enum> Slots = new()
{
{ "handguard_module", ModuleVisualState.HandGuardModule }, { "barrel_module", ModuleVisualState.BarrelModule }, { "aim_module", ModuleVisualState.AimModule }
{ "handguard_module", ModuleVisualState.HandGuardModule }, { "barrel_module", ModuleVisualState.BarrelModule }, { "aim_module", ModuleVisualState.AimModule }, { "shutter_module", ModuleVisualState.ShutterModule }
};
[Dependency] private readonly PointLightSystem _lightSystem = default!;
@@ -40,6 +40,9 @@ public sealed class WeaponModulesSystem : EntitySystem
SubscribeLocalEvent<AimModuleComponent, EntGotInsertedIntoContainerMessage>(EightAimModuleOnInsert);
SubscribeLocalEvent<AimModuleComponent, EntGotRemovedFromContainerMessage>(EightAimModuleOnEject);
SubscribeLocalEvent<ShutterModuleComponent, EntGotInsertedIntoContainerMessage>(ShutterModuleOnInsert);
SubscribeLocalEvent<ShutterModuleComponent, EntGotRemovedFromContainerMessage>(ShutterModuleOnEject);
}
private bool TryInsertModule(EntityUid module, EntityUid weapon, BaseModuleComponent component,
@@ -170,6 +173,22 @@ public sealed class WeaponModulesSystem : EntitySystem
EnsureComp<TelescopeComponent>(weapon).Divisor = component.Divisor;
}
private void ShutterModuleOnInsert(EntityUid module, ShutterModuleComponent component, EntGotInsertedIntoContainerMessage args)
{
EntityUid weapon = args.Container.Owner;
if (!TryComp<GunComponent>(weapon, out var gunComp)) return;
if(!TryInsertModule(module, weapon, component, args.Container.ID, out var weaponModulesComponent))
return;
if (!TryComp<BallisticAmmoProviderComponent>(weapon, out var ballisticAmmo))
return;
ballisticAmmo.Whitelist?.Tags?.Add(component.Tag);
Dirty(weapon, ballisticAmmo);
}
#endregion
#region EjectModules
@@ -239,5 +258,19 @@ public sealed class WeaponModulesSystem : EntitySystem
RemComp<TelescopeComponent>(weapon);
}
private void ShutterModuleOnEject(EntityUid module, ShutterModuleComponent component, EntGotRemovedFromContainerMessage args)
{
EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args.Container.ID, out var weaponModulesComponent))
return;
if (!TryComp<BallisticAmmoProviderComponent>(weapon, out var ballisticAmmo))
return;
ballisticAmmo.Whitelist?.Tags?.Remove(component.Tag);
Dirty(weapon, ballisticAmmo);
}
#endregion
}

7
Content.Server/_White/Wizard/WizardRuleSystem.cs
View File

@@ -75,6 +75,13 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
_sawmill = _logManager.GetSawmill("Wizard");
}
protected override void Added(EntityUid uid, WizardRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
{
base.Added(uid, component, gameRule, args);
gameRule.MinPlayers = component.MinPlayers;
}
private void OnObjectivesTextGetInfo(Entity<WizardRuleComponent> ent, ref ObjectivesTextGetInfoEvent args)
{
args.Minds = ent.Comp.WizardMinds;