diff --git a/Content.Server/_Honk/Cunt/CuntSystems.cs b/Content.Server/_Honk/Cunt/CuntSystems.cs index 1711c46e07..08e4edab67 100644 --- a/Content.Server/_Honk/Cunt/CuntSystems.cs +++ b/Content.Server/_Honk/Cunt/CuntSystems.cs @@ -1,30 +1,28 @@ using Content.Server.Chat.Systems; -using Content.Server.Chemistry.Containers.EntitySystems; -using Content.Server.Fluids.EntitySystems; using Content.Shared._Honk.Cunt; using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; -using Robust.Shared.Timing; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Fluids; -namespace Content.Server._Honk.Cunt; +namespace Content.Server._Honk.Count; +// ДРД ИДИ НАХУЙ!!!!!!!!!!!!!!!!!!!!! public sealed class CuntSystem : EntitySystem { - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedPuddleSystem _puddle = default!; + //[Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { - SubscribeLocalEvent(OnCunt); - SubscribeLocalEvent(OnStartup); - SubscribeLocalEvent(OnUnpaused); + SubscribeLocalEvent(OnCunt); + SubscribeLocalEvent(OnStartup); + SubscribeLocalEvent(OnUnpaused); } private void OnStartup(EntityUid uid, CuntableComponent component, ComponentStartup args) { - var cuntSolution = _solutionContainer.EnsureSolution(uid, CuntableComponent.CuntSolutionName); - cuntSolution.MaxVolume = 10; + _solutionContainer.EnsureSolution(uid, "Cunt" , out _); } private void OnCunt(EntityUid uid, CuntableComponent component, ref EmoteEvent args) @@ -41,14 +39,16 @@ public sealed class CuntSystem : EntitySystem if (!Resolve(uid, ref component)) return false; - if(!_solutionContainer.TryGetSolution(uid,CuntableComponent.CuntSolutionName,out var cuntSolution)) + if(!_solutionContainer.TryGetSolution(uid,CuntableComponent.CuntSolutionName,out var solution)) return false; - if(cuntSolution.Volume < 5) + if (solution.Value != default) return false; - _puddle.TrySpillAt(uid, cuntSolution, out _); - _solutionContainer.SplitSolution(uid,cuntSolution,50); + var cum = new Solution("Cunt", 5); + + _puddle.TrySpillAt(uid, cum, out _); + _solutionContainer.SplitSolution(uid!, 50); return true; } @@ -60,35 +60,37 @@ public sealed class CuntSystem : EntitySystem if (_solutionContainer.TryGetSolution(uid, CuntableComponent.CuntSolutionName, out var solution)) { - if (solution.AvailableVolume <= FixedPoint2.Zero) + if (solution.Value != default) return; var generated = new Solution("Cunt", 2); - _solutionContainer.TryAddSolution(uid, solution, generated); + _solutionContainer.AddSolution(uid!, generated); } } + + //Я хуй знает что оно делает //public override void Update(float frameTime) //{ // base.Update(frameTime); -// + // // var query = EntityQueryEnumerator(); - // while (query.MoveNext(out var uid, out var regen, out var manager)) - // { - // if (_timing.CurTime < regen.NextRegenTime) - // continue; + // while (query.MoveNext(out var uid, out var regen, out var manager)) + // { + // if (_timing.CurTime < regen.NextRegenTime) + // continue; - // regen.NextRegenTime = _timing.CurTime + regen.Duration; - // if (_solutionContainer.TryGetSolution(uid, CuntableComponent.CuntSolutionName, out var solution, manager)) - // { - // if (solution.AvailableVolume <= FixedPoint2.Zero) - // continue; -// - // var generated = new Solution("Cunt", 5); -// - // _solutionContainer.TryAddSolution(uid, solution, generated); - // } - // } + // regen.NextRegenTime = _timing.CurTime + regen.Duration; + // if (_solutionContainer.TryGetSolution(uid, CuntableComponent.CuntSolutionName, out var solution, manager)) + // { + // if (solution.AvailableVolume <= FixedPoint2.Zero) + // continue; + // + // var generated = new Solution("Cunt", 5); + // + // _solutionContainer.TryAddSolution(uid, solution, generated); + // } + // } //} private void OnUnpaused(EntityUid uid, CuntableComponent comp, ref EntityUnpausedEvent args) diff --git a/Resources/Prototypes/_Honk/Actions/cunt.yml b/Resources/Prototypes/_Honk/Actions/cunt.yml index ab71fcae72..6b2af2a421 100644 --- a/Resources/Prototypes/_Honk/Actions/cunt.yml +++ b/Resources/Prototypes/_Honk/Actions/cunt.yml @@ -1,6 +1,5 @@ - type: emote id: Squelch - category: Gesture buttonText: Кончать chatMessages: [ кончает ] chatTriggers: