From f99ef64f55cd137c8ed8d48233b518401f35cce9 Mon Sep 17 00:00:00 2001
From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Sun, 22 Dec 2024 21:05:27 +0100
Subject: [PATCH] Automatic changelog update

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

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index b3483da7e84..50dcca3f731 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Fixed cargo being able to metagame the nukie outpost existing.
-    type: Fix
-  id: 311
-  time: '2024-04-11T18:38:36.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1081
 - author: rosieposieeee
   changes:
   - message: More hotfixes for Submarine Station! Say goodbye to your damn unsulated
@@ -3833,3 +3826,10 @@
   id: 810
   time: '2024-12-22T20:04:03.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2498
+- author: Santa
+  changes:
+  - message: Merged the Christmas cheer from upstream. Ho ho ho!
+    type: Add
+  id: 811
+  time: '2024-12-22T20:05:08.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2496