Salvage mining, ore processing, and material clean-up (#7406)

* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Chris V
2022-04-28 03:41:04 -07:00
committed by GitHub
parent 59f0ad5596
commit 94a0bc92b7
64 changed files with 707 additions and 1153 deletions

View File

@@ -25,17 +25,3 @@
name: reinforced plasma glass
icon: Objects/Materials/Sheets/glass.rsi/rpglass.png
color: "#8c4069"
- type: material
id: TitaniumGlass
stack: TitaniumGlass
name: titanium glass
icon: Objects/Materials/Sheets/glass.rsi/titaniumglass.png
color: "#333135"
- type: material
id: PlastitaniumGlass
stack: PlastitaniumGlass
name: plastitanium glass
icon: Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png
color: "#232127"

View File

@@ -20,13 +20,6 @@
icon: Objects/Materials/Sheets/other.rsi/plasma.png
color: "#7e009e"
- type: material
id: Phoron
stack: Phoron
name: phoron
icon: Objects/Materials/Sheets/other.rsi/phoron.png
color: "#FF3300"
- type: material
id: Plastic
stack: Plastic
@@ -40,3 +33,10 @@
name: wood
icon: Objects/Materials/materials.rsi/wood.png
color: "#966F33"
- type: material
id: Uranium
stack: Uranium
name: uranium
icon: Objects/Materials/Sheets/other.rsi/uranium.png
color: "#32a852"

View File

@@ -4,20 +4,6 @@
name: steel
icon: Objects/Materials/Sheets/metal.rsi/steel.png
- type: material
id: Adamantine
stack: Adamantine
name: adamantine
icon: Objects/Materials/ingots.rsi/adamantine.png
color: "#7dc37f"
- type: material
id: Copper
stack: Copper
name: copper
icon: Objects/Materials/ingots.rsi/copper.png
color: "#B87333"
- type: material
id: Gold
stack: Gold
@@ -25,18 +11,6 @@
icon: Objects/Materials/ingots.rsi/gold.png
color: "#FFD700"
- type: material
id: Hydrogen
stack: Hydrogen
name: hydrogen
icon: Objects/Materials/ingots.rsi/hydrogen.png
- type: material
id: Iron
stack: Iron
name: iron
icon: Objects/Materials/ingots.rsi/iron.png #Do we even distinguish between steel and iron?
- type: material
id: Silver
stack: Silver
@@ -50,24 +24,3 @@
name: plasteel
icon: Objects/Materials/Sheets/metal.rsi/plasteel.png
color: "#696969" #Okay, this is epic
- type: material
id: Brass
stack: Brass
name: brass
icon: Objects/Materials/Sheets/metal.rsi/brass.png
color: "#E1C16E"
- type: material
id: Titanium
stack: Titanium
name: titanium
icon: Objects/Materials/Sheets/metal.rsi/titanium.png
color: "#878681"
- type: material
id: Plastitanium
stack: Plastitanium
name: plastitanium
icon: Objects/Materials/Sheets/metal.rsi/plastitanium.png
color: "#4e4e4b"