Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

203
Resources/Maps/nss_pillar.yml
View File

@@ -29565,6 +29565,13 @@ entities:
pos: -73.5,33.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 1445
type: AirlockExternalGlassShuttleLocked
components:
@@ -29572,6 +29579,13 @@ entities:
pos: -67.5,33.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 1446
type: AirlockExternalGlassLocked
components:
@@ -29591,6 +29605,13 @@ entities:
pos: -61.5,33.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 1449
type: ReinforcedWindow
components:
@@ -34960,6 +34981,13 @@ entities:
pos: -46.5,46.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 2162
type: PoweredSmallLight
components:
@@ -99866,6 +99894,13 @@ entities:
pos: -42.5,46.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 8313
type: WallReinforced
components:
@@ -107635,6 +107670,13 @@ entities:
pos: -83.5,24.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9241
type: AirlockExternalGlassShuttleLocked
components:
@@ -107642,6 +107684,13 @@ entities:
pos: -83.5,25.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9242
type: ReinforcedWindow
components:
@@ -107760,6 +107809,13 @@ entities:
pos: -79.5,29.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9257
type: AirlockExternalGlassShuttleLocked
components:
@@ -107767,6 +107823,13 @@ entities:
pos: -80.5,29.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9258
type: CableApcExtension
components:
@@ -109983,6 +110046,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9482
type: AirlockShuttle
components:
@@ -109995,6 +110065,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9483
type: WallReinforced
components:
@@ -112979,6 +113056,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9801
type: AirlockShuttle
components:
@@ -112992,6 +113076,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9802
type: SignShipDock
components:
@@ -114505,6 +114596,13 @@ entities:
pos: -43.5,-29.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9979
type: FirelockGlass
components:
@@ -114534,6 +114632,13 @@ entities:
pos: -43.5,-25.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 9983
type: ReinforcedWindow
components:
@@ -114703,6 +114808,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 10009
type: AirlockShuttle
components:
@@ -114715,6 +114827,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 10010
type: CableApcExtension
components:
@@ -127293,6 +127412,13 @@ entities:
pos: 65.5,19.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11270
type: AirlockShuttle
components:
@@ -127300,6 +127426,13 @@ entities:
pos: 66.5,16.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11271
type: AirlockExternalGlassShuttleLocked
components:
@@ -127307,6 +127440,13 @@ entities:
pos: 66.5,0.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11272
type: AirlockExternalGlassShuttleLocked
components:
@@ -127314,6 +127454,13 @@ entities:
pos: 66.5,4.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11273
type: AirlockExternalGlassShuttleLocked
components:
@@ -127321,6 +127468,13 @@ entities:
pos: 66.5,7.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11274
type: AirlockExternalGlassShuttleLocked
components:
@@ -127328,6 +127482,13 @@ entities:
pos: 66.5,11.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 11275
type: Catwalk
components:
@@ -137082,6 +137243,13 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12248
type: AirlockShuttle
components:
@@ -137095,18 +137263,39 @@ entities:
changeAirtight: False
state: Opening
type: Door
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12249
type: AirlockShuttle
components:
- pos: 0.5,-7.5
parent: 12185
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12250
type: AirlockShuttle
components:
- pos: 1.5,-7.5
parent: 12185
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12251
type: Thruster
components:
@@ -138849,6 +139038,13 @@ entities:
pos: 25.5,36.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12428
type: ExtinguisherCabinetFilled
components:
@@ -141916,6 +142112,13 @@ entities:
pos: -43.5,-24.5
parent: 130
type: Transform
- fixtures:
- shape: !type:PhysShapeCircle
position: 0,-0.5
radius: 0.2
hard: False
id: docking
type: Fixtures
- uid: 12723
type: BoxSterile
components: