TGS Test Merge (#6217)

code/game/area/Corsat.dm

@@ -7,7 +7,7 @@
 	can_build_special = TRUE
 
 /area/corsat/landing/console
-	name = "\improper LZ1 'Gamma'"
+	name = "\improper LZ1 'NON FUNCTIONAL'"//Temp
 	icon_state = "corsat_telecomms"
 	requires_power = 0
 
@@ -409,12 +409,18 @@
 	name = "\improper Sigma Remote Complex"
 	icon_state = "sigma_complex_remote"
 
+/area/corsat/gamma/sigmaremote/residential
+	name = "\improper Auxiliary Teleporter Complex"
+
 /area/corsat/gamma/sigmaremote/teleporter
 	name = "\improper Sigma Remote Teleporter"
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "shuttle"
 	ceiling = CEILING_METAL
 
+/area/corsat/gamma/sigmaremote/teleporter/residential
+	name = "\improper Auxiliary Teleporter"
+
 /area/corsat/gamma/airlock/north
 	name = "\improper Gamma Dome North Airlock"
 	icon_state = "gamma_airlock_north"

code/modules/teleporters/teleporter_landmarks.dm

@@ -71,3 +71,7 @@
 /obj/effect/landmark/teleporter_loc/corsat_sigma_remote
 	location_id = "Sigma Remote"
 	linked_teleporter = "Corsat_Teleporter"
+
+/obj/effect/landmark/teleporter_loc/corsat_auxiliary
+	location_id = "Cargo Auxiliary"
+	linked_teleporter = "Corsat_Teleporter"

map_config/maps.txt

@@ -28,9 +28,7 @@ map fiorina_sciannex
 endmap
 
 map corsat
-	minplayers 130
-	voteweight 0
-	disabled
+	minplayers 100
 endmap
 
 map desert_dam

maps/Nightmare/maps/CORSAT/nightmare.json

@@ -1,39 +1,3 @@
 [
-	{ "type": "map_sprinkle", "path": "sprinkles/" },
-	{
-		"type": "map_insert",
-		"landmark": "lockdown-gamma-north",
-		"path": "standalone/lockdown_gammanorth.dmm",
-		"when": { "corsat-path": "gamma-north" }
-	},
-	{
-		"type": "map_insert",
-		"landmark": "lockdown-gamma-control",
-		"path": "standalone/lockdown_gammacontrol.dmm",
-		"when": { "corsat-path": "gamma-control" }
-	},
-	{
-		"type": "map_insert",
-		"landmark": "lockdown-theta-east",
-		"path": "standalone/lockdown_thetaeast.dmm",
-		"when": { "corsat-path": "theta-east" }
-	},
-	{
-		"type": "map_insert",
-		"landmark": "lockdown-theta-control",
-		"path": "standalone/lockdown_thetacontrol.dmm",
-		"when": { "corsat-path": "theta-control" }
-	},
-	{
-		"type": "map_insert",
-		"landmark": "lockdown-highsec",
-		"path": "standalone/lockdown_highsec.dmm",
-		"when": { "corsat-path": "highsec" }
-	},
-	{
-		"type": "map_insert",
-		"landmark": "dome-sigma",
-		"path": "standalone/sigma_ice.dmm",
-		"when": { "dome-sigma": "ice" }
-	}
+	{ "type": "map_sprinkle", "path": "sprinkles/" }
 ]

maps/Nightmare/maps/CORSAT/scenario.json

@@ -1,20 +1 @@
-[
-	{
-		"type": "pick", "name": "CORSAT Lockdown Pathing",
-        "choices": [
-			{ "weight": 3, "type": "def", "values": { "corsat-path": "none"   } },
-			{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-north"   } },
-			{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-control"   } },
-			{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-east"   } },
-			{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-control"   } },
-			{ "weight": 1, "type": "def", "values": { "corsat-path": "highsec"   } }
-		]
-	},
-	{
-		"type": "pick", "name": "Sigma Major Variation",
-		"choices": [
-			{ "type": "def", "values": { "dome-sigma": "regular" } },
-			{ "type": "def", "values": { "dome-sigma": "ice" } }
-		]
-	}
-]
+[]

maps/Nightmare/maps/CORSAT_Legacy/nightmare.json

@@ -0,0 +1,39 @@
+[
+	{ "type": "map_sprinkle", "path": "sprinkles/" },
+	{
+		"type": "map_insert",
+		"landmark": "lockdown-gamma-north",
+		"path": "standalone/lockdown_gammanorth.dmm",
+		"when": { "corsat-path": "gamma-north" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "lockdown-gamma-control",
+		"path": "standalone/lockdown_gammacontrol.dmm",
+		"when": { "corsat-path": "gamma-control" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "lockdown-theta-east",
+		"path": "standalone/lockdown_thetaeast.dmm",
+		"when": { "corsat-path": "theta-east" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "lockdown-theta-control",
+		"path": "standalone/lockdown_thetacontrol.dmm",
+		"when": { "corsat-path": "theta-control" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "lockdown-highsec",
+		"path": "standalone/lockdown_highsec.dmm",
+		"when": { "corsat-path": "highsec" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "dome-sigma",
+		"path": "standalone/sigma_ice.dmm",
+		"when": { "dome-sigma": "ice" }
+	}
+]

maps/Nightmare/maps/CORSAT_Legacy/scenario.json

@@ -0,0 +1,20 @@
+[
+	{
+		"type": "pick", "name": "CORSAT Lockdown Pathing",
+        "choices": [
+			{ "weight": 3, "type": "def", "values": { "corsat-path": "none"   } },
+			{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-north"   } },
+			{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-control"   } },
+			{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-east"   } },
+			{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-control"   } },
+			{ "weight": 1, "type": "def", "values": { "corsat-path": "highsec"   } }
+		]
+	},
+	{
+		"type": "pick", "name": "Sigma Major Variation",
+		"choices": [
+			{ "type": "def", "values": { "dome-sigma": "regular" } },
+			{ "type": "def", "values": { "dome-sigma": "ice" } }
+		]
+	}
+]