Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 10/12/2024 #78

Merged
merged 3 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public sealed partial class GatewayGeneratorComponent : Component
"OreUranium",
"OreBananium",
"OreArtifactFragment",
"OreBluespace",
"OreNormality",
};
}

12 changes: 12 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/materials/materials.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/salvage/salvage-magnet.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ salvage-magnet-resources = {$resource ->
[OrePlasma] Plasma
[OreUranium] Uranium
[OreArtifactFragment] Artifact fragments
[OreBluespace] Bluespace crystals
[OreNormality] Normality crystals
*[other] {$resource}
}

Expand Down
48 changes: 48 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/ore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,8 @@
idleState: icon
runningState: building
staticRecipes:
- BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
- BluespaceCrystal
- NormalityCrystal
- SheetSteel30
- SheetGlass30
- SheetRGlass30
Expand Down
Loading
Loading