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

Merge branch 'master' into tweakssss

Browse Source
This commit is contained in:
Aviu00
2024-08-06 10:29:02 +03:00
parent c719eb56e0 3cad3721a5
commit c7f9bc5e70
21 changed files with 157 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/IoC/ServerContentIoC.cs
View File

@@ -68,7 +68,12 @@ namespace Content.Server.IoC
IoCManager.Register<DiscordWebhook>();
IoCManager.Register<ServerDbEntryManager>();
IoCManager.Register<ISharedPlaytimeManager, PlayTimeTrackingManager>();
#if FULL_RELEASE
IoCManager.Register<IPlayTimeTrackingManager, GlobalPlayTimeTrackingManager>();
#else
IoCManager.Register<IPlayTimeTrackingManager, PlayTimeTrackingManager>();
#endif
// WD-EDIT
IoCManager.Register<SponsorsManager>();

38
Content.Server/Medical/DefibrillatorSystem.cs
View File

@@ -7,8 +7,12 @@ using Content.Server.Ghost;
using Content.Server.Popups;
using Content.Server.PowerCell;
using Content.Server.Traits.Assorted;
using Content.Shared._White.Item.DelayedKnockdown;
using Content.Shared.Damage;
using Content.Shared.Damage.Components;
using Content.Shared.Damage.Events;
using Content.Shared.DoAfter;
using Content.Shared.Emag.Systems;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Components;
using Content.Shared.Interaction.Events;
@@ -20,6 +24,8 @@ using Content.Shared.Mobs.Systems;
using Content.Shared.PowerCell;
using Content.Shared.Timing;
using Content.Shared.Toggleable;
using Content.Shared.Weapons.Melee;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Timing;
@@ -54,8 +60,25 @@ public sealed class DefibrillatorSystem : EntitySystem
SubscribeLocalEvent<DefibrillatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
SubscribeLocalEvent<DefibrillatorComponent, StaminaDamageOnHitAttemptEvent>(OnStaminaHitAttempt); // WD
}
// WD START
private void OnStaminaHitAttempt(Entity<DefibrillatorComponent> ent, ref StaminaDamageOnHitAttemptEvent args)
{
var (uid, comp) = ent;
if (comp.Enabled && _powerCell.TryUseActivatableCharge(uid))
{
if (!_powerCell.HasActivatableCharge(uid))
TryDisable(uid, comp);
return;
}
args.Cancelled = true;
}
// WD END
private void OnUseInHand(EntityUid uid, DefibrillatorComponent component, UseInHandEvent args)
{
if (args.Handled || !TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
@@ -159,8 +182,8 @@ public sealed class DefibrillatorSystem : EntitySystem
if (!_powerCell.HasActivatableCharge(uid, user: user))
return false;
if (_mobState.IsAlive(target, mobState))
return false;
// if (_mobState.IsAlive(target, mobState))
// return false;
return true;
}
@@ -177,6 +200,7 @@ public sealed class DefibrillatorSystem : EntitySystem
return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
uid, target, uid)
{
BreakOnMove = user == target, // WD EDIT
BlockDuplicate = true,
BreakOnHandChange = true,
NeedHand = true
@@ -206,7 +230,13 @@ public sealed class DefibrillatorSystem : EntitySystem
ICommonSession? session = null;
var dead = true;
if (_rotting.IsRotten(target))
// WD EDIT START
var alive = false;
if (_mobState.IsAlive(target))
{
alive = true;
}
else if (_rotting.IsRotten(target)) // WD EDIT END
{
_chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
InGameICChatType.Speak, true);
@@ -246,7 +276,7 @@ public sealed class DefibrillatorSystem : EntitySystem
}
}
var sound = dead || session == null
var sound = !alive && (dead || session == null) // WD EDIT
? component.FailureSound
: component.SuccessSound;
_audio.PlayPvs(sound, uid);

2
Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
View File

@@ -54,7 +54,7 @@ public delegate void CalcPlayTimeTrackersCallback(ICommonSession player, HashSet
/// Operations like refreshing and sending play time info to clients are deferred until the next frame (note: not tick).
/// </para>
/// </remarks>
public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
public sealed class PlayTimeTrackingManager : IPlayTimeTrackingManager, ISharedPlaytimeManager
{
[Dependency] private readonly IServerDbManager _db = default!;
[Dependency] private readonly IServerNetManager _net = default!;

5
Content.Shared/Medical/DefibrillatorComponent.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Damage;
using Content.Shared.DoAfter;
using Content.Shared.Whitelist;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
@@ -86,6 +87,10 @@ public sealed partial class DefibrillatorComponent : Component
[ViewVariables(VVAccess.ReadWrite), DataField("readySound")]
public SoundSpecifier? ReadySound = new SoundPathSpecifier("/Audio/Items/Defib/defib_ready.ogg");
// WD EDIT
[DataField]
public EntityWhitelist? EmaggedAttackWhitelist;
}
[Serializable, NetSerializable]

5
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
View File

@@ -27,6 +27,7 @@ public sealed partial class MeleeWeaponComponent : Component
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField]
[AutoNetworkedField] // WD EDIT
public bool Hidden;
/// <summary>
@@ -75,10 +76,10 @@ public sealed partial class MeleeWeaponComponent : Component
[ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
public bool CanMiss;
[DataField]
[DataField, AutoNetworkedField]
public EntityWhitelist? AttackWhitelist;
[DataField]
[DataField, AutoNetworkedField]
public EntityWhitelist? AttackBlacklist;
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]

50
Content.Shared/_White/Item/DefibEmagSystem.cs Normal file
View File

@@ -0,0 +1,50 @@
using Content.Shared._White.Item.DelayedKnockdown;
using Content.Shared.Damage;
using Content.Shared.Damage.Components;
using Content.Shared.Emag.Systems;
using Content.Shared.Medical;
using Content.Shared.Weapons.Melee;
using Robust.Shared.Audio;
namespace Content.Shared._White.Item;
public sealed class DefibEmagSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<DefibrillatorComponent, GotEmaggedEvent>(OnEmag);
}
private void OnEmag(Entity<DefibrillatorComponent> ent, ref GotEmaggedEvent args)
{
var (uid, comp) = ent;
comp.ZapDamage = 55;
comp.ZapDelay = TimeSpan.FromSeconds(1);
comp.WritheDuration = TimeSpan.FromSeconds(6);
var meleeWeapon = new MeleeWeaponComponent
{
Hidden = true,
AttackRate = 0.2f,
CanHeavyAttack = false,
AttackWhitelist = comp.EmaggedAttackWhitelist,
EquipCooldown = 1f,
Damage = new DamageSpecifier()
};
var delayedKnockdown = new DelayedKnockdownOnHitComponent
{
Delay = TimeSpan.Zero,
KnockdownTime = TimeSpan.FromSeconds(1.5)
};
var staminaDamage = new StaminaDamageOnHitComponent
{
Damage = 60f,
Sound = new SoundCollectionSpecifier("sparks")
};
AddComp(uid, meleeWeapon, true);
AddComp(uid, delayedKnockdown, true);
AddComp(uid, staminaDamage, true);
args.Handled = true;
}
}

11
Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs
View File

@@ -26,6 +26,8 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem
{
var jitterTime = ent.Comp.JitterTime;
var stutterTime = ent.Comp.StutterTime;
var delay = ent.Comp.Delay;
var knockdownTime = ent.Comp.KnockdownTime;
foreach (var (uid, _) in args.HitList)
{
if (!TryComp(uid, out StatusEffectsComponent? statusEffects))
@@ -38,12 +40,17 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem
_jitter.DoJitter(uid, jitterTime, true, status: statusEffects);
if (stutterTime > TimeSpan.Zero)
_stutter.DoStutter(uid, stutterTime, true, statusEffects);
if (delay <= TimeSpan.Zero)
{
_stun.TryKnockdown(uid, knockdownTime, true, statusEffects);
continue;
}
if (HasComp<KnockedDownComponent>(uid))
continue;
var delayedKnockdown = EnsureComp<DelayedKnockdownComponent>(uid);
delayedKnockdown.KnockdownTime = TimeSpan.FromSeconds(Math.Max(ent.Comp.KnockdownTime.TotalSeconds,
delayedKnockdown.KnockdownTime = TimeSpan.FromSeconds(Math.Max(knockdownTime.TotalSeconds,
delayedKnockdown.KnockdownTime.TotalSeconds));
var knockdownMoment = _timing.CurTime + ent.Comp.Delay;
var knockdownMoment = _timing.CurTime + delay;
if (knockdownMoment < delayedKnockdown.KnockdownMoment)
delayedKnockdown.KnockdownMoment = knockdownMoment;
}

26
Resources/Changelog/ChangelogWhite.yml
View File

@@ -7811,3 +7811,29 @@
id: 465
time: '2024-08-04T13:54:10.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/562
- author: Aviu
changes:
- message: "\u0414\u0435\u0444\u0438\u0431\u0430\u043C\u0438 \u043C\u043E\u0436\u043D\
\u043E \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0438\u0442\u044C \u0436\u0438\
\u0432\u044B\u0445."
type: Add
- message: "\u0414\u0435\u0444\u0438\u0431\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
\ \u043C\u043E\u0436\u043D\u043E \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044C\
, \u044D\u0442\u043E \u0434\u0430\u0441\u0442 \u0438\u043C \u0432\u043E\u0437\
\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0431\u0438\u0442\u044C \u0432\
\ \u0431\u043E\u0435\u0432\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435\
\ \u0440\u0430\u0437 \u0432 5 \u0441\u0435\u043A\u0443\u043D\u0434, \u043D\u0430\
\u043D\u043E\u0441\u044F 60 \u0441\u0442\u0430\u043C\u0438\u043D\u044B \u0438\
\ \u0440\u043E\u043D\u044F\u044F \u043D\u0430 \u043F\u043E\u043B \u043D\u0430\
\ 1.5 \u0441\u0435\u043A\u0443\u043D\u0434\u044B. \u0422\u0430\u043A\u0436\u0435\
\ \u0443\u0440\u043E\u043D \u043F\u0440\u0438 \u0443\u0434\u0430\u0440\u0435\
\ \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u043C \u0434\u0435\u0444\u0438\
\u0431\u043E\u043C \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
\u0442\u0441\u044F \u0434\u043E 55, \u0432\u0440\u0435\u043C\u044F \u0441\u0442\
\u0430\u043D\u0430 \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
\u0442\u0441\u044F \u0434\u043E 6, \u0430 \u043A\u0434 \u0443\u043C\u0435\u043D\
\u044C\u0448\u0430\u0435\u0442\u0441\u044F \u0434\u043E 1."
type: Add
id: 466
time: '2024-08-05T13:39:31.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/567

3
Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
View File

@@ -35,6 +35,9 @@
zapHeal:
types:
Asphyxiation: -40
emaggedAttackWhitelist:
components:
- Stamina
- type: DoAfter
- type: UseDelay
- type: StaticPrice

2
Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobSalvageSpecialist
time: 9999999999 # 15 hours 54000
time: 54000 # 15 hours
# Head

4
Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobClown
time: 9999999999 # 30 hours as clown required to ascend 108000
time: 108000 # 30 hours as clown required to ascend
- type: loadoutEffectGroup # WD
id: MedalClownTimer
@@ -15,7 +15,7 @@
requirement:
!type:RoleTimeRequirement
role: JobClown
time: 9999999999 # 10 hours 36000
time: 36000 # 10 hours
# Head
- type: itemLoadout

2
Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobJanitor
time: 9999999999 # 10 hours 36000
time: 36000 # 10 hours
# Head
- type: itemLoadout

2
Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobPassenger
time: 9999999999 #10 hrs, silly reward for people who play passenger a lot 36000
time: 36000 #10 hrs, silly reward for people who play passenger a lot
# Face
- type: itemLoadout

2
Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobHeadOfPersonnel
time: 9999999999 #15 hrs, special reward for HoP mains 54000
time: 54000 #15 hrs, special reward for HoP mains
# Jumpsuit
- type: itemLoadout

6
Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
View File

@@ -6,17 +6,17 @@
requirement:
!type:RoleTimeRequirement
role: JobAtmosphericTechnician
time: 9999999999 #6 hrs 21600
time: 21600 #6 hrs
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobStationEngineer
time: 9999999999 #6 hrs 21600
time: 21600 #6 hrs
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Engineering
time: 9999999999 # 60 hrs 216000
time: 216000 # 60 hrs
# Head
- type: itemLoadout

6
Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
View File

@@ -6,17 +6,17 @@
requirement:
!type:RoleTimeRequirement
role: JobChemist
time: 9999999999 #6 hrs 21600
time: 21600 #6 hrs
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobMedicalDoctor
time: 9999999999 #6 hrs 21600
time: 21600 #6 hrs
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Medical
time: 9999999999 # 60 hrs 216000
time: 216000 # 60 hrs
# Head
- type: itemLoadout

2
Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:DepartmentTimeRequirement
department: Science
time: 9999999999 #60 hrs 216000
time: 216000 #60 hrs
# Head

4
Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
View File

@@ -6,12 +6,12 @@
requirement:
!type:RoleTimeRequirement
role: JobWarden
time: 9999999999 #6 hrs 21600
time: 21600 #6 hrs
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Security
time: 9999999999 # 60 hrs 216000
time: 216000 # 60 hrs
# Head
- type: itemLoadout

2
Resources/Prototypes/Loadouts/Jobs/common.yml
View File

@@ -7,7 +7,7 @@
requirement:
!type:RoleTimeRequirement
role: JobPassenger
time: 9999999999 # 50 hours 180000
time: 180000 # 50 hours
# Eyes

4
Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
View File

@@ -6,7 +6,7 @@
requirement:
!type:RoleTimeRequirement
role: JobLibrarian
time: 9999999999 # 1 hour of being the biggest nerd on the station 3600
time: 3600 # 1 hour of being the biggest nerd on the station
- type: loadoutEffectGroup
id: JensenTimer
@@ -15,7 +15,7 @@
requirement:
!type:DepartmentTimeRequirement
department: Cargo
time: 9999999999 #5 hours of being a space trucker 18000
time: 18000 #5 hours of being a space trucker
# Basic options
# Glasses

3
Resources/migration.yml
View File

@@ -269,3 +269,6 @@ ComfyChairCargo: BrownComfyChair
ComfyChairService: GreenComfyChair
BoxTrashbag: TrashBag
# 2024-08-05 WD
OmntnsHammer: JudgeHammer