Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…

…ngines into fixcustomspecie
Simple-Station · Oct 21, 2024 · 5758d81 · 5758d81
2 parents 2fb02ea + 05a1301
commit 5758d81
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 11 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -7502,3 +7502,26 @@ Entries:
   id: 6478
   time: '2024-10-20T21:34:05.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1110
+- author: Aidenkrz
+  changes:
+    - type: Fix
+      message: Flavor text can be updated again.
+  id: 6479
+  time: '2024-10-21T00:24:18.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1119
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Glacier is now on a planetary surface
+  id: 6480
+  time: '2024-10-21T00:41:02.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1115
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Asterisk Station no longer spawns entombed in snow, and is now on top of
+        an ice sheet.
+  id: 6481
+  time: '2024-10-21T00:41:18.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1118
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
@@ -63,14 +63,39 @@ entities:
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
-      parallax: AngleStation
+      parallax: Snow
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        immutable: True
+        temperature: 213.15
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: Gravity
+      enabled: true
+      inherent: true
     - type: LoadedMap
   - uid: 2
     components:
     - type: MetaData
     - type: Transform
       pos: -0.5104167,-0.4739367
       parent: 1
+    - type: PassiveDampening
+      linearDampening: 1
+      angularDampening: 1
     - type: MapGrid
       chunks:
         0,0:

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
@@ -72,7 +72,10 @@ entities:
     - type: GridTree
     - type: MovedGrids
     - type: Parallax
-      parallax: Sky
+      parallax: Snow
+    - type: Gravity
+      enabled: true
+      inherent: true
     - type: MapAtmosphere
       space: False
       mixture:
@@ -100,6 +103,9 @@ entities:
     - type: MetaData
     - type: Transform
       parent: 1
+    - type: PassiveDampening
+      linearDampening: 1
+      angularDampening: 1
     - type: MapGrid
       chunks:
         -1,-1:
@@ -69877,13 +69883,6 @@ entities:
     - type: Transform
       pos: 63.191357,-49.411076
       parent: 2
-- proto: GravityGenerator
-  entities:
-  - uid: 9482
-    components:
-    - type: Transform
-      pos: 27.5,54.5
-      parent: 2
 - proto: GravityGeneratorMini
   entities:
   - uid: 9483

diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml
@@ -8,8 +8,6 @@
     Asterisk:
       stationProto: StandardNanotrasenStation
       components:
-        - type: StationBiome
-          biome: Snow
         - type: StationRandomTransform
           enableStationRotation: false
           maxStationOffset: null