diff --git a/Content.Server/_Amour/InteractionPanel/Interactions.cs b/Content.Server/_Amour/InteractionPanel/Interactions.cs index 2913784df7..a662a4ddca 100644 --- a/Content.Server/_Amour/InteractionPanel/Interactions.cs +++ b/Content.Server/_Amour/InteractionPanel/Interactions.cs @@ -1,10 +1,15 @@ using Content.Server._Amour.Animation; using Content.Server._Amour.Hole; +using Content.Server._Honk.Cunt; using Content.Server.Hands.Systems; using Content.Server.Standing; +using Content.Shared._Amour.Hole; using Content.Shared._Amour.InteractionPanel; +using Content.Shared._Honk.Cunt; using Content.Shared.Hands.Components; using Content.Shared.Movement.Pulling.Systems; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; namespace Content.Server._Amour.InteractionPanel; @@ -15,6 +20,8 @@ public sealed class Interactions : EntitySystem [Dependency] private readonly PullingSystem _pullingSystem = default!; [Dependency] private readonly HoleSystem _holeSystem = default!; [Dependency] private readonly HandsSystem _handsSystem = default!; + [Dependency] private readonly CuntSystem _cuntSystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/_Honk/Cunt/CuntSystems.cs b/Content.Server/_Honk/Cunt/CuntSystems.cs index 08e4edab67..1fcb2fb26b 100644 --- a/Content.Server/_Honk/Cunt/CuntSystems.cs +++ b/Content.Server/_Honk/Cunt/CuntSystems.cs @@ -1,15 +1,15 @@ using Content.Server.Chat.Systems; +using Content.Server.Fluids.EntitySystems; using Content.Shared._Honk.Cunt; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Fluids; -namespace Content.Server._Honk.Count; +namespace Content.Server._Honk.Cunt; // ДРД ИДИ НАХУЙ!!!!!!!!!!!!!!!!!!!!! public sealed class CuntSystem : EntitySystem { - [Dependency] private readonly SharedPuddleSystem _puddle = default!; + [Dependency] private readonly PuddleSystem _puddle = default!; //[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; @@ -22,7 +22,7 @@ public sealed class CuntSystem : EntitySystem private void OnStartup(EntityUid uid, CuntableComponent component, ComponentStartup args) { - _solutionContainer.EnsureSolution(uid, "Cunt" , out _); + _solutionContainer.EnsureSolution(uid, "Cunt" , out _, 20); } private void OnCunt(EntityUid uid, CuntableComponent component, ref EmoteEvent args) @@ -47,7 +47,7 @@ public sealed class CuntSystem : EntitySystem var cum = new Solution("Cunt", 5); - _puddle.TrySpillAt(uid, cum, out _); + _puddle.TrySpillAt(uid, cum, out _, false); _solutionContainer.SplitSolution(uid!, 50); return true; diff --git a/Resources/Audio/_Honk/Cunt/cunt.ogg b/Resources/Audio/_Honk/Cunt/cunt.ogg new file mode 100644 index 0000000000..008691f91f Binary files /dev/null and b/Resources/Audio/_Honk/Cunt/cunt.ogg differ diff --git a/Resources/Audio/_Honk/Cunt/ston.ogg b/Resources/Audio/_Honk/Cunt/ston.ogg new file mode 100644 index 0000000000..391450889d Binary files /dev/null and b/Resources/Audio/_Honk/Cunt/ston.ogg differ diff --git a/Resources/Locale/ru-RU/_amour/interactions/interaction.ftl b/Resources/Locale/ru-RU/_amour/interactions/interaction.ftl index 6c78b9e401..ce4765eaa4 100644 --- a/Resources/Locale/ru-RU/_amour/interactions/interaction.ftl +++ b/Resources/Locale/ru-RU/_amour/interactions/interaction.ftl @@ -108,3 +108,6 @@ interaction-butt-comb3 = проводя ладошкой по упругой п interaction-pull1 = робко схватил за ручки { $target } interaction-pull2 = подхватывает { $target } за руки interaction-pull3 = подхватывает { $target } за руки + +interaction-name-cum = Кончить +interaction-cum = кончает в { $target } diff --git a/Resources/Prototypes/_Amour/Interactions/interaction.yml b/Resources/Prototypes/_Amour/Interactions/interaction.yml index b8c69b11cd..73b5ebe1c6 100644 --- a/Resources/Prototypes/_Amour/Interactions/interaction.yml +++ b/Resources/Prototypes/_Amour/Interactions/interaction.yml @@ -372,3 +372,21 @@ - interaction-pull2 - interaction-pull3 group: Safe + +- type: interaction + id: Cum + checks: + - !type:CantInteractSelf + - !type:HasSmallDistance + beginningSound: + path: /Audio/_Honk/Cunt/cunt.ogg + beginningActions: + - !type:RequireAnimation + k0: 0 + k1: 0.1 + k2: 0.75 + k3: 0.25 + beginningMessages: + - interaction-cum + group: Danger + endTime: 2 diff --git a/Resources/Prototypes/_Amour/Interactions/interactionList.yml b/Resources/Prototypes/_Amour/Interactions/interactionList.yml index 96ff620fc4..88768b5e0a 100644 --- a/Resources/Prototypes/_Amour/Interactions/interactionList.yml +++ b/Resources/Prototypes/_Amour/Interactions/interactionList.yml @@ -23,3 +23,4 @@ - DrochDick - ItemFromButt - ItemFromVagina + - Cum