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

@@ -22,14 +22,3 @@
icon: /Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png
spawn: SheetRPGlass1
- type: stack
id: TitaniumGlass
name: titanium glass
icon: /Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png
spawn: SheetTitaniumGlass1
- type: stack
id: PlastitaniumGlass
name: plastitanium glass
icon: /Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png
spawn: SheetPlastitaniumGlass1

View File

@@ -10,21 +10,4 @@
icon: /Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png
spawn: SheetPlasteel1
- type: stack
id: Titanium
name: titanium
icon: /Textures/Objects/Materials/Sheets/metal.rsi/titanium.png
spawn: SheetTitanium1
- type: stack
id: Plastitanium
name: plastitanium
icon: /Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png
spawn: SheetPlastitanium1
- type: stack
id: Brass
name: brass
icon: /Textures/Objects/Materials/Sheets/metal.rsi/brass.png
spawn: SheetBrass1

View File

@@ -4,12 +4,6 @@
icon: /Textures/Objects/Materials/Sheets/other.rsi/paper.png
spawn: SheetPaper1
- type: stack
id: Phoron
name: phoron
icon: /Textures/Objects/Materials/Sheets/other.rsi/phoron.png
spawn: SheetPhoron1
- type: stack
id: Plasma
name: plasma
@@ -26,4 +20,4 @@
id: Uranium
name: uranium
icon: /Textures/Objects/Materials/Sheets/other.rsi/uranium.png
spawn: SheetUranium1
spawn: SheetUranium1

View File

@@ -1,33 +1,9 @@
- type: stack
id: Adamantine
name: adamantine
icon: "/Textures/Objects/Materials/ingots.rsi/adamantine.png"
spawn: IngotAdamantine1
- type: stack
id: Copper
name: copper
icon: "/Textures/Objects/Materials/ingots.rsi/copper.png"
spawn: IngotCopper1
- type: stack
id: Gold
name: gold
icon: "/Textures/Objects/Materials/ingots.rsi/gold.png"
spawn: IngotGold1
- type: stack
id: Hydrogen
name: hydrogen
icon: "/Textures/Objects/Materials/ingots.rsi/hydrogen.png"
spawn: IngotHydrogen1
- type: stack
id: Iron
name: iron
icon: "/Textures/Objects/Materials/ingots.rsi/iron.png"
spawn: IngotIron1
- type: stack
id: Silver
name: silver

View File

@@ -1,15 +1,3 @@
- type: stack
id: Bananium
name: bananium
icon: /Textures/Objects/Materials/materials.rsi/bananium.png
spawn: MaterialBananium1
- type: stack
id: Diamond
name: diamond
icon: /Textures/Objects/Materials/materials.rsi/diamond.png
spawn: MaterialDiamond1
- type: stack
id: WoodPlank
name: wood plank
@@ -22,12 +10,6 @@
icon: /Textures/Objects/Materials/materials.rsi/cloth.png
spawn: MaterialCloth1
- type: stack
id: Cotton
name: cotton
icon: /Textures/Objects/Materials/materials.rsi/cotton.png
spawn: MaterialCotton1
- type: stack
id: Durathread
name: durathread
@@ -35,19 +17,13 @@
spawn: MaterialDurathread1
- type: stack
id: RawDurathread
name: raw durathread
icon: /Textures/Objects/Materials/materials.rsi/durathreadraw.png
spawn: MaterialDurathreadRaw1
id: Diamond
name: diamond
icon: /Textures/Objects/Materials/materials.rsi/diamond.png
spawn: MaterialDiamond1
- type: stack
id: Hide
name: hide
icon: /Textures/Objects/Materials/materials.rsi/hide.png
spawn: MaterialHide1
- type: stack
id: Leather
name: leather
icon: /Textures/Objects/Materials/materials.rsi/leather.png
spawn: MaterialLeather1
id: Cotton
name: cotton
icon: /Textures/Objects/Materials/materials.rsi/cotton.png
spawn: MaterialCotton1

View File

@@ -1,27 +1,3 @@
- type: stack
id: AdamantineOre
name: adamantine ore
icon: /Textures/Objects/Materials/ore.rsi/adamantine.png
spawn: AdamantineOre1
- type: stack
id: Ammonia
name: ammonia
icon: /Textures/Objects/Materials/ore.rsi/ammonia.png
spawn: Ammonia1
- type: stack
id: BananiumOre
name: bananium ore
icon: /Textures/Objects/Materials/ore.rsi/bananium.png
spawn: BananiumOre1
- type: stack
id: DiamondRaw
name: diamond ore
icon: /Textures/Objects/Materials/ore.rsi/diamond.png
spawn: DiamondRaw1
- type: stack
id: GoldOre
name: gold ore
@@ -29,16 +5,10 @@
spawn: GoldOre1
- type: stack
id: IronOre
name: iron ore
id: SteelOre
name: steel ore
icon: /Textures/Objects/Materials/ore.rsi/iron.png
spawn: IronOre1
- type: stack
id: PhoronOre
name: phoron ore
icon: /Textures/Objects/Materials/ore.rsi/phoron.png
spawn: PhoronOre1
spawn: SteelOre1
- type: stack
id: PlasmaOre
@@ -46,18 +16,6 @@
icon: /Textures/Objects/Materials/ore.rsi/plasma.png
spawn: PlasmaOre1
- type: stack
id: Sand
name: sand
icon: /Textures/Objects/Materials/ore.rsi/sand.png
spawn: Sand1
- type: stack
id: BlackSand
name: black sand
icon: /Textures/Objects/Materials/ore.rsi/sand_black.png
spawn: SandBlack1
- type: stack
id: SilverOre
name: silver ore
@@ -65,19 +23,13 @@
spawn: SilverOre1
- type: stack
id: Slag
name: slag
icon: /Textures/Objects/Materials/ore.rsi/slag.png
spawn: Slag1
- type: stack
id: TitaniumOre
name: titanium ore
icon: /Textures/Objects/Materials/ore.rsi/titanium.png
spawn: TitaniumOre1
id: SpaceQuartz
name: space quartz
icon: /Textures/Objects/Materials/ore.rsi/spacequartz.png
spawn: SpaceQuartz1
- type: stack
id: UraniumOre
name: uranium ore
icon: /Textures/Objects/Materials/ore.rsi/titanium.png
spawn: UraniumOre1
icon: /Textures/Objects/Materials/ore.rsi/uranium.png
spawn: UraniumOre1