From ba8a1884a245d768915ac4206957b3b1beab7331 Mon Sep 17 00:00:00 2001
From: Aviu00 <aviu00@protonmail.com>
Date: Fri, 3 May 2024 14:56:23 +0300
Subject: [PATCH] - fix: Fixes.

---
 Content.Server/Database/ServerDbBase.cs              |  6 +++---
 .../InteractionPanel/InteractionPanelSystem.cs       | 12 +-----------
 .../Catalog/VendingMachines/Advertisements/Kink.yml  |  6 ++----
 .../_White/Catalog/VendingMachines/Goodbyes/Kink.yml |  4 ++++
 .../Structures/Machines/vending_machines.yml         |  4 +++-
 5 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100644 Resources/Prototypes/_White/Catalog/VendingMachines/Goodbyes/Kink.yml

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 2177440bf2..e6d3b880b7 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -251,8 +251,8 @@ namespace Content.Server.Database
                     Color.FromHex(profile.FacialHairColor),
                     Color.FromHex(profile.EyeColor),
                     Color.FromHex(profile.SkinColor),
-                    profile.Height, // AMOUR EDIT
-                    markings, genitals.ToList() // Amour edit
+                    markings, profile.Height, // AMOUR EDIT
+                    genitals.ToList() // Amour edit
                 ),
                 clothing,
                 backpack,
@@ -1737,4 +1737,4 @@ namespace Content.Server.Database
             public abstract ValueTask DisposeAsync();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs b/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs
index a674258365..01758b5ad6 100644
--- a/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs
+++ b/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs
@@ -1,34 +1,25 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.Access.Systems;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.DoAfter;
 using Content.Server.EUI;
-using Content.Shared._Amour.Hole;
 using Content.Shared._Amour.InteractionPanel;
 using Content.Shared._Amour.InteractionPanel.Checks;
-using Content.Shared._White.GhostRecruitment;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Carrying;
 using Content.Shared.Chat;
 using Content.Shared.DoAfter;
-using Content.Shared.Emoting;
-using Content.Shared.Fluids;
 using Content.Shared.Humanoid;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
-using Content.Shared.Random.Helpers;
 using Content.Shared.Verbs;
 using Robust.Server.Audio;
 using Robust.Server.Player;
-using Robust.Shared.Audio;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
 namespace Content.Server._Amour.InteractionPanel;
@@ -163,8 +154,7 @@ public sealed class InteractionPanelSystem : EntitySystem
             )
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnHandChange = true
         });
     }
diff --git a/Resources/Prototypes/_White/Catalog/VendingMachines/Advertisements/Kink.yml b/Resources/Prototypes/_White/Catalog/VendingMachines/Advertisements/Kink.yml
index 4c21e47921..6556e065f2 100644
--- a/Resources/Prototypes/_White/Catalog/VendingMachines/Advertisements/Kink.yml
+++ b/Resources/Prototypes/_White/Catalog/VendingMachines/Advertisements/Kink.yml
@@ -1,7 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: KinkMachineAds
-  advertisements:
+  messages:
     - advertisement-kink-1
     - advertisement-kink-2
-  thankyous:
-    - kink-machine-thanks
diff --git a/Resources/Prototypes/_White/Catalog/VendingMachines/Goodbyes/Kink.yml b/Resources/Prototypes/_White/Catalog/VendingMachines/Goodbyes/Kink.yml
new file mode 100644
index 0000000000..422ad94e95
--- /dev/null
+++ b/Resources/Prototypes/_White/Catalog/VendingMachines/Goodbyes/Kink.yml
@@ -0,0 +1,4 @@
+- type: messagePack
+  id: KinkMachineGoodbyes
+  messages:
+    - kink-machine-thanks
diff --git a/Resources/Prototypes/_White/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_White/Entities/Structures/Machines/vending_machines.yml
index 1704a241b4..89d770cd55 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Machines/vending_machines.yml
@@ -11,9 +11,11 @@
       offState: off
       brokenState: broken
       normalState: normal-unshaded
-      ejectDelay: 5
+      ejectDelay: 1.9
     - type: Advertise
       pack: KinkMachineAds
+    - type: SpeakOnUIClosed
+      pack: KinkMachineGoodbyes
     - type: Speech
     - type: Sprite
       sprite: White/Structures/Machines/VendingMachines/kink.rsi