TGS Test Merge (#14)

Lumos-SS13 · Sep 4, 2023 · d68a3f9 · d68a3f9
2 parents 94f2a14 + 5fed77d
commit d68a3f9
Show file tree

Hide file tree

Showing 5 changed files with 85,858 additions and 1 deletion.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -13,6 +13,7 @@
 		#include "map_files\BoxStation\BoxStation_Lumos.dmm"
 		#include "map_files\LambdaStation\lambda.dmm"
 		#include "map_files\SpookyStation\SpookyStation.dmm"
+		#include "map_files\Fuckstation\fuckstation.dmm"
 
 		#ifdef CIBUILDING
 			#include "templates.dm"

diff --git a/_maps/fuckstation.dm b/_maps/fuckstation.dm
@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/fuckstation.json"
diff --git a/_maps/fuckstation.json b/_maps/fuckstation.json
@@ -0,0 +1,11 @@
+{
+    "map_name": "Fuck Station",
+    "map_path": "map_files/Fuckstation",
+    "map_file": "fuckstation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_box",
+	    "emergency": "emergency_box"
+    }
+}