diff --git a/Content.Server/_Honk/Cunt/CuntSystems.cs b/Content.Server/_Honk/Cunt/CuntSystems.cs index 1fcb2fb26b..7703679f0c 100644 --- a/Content.Server/_Honk/Cunt/CuntSystems.cs +++ b/Content.Server/_Honk/Cunt/CuntSystems.cs @@ -22,7 +22,7 @@ public sealed class CuntSystem : EntitySystem private void OnStartup(EntityUid uid, CuntableComponent component, ComponentStartup args) { - _solutionContainer.EnsureSolution(uid, "Cunt" , out _, 20); + _solutionContainer.EnsureSolution(uid, CuntableComponent.CuntSolutionName , out _, 50); } private void OnCunt(EntityUid uid, CuntableComponent component, ref EmoteEvent args) @@ -34,29 +34,27 @@ public sealed class CuntSystem : EntitySystem } } - public bool TryCunt(EntityUid uid, CuntableComponent? component = null) + public void TryCunt(EntityUid uid, CuntableComponent? component = null) { if (!Resolve(uid, ref component)) - return false; + return; - if(!_solutionContainer.TryGetSolution(uid,CuntableComponent.CuntSolutionName,out var solution)) - return false; + if(!_solutionContainer.TryGetSolution(uid,CuntableComponent.CuntSolutionName, out var solution)) + return; if (solution.Value != default) - return false; + return ; var cum = new Solution("Cunt", 5); _puddle.TrySpillAt(uid, cum, out _, false); _solutionContainer.SplitSolution(uid!, 50); - - return true; } public void GenCum(EntityUid uid, CuntableComponent? component = null) { if (!Resolve(uid, ref component)) - return ; + return; if (_solutionContainer.TryGetSolution(uid, CuntableComponent.CuntSolutionName, out var solution)) { diff --git a/Content.Shared/_Amour/InteractionPanel/InteractionPrototype.cs b/Content.Shared/_Amour/InteractionPanel/InteractionPrototype.cs index 7aafca8474..98f1325f62 100644 --- a/Content.Shared/_Amour/InteractionPanel/InteractionPrototype.cs +++ b/Content.Shared/_Amour/InteractionPanel/InteractionPrototype.cs @@ -2,7 +2,6 @@ using Content.Shared._Amour.InteractionPanel.Actions; using Content.Shared._Amour.InteractionPanel.Checks; using Robust.Shared.Audio; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; namespace Content.Shared._Amour.InteractionPanel; diff --git a/Resources/Prototypes/_Honk/Action/cunt.yml b/Resources/Prototypes/_Honk/Action/cunt.yml new file mode 100644 index 0000000000..6b2af2a421 --- /dev/null +++ b/Resources/Prototypes/_Honk/Action/cunt.yml @@ -0,0 +1,11 @@ +- type: emote + id: Squelch + buttonText: Кончать + chatMessages: [ кончает ] + chatTriggers: + - кончит + - кончает + - кончил + - кончила + - кончило + allowMenu: true diff --git a/Resources/Prototypes/_Honk/Reagents/cunt.yml b/Resources/Prototypes/_Honk/Reagents/cunt.yml index 1f32cc7247..4a86301bf7 100644 --- a/Resources/Prototypes/_Honk/Reagents/cunt.yml +++ b/Resources/Prototypes/_Honk/Reagents/cunt.yml @@ -5,7 +5,15 @@ physicalDesc: reagent-physical-desc-cunt recognizable: true flavor: cunt - color: "#AAAAAA" + color: "#FFFFFF" + metabolisms: + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:OrganType + type: Moth + - type: flavor id: cunt