Merge remote-tracking branch 'EE-Master/master' into Update-10/12/2024

SS14-Classic · Oct 12, 2024 · 459342f · 459342f
2 parents 2554154 + f5521e4
commit 459342f
Show file tree

Hide file tree

Showing 21 changed files with 554 additions and 41 deletions.
diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
@@ -64,6 +64,8 @@ public sealed partial class GatewayGeneratorComponent : Component
         "OreUranium",
         "OreBananium",
         "OreArtifactFragment",
+        "OreBluespace",
+        "OreNormality",
     };
 }
 
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -7153,3 +7153,15 @@ Entries:
   id: 6438
   time: '2024-10-11T16:08:48.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1037
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added Bluespace and Normality ore as very rare ore types. Salvage can
+        occasionally find these ores on Asteroids or on Expedition planets.
+        Bluespace and Normality Ore can be smelted in an Ore Processor into
+        Bluespace and Normality Crystals. Make sure to bring these to Epistemics
+        so that they can do their job.
+  id: 6439
+  time: '2024-10-12T20:49:32.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1042
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
@@ -35,6 +35,8 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+materials-raw-bluespace = raw bluespace
+materials-raw-normality = raw normality
 
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = process rate
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -17,6 +17,8 @@ salvage-magnet-resources = {$resource ->
     [OrePlasma] Plasma
     [OreUranium] Uranium
     [OreArtifactFragment] Artifact fragments
+    [OreBluespace] Bluespace crystals
+    [OreNormality] Normality crystals
     *[other] {$resource}
 }
 

diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -343,5 +343,53 @@
   id: Salt1
   suffix: Single
   components:
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: OreBase
+  id: BluespaceOre
+  name: bluespace ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: BluespaceOre
+  - type: Sprite
+    state: bluespace
+  - type: Item
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Bluespace: 100
+
+- type: entity
+  parent: BluespaceOre
+  id: BluespaceOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: OreBase
+  id: NormalityOre
+  name: normality ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: NormalityOre
+  - type: Sprite
+    state: bluespace
+  - type: Item
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Normality: 100
+
+- type: entity
+  parent: NormalityOre
+  id: NormalityOre1
+  suffix: Single
+  components:
   - type: Stack
     count: 1
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1209,7 +1209,8 @@
       idleState: icon
       runningState: building
       staticRecipes:
-        - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
+        - BluespaceCrystal
+        - NormalityCrystal
         - SheetSteel30
         - SheetGlass30
         - SheetRGlass30