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>
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 191 B After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 286 B |
BIN
Resources/Textures/Objects/Materials/ore.rsi/coal.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
Resources/Textures/Objects/Materials/ore.rsi/copper.png
Normal file
|
After Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 190 B |
|
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 230 B After Width: | Height: | Size: 200 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/210/commits/d188de4d110a4f433ce3d30211be30d8257dc4c3 modified by HoofedEar",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -13,12 +13,6 @@
|
||||
{
|
||||
"name": "ammonia"
|
||||
},
|
||||
{
|
||||
"name": "bananium"
|
||||
},
|
||||
{
|
||||
"name": "diamond"
|
||||
},
|
||||
{
|
||||
"name": "gold"
|
||||
},
|
||||
@@ -26,28 +20,22 @@
|
||||
"name": "iron"
|
||||
},
|
||||
{
|
||||
"name": "phoron"
|
||||
"name": "uranium"
|
||||
},
|
||||
{
|
||||
"name": "plasma"
|
||||
},
|
||||
{
|
||||
"name": "sand"
|
||||
},
|
||||
{
|
||||
"name": "sand_black"
|
||||
"name": "spacequartz"
|
||||
},
|
||||
{
|
||||
"name": "silver"
|
||||
},
|
||||
{
|
||||
"name": "slag"
|
||||
"name": "copper"
|
||||
},
|
||||
{
|
||||
"name": "titanium"
|
||||
},
|
||||
{
|
||||
"name": "uranium"
|
||||
"name": "coal"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 551 B |
|
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 375 B |
|
Before Width: | Height: | Size: 374 B |
|
Before Width: | Height: | Size: 284 B |
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 168 B |
BIN
Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png
Normal file
|
After Width: | Height: | Size: 219 B |
|
Before Width: | Height: | Size: 338 B |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 355 B |
BIN
Resources/Textures/Objects/Tools/handdrill.rsi/handdrill.png
Normal file
|
After Width: | Height: | Size: 687 B |
14
Resources/Textures/Objects/Tools/handdrill.rsi/meta.json
Normal file
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/2ce04dea2495ed19aeca4b6b42bf59fef2b4dd37",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "handdrill"
|
||||
}
|
||||
]
|
||||
}
|
||||