Merge branch 'Fansana:master' into master

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Floofstation CODEOWNERS
 
-* @Memeji @FoxxoTrystan
+* @Fansana @Memeji @FoxxoTrystan

Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs

@@ -136,9 +136,9 @@ public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null,
                 {
                     _xformSystem.AttachToGridOrMap(entity, xform);
 
-                    if (holder.PreviousDirection != Direction.Invalid && _xformQuery.TryGetComponent(xform.ParentUid, out var parentXform))
+                    if (holder.PreviousDirection != Direction.Invalid && gridUid != null && _xformQuery.TryGetComponent(gridUid, out var parentXform))
                     {
-                        var direction = holder.PreviousDirection.ToAngle();
+                        var direction = holder.CurrentDirection.ToAngle();
                         direction += _xformSystem.GetWorldRotation(parentXform);
                         _throwing.TryThrow(entity, direction.ToWorldVec() * 3f, 10f);
                     }

Resources/Changelog/Floof.yml

@@ -1090,3 +1090,40 @@ Entries:
   id: 146
   time: '2024-09-28T11:51:55.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/215
+- author: neuPanda
+  changes:
+    - type: Add
+      message: Kiss an Lick
+  id: 147
+  time: '2024-09-29T02:41:17.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/179
+- author: Fansana
+  changes:
+    - type: Tweak
+      message: nerf reagent slimes
+  id: 148
+  time: '2024-09-29T17:16:22.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/218
+- author: fenndragon
+  changes:
+    - type: Tweak
+      message: 'Tweaked spawn rates of Various Ventcritter Spawn events '
+  id: 149
+  time: '2024-09-29T18:26:23.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/219
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        Loadouts have been expanded with leashes, remote signalers, shock
+        collars, and a wide variety of lewd items.
+  id: 150
+  time: '2024-10-01T16:14:39.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/217
+- author: Fansana
+  changes:
+    - type: Fix
+      message: Fix the disposal pipe ejection to space and after pipe bends.
+  id: 151
+  time: '2024-10-01T17:33:39.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/220

Resources/Locale/en-US/Floof/loadouts/categories.ftl

@@ -0,0 +1 @@
+loadout-category-ItemsLewd = Lewd

Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl

@@ -6,3 +6,5 @@ character-item-group-LoadoutNeck2 = Civilian Neckwear
 character-item-group-LoadoutOuter2 = Civilian Outerwear
 character-item-group-LoadoutShoes2 = Civilian Shoes
 character-item-group-LoadoutUniformsCivilian2 = Civilian Uniforms
+character-item-group-LoadoutFun = Fun
+character-item-group-LoadoutLewd = Lewd

Resources/Locale/en-US/Floof/mood/mood.ftl

@@ -0,0 +1,3 @@
+mood-effect-BeingKissed = That kiss was delightful.
+
+mood-effect-BeingLicked = I've been Licked!

Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl

@@ -0,0 +1,11 @@
+interaction-Kiss-name = Kiss
+interaction-Kiss-description = A kiss melts the pains away.
+interaction-Kiss-success-self-popup = You kiss {THE($target)}.
+interaction-Kiss-success-target-popup = {THE($user)} kisses you.
+interaction-Kiss-success-others-popup = {THE($user)} kisses {THE($target)}.
+
+interaction-Lick-name = Lick
+interaction-Lick-description = Lick your co-worker, what HR?.
+interaction-Lick-success-self-popup = You lick {THE($target)}.
+interaction-Lick-success-target-popup = {THE($user)} licks you.
+interaction-Lick-success-others-popup = {THE($user)} licks {THE($target)}.