From a74f7acab9849d830005d6918d3b8015932195b1 Mon Sep 17 00:00:00 2001
From: FloofStation Changelogs
 <175611579+Floof-Station-Bot@users.noreply.github.com>
Date: Tue, 29 Oct 2024 22:10:43 +0000
Subject: [PATCH 1/4] Automatic Changelog Update (#306)

---
 Resources/Changelog/Floof.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
index 74d1947d46f..f4ced7af7b2 100644
--- a/Resources/Changelog/Floof.yml
+++ b/Resources/Changelog/Floof.yml
@@ -1291,3 +1291,12 @@ Entries:
   id: 173
   time: '2024-10-29T14:42:16.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/302
+- author: neuPanda
+  changes:
+    - type: Remove
+      message: Rape from law as it is a rules violation.
+    - type: Remove
+      message: Sexual Assault/Harassment from law as it is a rules violation.
+  id: 174
+  time: '2024-10-29T22:10:16.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/306

From 5f8d06f59c778d8bb27fc2013c0d7f369db18b71 Mon Sep 17 00:00:00 2001
From: FloofStation Changelogs
 <175611579+Floof-Station-Bot@users.noreply.github.com>
Date: Tue, 29 Oct 2024 23:51:53 +0000
Subject: [PATCH 2/4] Automatic Changelog Update (#303)

---
 Resources/Changelog/Floof.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
index f4ced7af7b2..cd806bd5fd7 100644
--- a/Resources/Changelog/Floof.yml
+++ b/Resources/Changelog/Floof.yml
@@ -1300,3 +1300,10 @@ Entries:
   id: 174
   time: '2024-10-29T22:10:16.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/306
+- author: Memeji
+  changes:
+    - type: Remove
+      message: Removed Gax from the map pool.
+  id: 175
+  time: '2024-10-29T23:51:26.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/303

From b24843d55e8a0261515aa9a47f043cb139d83361 Mon Sep 17 00:00:00 2001
From: fenndragon <fenndragon@gmail.com>
Date: Wed, 30 Oct 2024 14:38:58 -0600
Subject: [PATCH 3/4] Update presets.yml

---
 Resources/Prototypes/Store/presets.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 47768b68ec3..01c154f77e6 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -8,6 +8,8 @@
   - UplinkMisc
   - UplinkBundles
   - UplinkTools
+  - UplinkDeception
+  - UplinkChemicals
   - UplinkUtility
   - UplinkImplants
   - UplinkJob

From 6a2951163a3abc9c93c4466b6e301e92cfc5a93b Mon Sep 17 00:00:00 2001
From: Fansana <116083121+Fansana@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:44:22 +0100
Subject: [PATCH 4/4] Update Floof.yml

---
 Resources/Changelog/Floof.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
index cd806bd5fd7..74d1947d46f 100644
--- a/Resources/Changelog/Floof.yml
+++ b/Resources/Changelog/Floof.yml
@@ -1291,19 +1291,3 @@ Entries:
   id: 173
   time: '2024-10-29T14:42:16.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/302
-- author: neuPanda
-  changes:
-    - type: Remove
-      message: Rape from law as it is a rules violation.
-    - type: Remove
-      message: Sexual Assault/Harassment from law as it is a rules violation.
-  id: 174
-  time: '2024-10-29T22:10:16.0000000+00:00'
-  url: https://github.com/Fansana/floofstation1/pull/306
-- author: Memeji
-  changes:
-    - type: Remove
-      message: Removed Gax from the map pool.
-  id: 175
-  time: '2024-10-29T23:51:26.0000000+00:00'
-  url: https://github.com/Fansana/floofstation1/pull/303