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

Add 4 New Mining Materials #1693

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
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
9 changes: 9 additions & 0 deletions Resources/Locale/en-US/materials/materials.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ materials-steel = steel
materials-gold = gold
materials-silver = silver
materials-plasteel = plasteel
materials-aluminium = aluminium
materials-copper = copper
materials-tungsten = tungsten-carbide
materials-lead = lead

# Other
materials-biomass = biomass
Expand Down Expand Up @@ -41,6 +45,11 @@ materials-raw-bananium = raw bananium
materials-raw-salt = raw salt
materials-raw-bluespace = raw bluespace
materials-raw-normality = raw normality
materials-raw-aluminium = raw aluminium
materials-raw-lead = raw lead
materials-raw-sulfur = raw sulfur
materials-raw-copper = raw copper
materials-raw-tungsten = raw tungsten

# Material Reclaimer
material-reclaimer-upgrade-process-rate = process rate
37 changes: 37 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/ingots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,40 @@
state: silver
- type: Stack
count: 1

- type: entity
parent: IngotBase
id: IngotTungsten
name: tungsten-carbide bar
suffix: Full
components:
- type: Material
- type: PhysicalComposition
materialComposition:
Tungsten: 100
- type: Stack
stackType: Tungsten
baseLayer: base
layerStates:
- tungsten_1
- tungsten_2
- tungsten_3
- type: Sprite
state: tungsten_3
layers:
- state: tungsten_3
map: ["base"]
- type: Item
heldPrefix: tungsten
- type: Appearance

- type: entity
parent: IngotTungsten
id: IngotTungsten1
name: tungsten-carbide bar
suffix: Single
components:
- type: Sprite
state: tungsten_1
- type: Stack
count: 1
23 changes: 23 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/ore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,3 +424,26 @@
components:
- type: Stack
count: 1

- type: entity
parent: OreBase
id: TungstenOre
name: wolframite
suffix: Full
components:
- type: Stack
stackType: TungstenOre
- type: Sprite
state: tungsten
- type: Material
- type: PhysicalComposition
materialComposition:
RawTungsten: 500

- type: entity
parent: TungstenOre
id: TungstenOre1
suffix: Single
components:
- type: Stack
count: 1
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@
- RootSpeakTranslator
- BasicGalaticCommonTranslatorImplanter
- MofficTranslator
- N14MaterialCircuitry
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot
Expand Down Expand Up @@ -295,6 +296,7 @@
- LargeBeaker
- Dropper
- ClothingEyesGlassesChemical
- N14MaterialCircuitry
dynamicRecipes:
- PowerDrill
- MiningDrill
Expand Down Expand Up @@ -494,6 +496,7 @@
- ReagentGrinderIndustrialMachineCircuitboard
- StasisBedMachineCircuitboard
- CryoPodMachineCircuitboard
- N14MaterialCircuitry
dynamicRecipes:
- ThermomachineFreezerMachineCircuitBoard
- HellfireFreezerMachineCircuitBoard
Expand Down Expand Up @@ -1055,6 +1058,9 @@
- WeaponMechCombatDisabler
- WeaponMechCombatFlashbangLauncher
- WeaponMechCombatMissileRack8
- EnergySword
- EnergySwordDouble
- EnergyCutlass
- type: MaterialStorage
whitelist:
tags:
Expand Down Expand Up @@ -1480,6 +1486,10 @@
- IngotGold1
- IngotSilver1
- MaterialBananium1
- N14IngotLead1
- N14IngotCopper1
- N14IngotAluminium1
- IngotTungsten1
- type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
magnetEnabled: True
range: 0.30 # Delta V - End Magnet Pull
Expand Down
Loading
Loading