Merge pull request #135 from DDMers/origmaster

b
BeeStation · Nov 16, 2019 · d3a0bf9 · d3a0bf9
2 parents 67e7337 + d7b13b9
commit d3a0bf9
Show file tree

Hide file tree

Showing 2 changed files with 1,985 additions and 345 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -8,6 +8,7 @@
 		#include "map_files\debug\runtimestation.dmm"
 		#include "map_files\Aegis\Aegis.dmm"
 		#include "map_files\Valkyrie\Valkyrie.dmm"
+		#include "map_files\Hammerhead\Hammerhead.dmm"
 
 		#ifdef TRAVISBUILDING
 			#include "templates.dm"