TGS Test Merge (#6217)

cmss13-devs · May 8, 2024 · f0092e7 · f0092e7
2 parents fc38f5c + f11362e
commit f0092e7
Show file tree

Hide file tree

Showing 17 changed files with 26,121 additions and 47,784 deletions.
diff --git a/code/game/area/Corsat.dm b/code/game/area/Corsat.dm
@@ -21,6 +21,29 @@
 	icon_state = "corsat_hull"
 	ceiling = CEILING_REINFORCED_METAL
 
+/area/corsat/comms
+	name = "CORSAT Auxiliary Comms Relay"
+	icon_state = "corsat_hull"
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/corsat/comms/flight_control
+	name = "CORSAT Auxiliary Comms Relay (Flight Control)"
+
+/area/corsat/comms/gamma_halls
+	name = "CORSAT Auxiliary Comms Relay (Gamma Halls)"
+
+/area/corsat/comms/gamma_cargo
+	name = "CORSAT Auxiliary Comms Relay (Gamma Cargo)"
+
+/area/corsat/comms/sigma_cargo
+	name = "CORSAT Auxiliary Comms Relay (Sigma Cargo)"
+
+/area/corsat/comms/sigma_residential
+	name = "CORSAT Auxiliary Comms Relay (Sigma Residential)"
+
+/area/corsat/comms/sigma_biodome
+	name = "CORSAT Auxiliary Comms Relay (Sigma Biodome)"
+
 //SIGMA SECTOR
 
 /area/corsat/sigma
@@ -32,6 +55,18 @@
 	icon_state = "sigma_hallway_north"
 	is_resin_allowed = FALSE
 
+/area/corsat/sigma/north/engineering
+	name = "\improper Primary Engineering"
+	icon_state = "gamma_engineering"
+
+/area/corsat/sigma/north/engineering/lobby
+	name = "\improper Primary Engineering Lobby"
+	icon_state = "gamma_engineering"
+
+/area/corsat/sigma/north/engineering/core
+	name = "\improper CORSAT Generator Core"
+	icon_state = "corsat_core"
+
 /area/corsat/sigma/hangar
 	name = "\improper Landing Bay Sigma"
 	icon_state = "sigma_hangar"
@@ -250,20 +285,20 @@
 	icon_state = "flight_center"
 
 /area/corsat/gamma/hangar/security
-	name = "\improper Gamma Hangar Security"
+	name = "\improper Gamma Cargo Security"
 	icon_state = "gamma_hangar_security"
 
 /area/corsat/gamma/hangar/arrivals
 	name = "\improper Gamma Arrivals"
 	icon_state = "gamma_arrivals"
 
 /area/corsat/gamma/foyer
-	name = "\improper Gamma Foyer"
+	name = "\improper Gamma Sector North Hallways"
 	icon_state = "gamma_foyer"
 	is_resin_allowed = FALSE
 
 /area/corsat/gamma/hallwaymain
-	name = "\improper Gamma Sector West Hallway"
+	name = "\improper Gamma Sector South-West Hallway"
 	icon_state = "gamma_hallway_main"
 
 /area/corsat/gamma/hallwaysouth
@@ -274,16 +309,21 @@
 	name = "\improper Gamma Residential Hallway"
 	icon_state = "gamma_hallway_main"
 
-/area/corsat/gamma/residential/west
+/area/corsat/gamma/residential/generator
+	name = "\improper CORSAT Emergency Generators"
+	icon_state = "secondary_core"
+	ceiling = CEILING_METAL
+
+/area/corsat/gamma/residential/academy
 	name = "\improper CORSAT Academy"
 	icon_state = "gamma_residential_west"
 
-/area/corsat/gamma/residential/east
-	name = "\improper Gamma North Residential"
+/area/corsat/gamma/residential/north
+	name = "\improper CORSAT Residential Module"
 	icon_state = "gamma_residential_east"
 
 /area/corsat/gamma/residential/maint
-	name = "\improper Gamma Residential Maintenance"
+	name = "\improper CORSAT Academy Maintenance"
 	icon_state = "gamma_residential_maint"
 
 /area/corsat/gamma/residential/researcher
@@ -389,32 +429,27 @@
 	name = "\improper CORSAT Library"
 	icon_state = "corsat_library"
 
-/area/corsat/gamma/engineering
-	name = "\improper Gamma Engineering"
-	icon_state = "gamma_engineering"
 
-/area/corsat/gamma/engineering/lobby
-	name = "\improper Gamma Engineering Lobby"
-	icon_state = "gamma_engineering"
-
-/area/corsat/gamma/engineering/atmos
+/area/corsat/gamma/atmos
 	name = "\improper CORSAT Atmospherics"
 	icon_state = "gamma_atmos"
 
-/area/corsat/gamma/engineering/core
-	name = "\improper CORSAT Generator Core"
-	icon_state = "corsat_core"
-
 /area/corsat/gamma/sigmaremote
 	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"
@@ -514,11 +549,12 @@
 /area/corsat/omega
 	name = "\improper Sector Omega"
 	icon_state = "corsat_hull"
-	ceiling = CEILING_REINFORCED_METAL
+	ceiling = CEILING_GLASS
 
 /area/corsat/omega/biodome
 	name = "\improper Biodome Omega"
 	icon_state = "omega_biodome"
+	ceiling = CEILING_REINFORCED_METAL
 
 /area/corsat/omega/hangar
 	name = "\improper Landing Bay Omega"
@@ -540,10 +576,12 @@
 /area/corsat/omega/complex
 	name = "\improper Omega Research Complex"
 	icon_state = "omega_complex"
+	ceiling = CEILING_REINFORCED_METAL
 
 /area/corsat/omega/containment
 	name = "\improper Omega Research Containment"
 	icon_state = "omega_containment"
+	ceiling = CEILING_REINFORCED_METAL
 
 /area/corsat/omega/security
 	name = "\improper Omega Security Hub"
@@ -568,14 +606,17 @@
 /area/corsat/omega/airlocknorth
 	name = "\improper Omega Dome North Airlock"
 	icon_state = "omega_airlock"
+	ceiling = CEILING_REINFORCED_METAL
 
 /area/corsat/omega/airlocknorth/id
 	name = "\improper Omega North ID Checkpoint"
 	icon_state = "corsat_id"
+	ceiling = CEILING_REINFORCED_METAL
 
 /area/corsat/omega/control
 	name = "\improper Omega Dome Control Module"
 	icon_state = "omega_control"
+	ceiling = CEILING_REINFORCED_METAL
 
 //INACCESSIBLE
 

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -976,17 +976,18 @@
 /obj/structure/window/framed/corsat/hull
 	name = "hull window"
 	desc = "A glass window with a special rod matrix inside a wall frame. This one has an automatic shutter system to prevent any atmospheric breach."
+	icon_state = "hull_window"
 	health = 200
 	var/triggered = FALSE //indicates if the shutters have already been triggered
 
 /obj/structure/window/framed/corsat/hull/research
-	icon_state = "paddedresearch_rwindow0"
+	icon_state = "hull_window_rsr"
 	basestate = "paddedresearch_rwindow"
 	window_frame = /obj/structure/window_frame/corsat/research
 	health = 300
 
 /obj/structure/window/framed/corsat/hull/security
-	icon_state = "paddedsec_rwindow0"
+	icon_state = "hull_window_sec"
 	basestate = "paddedsec_rwindow"
 	window_frame = /obj/structure/window_frame/corsat/security
 	health = 400
@@ -1019,7 +1020,7 @@
 
 	INVOKE_ASYNC(pressure_door, TYPE_PROC_REF(/obj/structure/machinery/door, close))
 
-/obj/structure/window/framed/corsat/indestructible/
+/obj/structure/window/framed/corsat/indestructible
 	name = "hull window"
 	desc = "A glass window with a special rod matrix inside a wall frame. This one has been reinforced to take almost anything the universe can throw at it."
 	not_damageable = TRUE

diff --git a/code/modules/teleporters/teleporter_landmarks.dm b/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"
diff --git a/icons/turf/walls/windows_corsat.dmi b/icons/turf/walls/windows_corsat.dmi
diff --git a/map_config/maps.txt b/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

diff --git a/maps/Nightmare/maps/CORSAT/nightmare.json b/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/" }
 ]
diff --git a/maps/Nightmare/maps/CORSAT/scenario.json b/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" } }
-		]
-	}
-]
+[]
diff --git a/maps/Nightmare/maps/CORSAT_Legacy/nightmare.json b/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" }
+	}
+]
diff --git a/maps/Nightmare/maps/CORSAT_Legacy/scenario.json b/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" } }
+		]
+	}
+]
diff --git a/maps/corsat.json b/maps/corsat.json
@@ -4,7 +4,6 @@
     "map_file": "Corsat.dmm",
     "environment_traits": {
         "Lockdown": true,
-        "COLD": true,
         "InSpace": true
     },
     "survivor_types": [
@@ -43,7 +42,7 @@
         "xeno_hive_charlie": 0,
         "xeno_hive_delta": 0
     },
-    "camouflage": "snow",
+    "camouflage": "classic",
     "gamemodes": [
         "Distress Signal",
         "Hunter Games",