- fix: Fixes.

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, profile.Height, // AMOUR EDIT
-                    markings, genitals.ToList() // Amour edit
+                    genitals.ToList() // Amour edit
                 ),
                 clothing,
                 backpack,
@@ -1737,4 +1737,4 @@ namespace Content.Server.Database
             public abstract ValueTask DisposeAsync();
         }
     }
-}
+}

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,
+            BreakOnMove = true,
-            BreakOnUserMove = true,
             BreakOnHandChange = true
         });
     }

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

Resources/Prototypes/_White/Catalog/VendingMachines/Goodbyes/Kink.yml

@@ -0,0 +1,4 @@
+- type: messagePack
+  id: KinkMachineGoodbyes
+  messages:
+    - kink-machine-thanks

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