TGS Test Merge (#5763)

cmss13-devs · Mar 27, 2024 · 49502e9 · 49502e9
2 parents cd4ddb6 + 646c477
commit 49502e9
Show file tree

Hide file tree

Showing 2 changed files with 1,544 additions and 1,352 deletions.
diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm
@@ -1,4 +1,5 @@
 //Areas for BigRed - Minijar
+// old icon state no longer in use. ("hydro","heads_quarters")
 /area/bigred
 	can_build_special = TRUE
 	powernet_name = "ground"
@@ -251,44 +252,50 @@
 	name = "\improper Corporate Saferoom"
 	icon_state = "vault"
 
-/area/bigred/uground/lambda_labs/
-	minimap_color = MINIMAP_AREA_RESEARCH_CAVE
-/area/bigred/uground/lambda_labs/airlock
-	name = "\improper Lambda Labs Airlock"
-	icon_state = "decontamination"
-
-/area/bigred/uground/lambda_labs/lobby
-	name = "\improper Lambda Labs Reception"
-	icon_state = "bluenew"
-
-/area/bigred/uground/lambda_labs/office
-	name = "\improper Lambda Labs Administration"
-	icon_state = "heads_quarters"
+// all the lambda area bellow.
 
-/area/bigred/uground/lambda_labs/laser_lab
-	name = "\improper Lambda Laser Laboratory"
-	icon_state = "toxmisc"
+// Laboratory proper
+/area/bigredv2/caves/lambda
+	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
+	ceiling_muffle = FALSE
+	ambience_exterior = AMBIENCE_ALMAYER
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+	soundscape_playlist = list()
+	minimap_color = MINIMAP_AREA_RESEARCH
 
-/area/bigred/uground/lambda_labs/hydro_office
-	name = "\improper Lambda Labs Bio-Dome"
-	icon_state = "hydro"
+/area/bigredv2/caves/lambda/virology
+	name = "\improper Lambda Virology"
+	icon_state = "lam_virology"
 
-/area/bigred/uground/lambda_labs/hydro_lab
-	name = "\improper Lambda Labs Hydrophonics"
-	icon_state = "garden"
+/area/bigredv2/caves/lambda/research
+	name = "\improper Lambda Research"
+	icon_state = "lam_research"
 
-/area/bigred/uground/lambda_labs/fridge
-	name = "\improper Lambda Labs Refrigeration"
-	icon_state = "kitchen"
+/area/bigredv2/caves/lambda/breakroom
+	name = "\improper Lambda Breakroom"
+	icon_state = "lam_break"
 
-/area/bigred/uground/lambda_labs/maintenance
-	name = "\improper Unknown Area"
-	icon_state = "yellow"
+/area/bigredv2/caves/lambda/xenobiology
+	name = "\improper Lambda Xenobiology"
+	icon_state = "lam_xeno"
 
-/area/bigred/uground/lambda_labs/maintenance2
-	name = "\improper Unknown Area"
-	icon_state = "blue"
+// cave around the laboratory.
+/area/bigredv2/caves_lambda
+	name = "\improper Lambda Lab Caves"
+	icon_state = "caves_lambda"
+	ceiling = CEILING_UNDERGROUND_BLOCK_CAS
+	sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
+	ceiling_muffle = FALSE
+	ambience_exterior = AMBIENCE_CAVE
+	soundscape_playlist = SCAPE_PL_CAVE
+	base_muffle = MUFFLE_HIGH
 
+// serve for the security checkpoint.
+/area/bigredv2/outside/lambda_cave_cas
+	name = "\improper Lambda Lockdown Caves Entrance"
+	icon_state = "decontamination"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	minimap_color = MINIMAP_AREA_SEC
 
 //Big Red V2
 /area/bigredv2
@@ -551,29 +558,6 @@
 	icon_state = "party"
 	ceiling = CEILING_METAL
 
-/area/bigredv2/caves/lambda
-	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
-	ceiling_muffle = FALSE
-	ambience_exterior = AMBIENCE_ALMAYER
-	sound_environment = SOUND_ENVIRONMENT_ROOM
-	soundscape_playlist = list()
-
-/area/bigredv2/caves/lambda/virology
-	name = "\improper Lambda Virology"
-	icon_state = "lam_virology"
-
-/area/bigredv2/caves/lambda/research
-	name = "\improper Lambda Research"
-	icon_state = "lam_research"
-
-/area/bigredv2/caves/lambda/breakroom
-	name = "\improper Lambda Breakroom"
-	icon_state = "lam_break"
-
-/area/bigredv2/caves/lambda/xenobiology
-	name = "\improper Lambda Xenobiology"
-	icon_state = "lam_xeno"
-
 /area/bigredv2/outside/general_offices
 	name = "\improper General Offices"
 	icon_state = "storage"
@@ -630,16 +614,6 @@
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
 
-/area/bigredv2/caves_lambda
-	name = "\improper Lambda Lab Caves"
-	icon_state = "caves_lambda"
-	ceiling = CEILING_UNDERGROUND_BLOCK_CAS
-	sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
-	ceiling_muffle = FALSE
-	ambience_exterior = AMBIENCE_CAVE
-	soundscape_playlist = SCAPE_PL_CAVE
-	base_muffle = MUFFLE_HIGH
-
 /area/bigredv2/caves_north
 	name = "\improper Northern Caves"
 	icon_state = "caves_north"
@@ -688,8 +662,3 @@
 	name = "\improper Filtration Lockdown Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
-
-/area/bigredv2/outside/lambda_cave_cas
-	name = "\improper Lambda Lockdown Caves Entrance"
-	icon_state = "garden"
-	ceiling = CEILING_UNDERGROUND_ALLOW_CAS