TGS Test Merge (#22568)

yogstation13 · Oct 10, 2024 · fa4120c · fa4120c
2 parents 3fab94f + ce2a809
commit fa4120c
Show file tree

Hide file tree

Showing 48 changed files with 178,318 additions and 153 deletions.
diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm
@@ -531,16 +531,6 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
 /area/space/nearstation)
-"jT" = (
-/obj/structure/ethernet_cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/ai/networking{
-	label = "Computer Science - 2";
-	roundstart_connection = "Subcontroller"
-	},
-/turf/open/floor/circuit/green/telecomms,
-/area/ai_monitored/turret_protected/ai)
 "jY" = (
 /obj/machinery/telecomms/broadcaster/preset_right,
 /turf/open/floor/circuit/green/telecomms/mainframe,
@@ -970,6 +960,16 @@
 	},
 /turf/open/floor/plasteel/dark/telecomms,
 /area/ai_monitored/turret_protected/ai)
+"qx" = (
+/obj/structure/ethernet_cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/ai/networking{
+	label = "Main Core";
+	roundstart_connection = "Computer Science"
+	},
+/turf/open/floor/circuit/green/telecomms,
+/area/ai_monitored/turret_protected/ai)
 "rm" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -4738,7 +4738,7 @@ jR
 PH
 kY
 PH
-jT
+qx
 AS
 uV
 zW

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -9,6 +9,7 @@
 		#include "map_files\YogStation\Yogstation.dmm"
 		#include "map_files\IceMeta\IceMeta.dmm"
 		#include "map_files\GaxStation\GaxStation.dmm"
+		#include "map_files\MiniStation\MiniStation.dmm"
 		#include "map_files\AsteroidStation\AsteroidStation.dmm"
 		#include "map_files\DonutStation\DonutStation.dmm"
 		#ifdef TRAVISBUILDING

diff --git a/_maps/asteroidstation.json b/_maps/asteroidstation.json
@@ -7,5 +7,10 @@
 		"ferry": "ferry_fancy",
 		"whiteship": "whiteship_box",
 		"emergency": "emergency_box"
+	},
+	"job_changes": {
+		"Captain": {
+			"special_charter": "asteroid"
+		}
 	}
   }
diff --git a/_maps/gaxstation.json b/_maps/gaxstation.json
@@ -8,5 +8,14 @@
 		"ferry": "ferry_fancy",
 		"emergency": "emergency_box"
 	},
-	"cryo_spawn": true
+	"cryo_spawn": true,
+	"job_changes": {
+		"Captain": {
+			"special_charter": "ship"
+		},
+		"Psychiatrist": {
+			"spawn_positions": 0,
+			"total_positions": 0
+		}
+	}
 }
diff --git a/_maps/icemeta.json b/_maps/icemeta.json
@@ -45,5 +45,10 @@
 			"No Parallax": true
 		}
 	],
-	"minetype": "none"
+	"minetype": "none",
+	"job_changes": {
+		"Captain": {
+			"special_charter": "moon"
+		}
+	}
 }
diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm
@@ -37493,17 +37493,6 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
-"seS" = (
-/obj/docking_port/stationary{
-	dwidth = 2;
-	height = 5;
-	name = "fore bay 1";
-	roundstart_template = /datum/map_template/shuttle/labour/gax;
-	shuttle_id = "laborcamp_home";
-	width = 9
-	},
-/turf/open/space/basic,
-/area/space)
 "sfo" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -72713,12 +72702,12 @@ vRP
 vRP
 vRP
 ubS
-tkl
-tkl
-tkl
-tkl
-tkl
-tkl
+vRP
+vRP
+vRP
+vRP
+vRP
+vRP
 dll
 dll
 dll
@@ -72970,7 +72959,7 @@ vRP
 vRP
 vRP
 aCD
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -73227,7 +73216,7 @@ vRP
 vRP
 vRP
 ubS
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -73484,12 +73473,12 @@ vRP
 vRP
 vRP
 aCD
-tkl
 vRP
 vRP
 vRP
 vRP
-seS
+vRP
+vRP
 eAe
 lUn
 bOF
@@ -73741,7 +73730,7 @@ vRP
 vRP
 vRP
 ubS
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -73998,7 +73987,7 @@ vRP
 vRP
 vRP
 ubS
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -74255,7 +74244,7 @@ vRP
 vRP
 vRP
 aCD
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -74512,7 +74501,7 @@ vRP
 vRP
 vRP
 aCD
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -74769,7 +74758,7 @@ vRP
 vRP
 vRP
 aCD
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -75026,7 +75015,7 @@ vRP
 vRP
 vRP
 ubS
-tkl
+vRP
 vRP
 vRP
 vRP
@@ -75283,12 +75272,12 @@ vRP
 vRP
 vRP
 ubS
-tkl
-tkl
-tkl
-tkl
-tkl
-tkl
+vRP
+vRP
+vRP
+vRP
+vRP
+vRP
 tkl
 aCD
 lMu
-Original file line number
+Diff line change
@@ Expand Up / @@ -37493,17 +37493,6 @@ @@
     	},
     /turf/open/space/basic,
     /area/space/nearstation)
-    "seS" = (
-    /obj/docking_port/stationary{
-    	dwidth = 2;
-    	height = 5;
-    	name = "fore bay 1";
-    	roundstart_template = /datum/map_template/shuttle/labour/gax;
-    	shuttle_id = "laborcamp_home";
-    	width = 9
-    	},
-    /turf/open/space/basic,
-    /area/space)
     "sfo" = (
     /obj/effect/turf_decal/stripes/line{
     	dir = 4
@@ Expand Down Expand Up / @@ -72713,12 +72702,12 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
-    tkl
-    tkl
-    tkl
-    tkl
-    tkl
+    vRP
+    vRP
+    vRP
+    vRP
+    vRP
+    vRP
     dll
     dll
     dll
@@ Expand Down Expand Up / @@ -72970,7 +72959,7 @@ vRP @@
     vRP
     vRP
     aCD
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -73227,7 +73216,7 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -73484,12 +73473,12 @@ vRP @@
     vRP
     vRP
     aCD
-    tkl
     vRP
     vRP
     vRP
     vRP
-    seS
+    vRP
+    vRP
     eAe
     lUn
     bOF
@@ Expand Down Expand Up / @@ -73741,7 +73730,7 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -73998,7 +73987,7 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -74255,7 +74244,7 @@ vRP @@
     vRP
     vRP
     aCD
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -74512,7 +74501,7 @@ vRP @@
     vRP
     vRP
     aCD
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -74769,7 +74758,7 @@ vRP @@
     vRP
     vRP
     aCD
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -75026,7 +75015,7 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
+    vRP
     vRP
     vRP
     vRP
@@ Expand Down Expand Up / @@ -75283,12 +75272,12 @@ vRP @@
     vRP
     vRP
     ubS
-    tkl
-    tkl
-    tkl
-    tkl
-    tkl
-    tkl
+    vRP
+    vRP
+    vRP
+    vRP
+    vRP
+    vRP
     tkl
     aCD
     lMu
@@ Expand Down @@