Merge branch 'upstream-master' into merge-upstream

ss220club · Nov 8, 2024 · bcffc08 · bcffc08
2 parents cb01ecc + 200e0a3
commit bcffc08
Show file tree

Hide file tree

Showing 153 changed files with 303,899 additions and 3,970 deletions.
diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md
@@ -12,7 +12,7 @@ or
 ```sql
 INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 28);
 ```
-
+In any query remember to add a prefix to the table names if you use one.
 -----------------------------------------------------
 Version 5.28, 1 November 2024, by Ghommie
 Added `fish_progress` as the first 'progress' subtype of 'datum/award/scores'
@@ -25,8 +25,6 @@ CREATE TABLE `fish_progress` (
   PRIMARY KEY (`ckey`,`progress_entry`)
 ) ENGINE=InnoDB;
 ```
-
-In any query remember to add a prefix to the table names if you use one.
 -----------------------------------------------------
 Version 5.27, 26 April 2024, by zephyrtfa
 Add the ip intel whitelist table

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -13,6 +13,7 @@
 		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
+		#include "map_files\NebulaStation\NebulaStation.dmm"
 		#include "map_files\wawastation\wawastation.dmm"
 
 		#ifdef CIBUILDING