juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Upstream sync (#1509)" (#1510)

Browse Source 
This reverts commit a35c718734.
This commit is contained in:
Red
2025-07-08 11:59:51 +03:00
committed by GitHub
parent a35c718734
commit ae077c3971
935 changed files with 9384 additions and 19938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Shared/_CP14/MagicWeakness/CP14SharedMagicWeaknessSystem.cs
View File

@@ -3,13 +3,16 @@ using Content.Shared.Bed.Sleep;
using Content.Shared.Damage;
using Content.Shared.IdentityManagement;
using Content.Shared.Popups;
using Content.Shared.StatusEffectNew;
using Content.Shared.StatusEffect;
namespace Content.Shared._CP14.MagicWeakness;
public abstract class CP14SharedMagicWeaknessSystem : EntitySystem
{
[Dependency] private readonly SharedStatusEffectsSystem _statusEffects = default!;
[ValidatePrototypeId<StatusEffectPrototype>]
private const string StatusEffectKey = "ForcedSleep";
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
[Dependency] private readonly DamageableSystem _damageable = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -33,10 +36,10 @@ public abstract class CP14SharedMagicWeaknessSystem : EntitySystem
ent,
ent,
PopupType.LargeCaution);
_statusEffects.TryAddStatusEffectDuration(
ent,
SleepingSystem.StatusEffectForcedSleeping,
TimeSpan.FromSeconds(ent.Comp.SleepPerEnergy * (float)args.BurnOutEnergy));
_statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(ent,
StatusEffectKey,
TimeSpan.FromSeconds(ent.Comp.SleepPerEnergy * (float)args.BurnOutEnergy),
false);
}
}
@@ -49,10 +52,10 @@ public abstract class CP14SharedMagicWeaknessSystem : EntitySystem
ent,
ent,
PopupType.LargeCaution);
_statusEffects.TryAddStatusEffectDuration(
ent,
SleepingSystem.StatusEffectForcedSleeping,
TimeSpan.FromSeconds(ent.Comp.SleepPerEnergy * (float)args.OverloadEnergy));
_statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(ent,
StatusEffectKey,
TimeSpan.FromSeconds(ent.Comp.SleepPerEnergy * (float)args.OverloadEnergy),
false);
}
}