Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · May 16, 2024 · e953dfa · e953dfa
2 parents e922bac + 0f35eb6
commit e953dfa
Show file tree

Hide file tree

Showing 86 changed files with 76,296 additions and 949 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -24,6 +24,7 @@
 		#include "map_files\Lawanka_Outpost\LawankaOutpost.dmm"
 		#include "map_files\slumbridge\slumbridge.dmm"
 		#include "map_files\DaedalusPrison\DaedalusPrison.dmm"
+		#include "map_files\riptide\riptide.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif