Merge branch 'master' into Shoukou_2_sometin

DeltaV-Station · Jan 12, 2024 · 73e9cc7 · 73e9cc7
2 parents bf72b8a + 273a142
commit 73e9cc7
Show file tree

Hide file tree

Showing 3 changed files with 1,053 additions and 295 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -10,7 +10,7 @@
 # /Resources/Textures/ @leonardo-dabepis # No write access
 # /Resources/DeltaV/Textures/ @leonardo-dabepis
 # /Resources/Nyanotrasen/Textures/ @leonardo-dabepis
-# /Resources/Maps/ @IamVelcroboy
-# /Resources/Prototypes/Maps/ @IamVelcroboy
+/Resources/Maps/ @IamVelcroboy
+/Resources/Prototypes/Maps/ @IamVelcroboy
 
 /Tools/ @DebugOk
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1345,3 +1345,9 @@ Entries:
       message: Atmos hopefully shouldn't break anymore
   id: 201
   time: '2024-01-07T22:10:36.0000000+00:00'
+- author: Bribrooo
+  changes:
+    - type: Add
+      message: 'added a ChemVend inside of Chemistry on Pebble Station '
+  id: 202
+  time: '2024-01-11T06:14:27.0000000+00:00'