Merge branch 'den-downstream-merge-2' of github.com:angelofallars/Ein…

…stein-Engines into den-downstream-merge-2

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -52,27 +52,27 @@ public sealed class PostMapInitTest
             "CentCommHarmony",
             "MeteorArena",
             "NukieOutpost",
-            "Core",
-            "Pebble", //DeltaV
-            "Edge", //DeltaV
-            "Saltern",
-            "Shoukou", //DeltaV
-            "Tortuga", //DeltaV
-            "Arena", //DeltaV
-            "Asterisk", //DeltaV
-            "Glacier", //DeltaV
-            "TheHive", //DeltaV
-            "Hammurabi", //DeltaV
-            "Lighthouse", //DeltaV
-            "Submarine", //DeltaV
-            "Gax",
-            "Rad",
-            "Europa",
-            "Meta",
-            "Box",
-            "Lambda",
-            "Bagel",
-            "Northway"
+            "Core", // No current maintainer. In need of a rework...
+            // "Pebble", // De-rotated, no current maintainer.
+            // "Edge", // De-rotated, no current maintainer.
+            "Saltern", // Maintained by the Sin Mapping Team, ODJ, and TCJ.
+            "Shoukou", // Maintained by Violet
+            // "Tortuga", // De-rotated, no current maintainer.
+            // "Arena", // De-rotated, no current maintainer.
+            // "Asterisk", // De-rotated, no current maintainer.
+            "Glacier", // Maintained by Violet
+            // "TheHive", // De-rotated, no current maintainer.
+            // "Hammurabi", // De-rotated, no current maintainer.
+            "Lighthouse", // Maintained by Violet
+            // "Submarine", // De-rotated, no current maintainer.
+            "Gax", // Maintained by Estacao Pirata
+            "Rad", // Maintained by Estacao Pirata
+            // "Europa", // De-rotated, has significant issues.
+            "Meta", // Maintained by Estacao Pirata
+            "Box", // Maintained by Estacao Pirata
+            "Lambda", // Maintained by Estacao Pirata
+            "Bagel", // Maintained by Estacao Pirata
+            "Northway" // Maintained by Violet
         };
 
         /// <summary>

Resources/Changelog/Changelog.yml

@@ -11611,3 +11611,29 @@ Entries:
   id: 6839
   time: '2025-02-12T14:56:04.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1763
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Saltern's generator room now correctly spawns with a crate containing
+        uranium fuel. As a reminder, Saltern is unique among all other maps in
+        that it is the only map which can be run on its solars alone. The
+        generators and generous battery backups are there to provide more than
+        adequate time to setup your choice of solars or supermatter. 
+  id: 6840
+  time: '2025-02-12T17:33:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1771
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Removed the following maps from rotation: Pebble, Edge, Tortuga, Arena,
+        Asterisk, Hive, Hammurabi, and Submarine. These maps aren't permanently
+        gone, they just won't appear in the map vote list. If you want to see
+        them return in an official capacity, and have any talent/desire for
+        mapping, feel free to submit a PR to give one of these maps the
+        attention and care it deserves. None of them have received any updates
+        in over a year.
+  id: 6841
+  time: '2025-02-12T18:51:09.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1772

Resources/Maps/saltern.yml

@@ -30394,7 +30394,7 @@ entities:
     - type: Transform
       pos: -21.5,-4.5
       parent: 31
-- proto: CrateUranium
+- proto: CrateMaterialUranium
   entities:
   - uid: 7792
     components:

Resources/Prototypes/Maps/Pools/default.yml

@@ -1,24 +1,36 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-  - Arena
-  - Asterisk
-  - Core
-  - Edge
-  - Glacier
-  - Hammurabi
-  - Lighthouse
-  - Pebble
-  - Saltern
-  - Shoukou
-  - Submarine
-  - Tortuga
-  - TheHive
-  - Gax
-  - Rad
-  - Meta
-  - Box
-  - Lambda
-  - Bagel
-  - Northway
-#  - Europa
+ # - Arena # De-rotated, no current maintainer.
+ # - Asterisk # De-rotated, no current maintainer.
+  - Core # No current Maintainer. In need of a rework...
+ # - Edge # De-rotated, no current maintainer.
+  - Glacier # Maintained by Violet, pending update.
+ # - Hammurabi # De-rotated, no current maintainer.
+  - Lighthouse # Maintained by the SiN Mapping Team, ODJ, and TCJ.
+ # - Pebble # De-rotated, no current maintainer.
+  - Saltern # Maintained by the SiN Mapping Team
+  - Shoukou # Maintained by Violet, pending update.
+ # - Submarine # De-rotated, no current maintainer.
+ # - Tortuga # De-rotated, no current maintainer.
+ # - TheHive # De-rotated, no current maintainer.
+  - Gax # Maintained by Estacao Pirata
+  - Rad # Maintained by Estacao Pirata
+  - Meta # Maintained by Estacao Pirata
+  - Box # Maintained by Estacao Pirata
+  - Lambda # Maintained by Estacao Pirata
+  - Bagel # Maintained by Estacao Pirata
+  - Northway # Maintained by Violet, pending update.
+#  - Europa # De-rotated. Has significant issues.
+
+# All maps marked as De-rotated are currently receiving no update support due to a shortage of map maintainers.
+# If you want to see these maps return to official rotation, and have any talent with mapping, please feel free to get in contact with Old Dance Jacket.
+# We have a mapping server where we can support arbitrarily any number of people wishing to cooperatively map together. Alternatively, you can
+# choose to support a map solo.
+
+# We do this because these maps have not received any updates in over a year, and our efforts to find people willing to maintain these maps have gone
+# largely unanswered. As a result, we can't guarantee their quality at all.
+
+# In order to make re-rotate a map, please submit a PR providing at least some amount of work to refurbish the map you wish to reintroduce. It doesn't even
+# need to be a full comprehensive rework. Maybe like... Rework a department. Add an AI Satellite. Add decorative details. Do *something* cool.
+# Show us that someone actually cares about the map enough to make it something people actually want to play on.