From 798540d4724967f19c56adac285b0dac4c1fd092 Mon Sep 17 00:00:00 2001
From: jd284 <jd284@users.noreply.github.com>
Date: Sun, 16 Oct 2022 12:54:43 +0200
Subject: [PATCH 1/3] Update StationScience.cfg

Add experiments from the merger of StationScience with FuelScience
---
 .../science/StationScience.cfg                | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/GameData/ContractConfigurator/science/StationScience.cfg b/GameData/ContractConfigurator/science/StationScience.cfg
index 014e336d1..6a3db8c62 100644
--- a/GameData/ContractConfigurator/science/StationScience.cfg
+++ b/GameData/ContractConfigurator/science/StationScience.cfg
@@ -64,6 +64,78 @@ CC_EXPERIMENT_DEFINITIONS
         disallowHomeFlying = true
     }
 
+    EXPERIMENT
+    {
+        name = costlyExperimentPlantGrowth
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentProgradeKuarqs
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentRetrogradeKuarqs
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentEccentricKuarqs
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentCreatureComforts
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentKuarqBioactivity
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentRocketFuels
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentAdvancedFuels
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
+    EXPERIMENT
+    {
+        name = costlyExperimentPlasmaFuels
+
+        disallowHomeSurface = true
+        disallowHomeFlying = true
+    }
+
     MODULE
     {
         name = StationExperiment

From f373915ff09f1f4bc34cf6b9d76ed9f00d54ae82 Mon Sep 17 00:00:00 2001
From: jd284 <jd284@users.noreply.github.com>
Date: Sun, 16 Oct 2022 13:51:34 +0200
Subject: [PATCH 2/3] Update StationScience.cfg

Fix to use experiment ID (not part ID...)
---
 .../science/StationScience.cfg                | 48 ++-----------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/GameData/ContractConfigurator/science/StationScience.cfg b/GameData/ContractConfigurator/science/StationScience.cfg
index 6a3db8c62..4ca3d3986 100644
--- a/GameData/ContractConfigurator/science/StationScience.cfg
+++ b/GameData/ContractConfigurator/science/StationScience.cfg
@@ -66,7 +66,7 @@ CC_EXPERIMENT_DEFINITIONS
 
     EXPERIMENT
     {
-        name = costlyExperimentPlantGrowth
+        name = creatureComforts
 
         disallowHomeSurface = true
         disallowHomeFlying = true
@@ -74,7 +74,7 @@ CC_EXPERIMENT_DEFINITIONS
 
     EXPERIMENT
     {
-        name = costlyExperimentProgradeKuarqs
+        name = rocketFuels
 
         disallowHomeSurface = true
         disallowHomeFlying = true
@@ -82,7 +82,7 @@ CC_EXPERIMENT_DEFINITIONS
 
     EXPERIMENT
     {
-        name = costlyExperimentRetrogradeKuarqs
+        name = advFuels
 
         disallowHomeSurface = true
         disallowHomeFlying = true
@@ -90,47 +90,7 @@ CC_EXPERIMENT_DEFINITIONS
 
     EXPERIMENT
     {
-        name = costlyExperimentEccentricKuarqs
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = costlyExperimentCreatureComforts
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = costlyExperimentKuarqBioactivity
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = costlyExperimentRocketFuels
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = costlyExperimentAdvancedFuels
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = costlyExperimentPlasmaFuels
+        name = plasmaFuels
 
         disallowHomeSurface = true
         disallowHomeFlying = true

From 6392f02bb968bf52e6515cce63dee0c60c64157d Mon Sep 17 00:00:00 2001
From: jd284 <jd284@users.noreply.github.com>
Date: Sun, 16 Oct 2022 13:55:27 +0200
Subject: [PATCH 3/3] Update StationScience.cfg

Remove duplicates
---
 .../science/StationScience.cfg                   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/GameData/ContractConfigurator/science/StationScience.cfg b/GameData/ContractConfigurator/science/StationScience.cfg
index 4ca3d3986..4910ef75a 100644
--- a/GameData/ContractConfigurator/science/StationScience.cfg
+++ b/GameData/ContractConfigurator/science/StationScience.cfg
@@ -56,22 +56,6 @@ CC_EXPERIMENT_DEFINITIONS
         disallowHomeFlying = true
     }
 
-    EXPERIMENT
-    {
-        name = zoologyBay
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
-    EXPERIMENT
-    {
-        name = creatureComforts
-
-        disallowHomeSurface = true
-        disallowHomeFlying = true
-    }
-
     EXPERIMENT
     {
         name = rocketFuels