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:
@@ -3,6 +3,7 @@ using Content.Shared.Lathe;
|
||||
using Content.Shared.Research.Prototypes;
|
||||
using Robust.Server.GameObjects;
|
||||
using Content.Shared.Sound;
|
||||
using Content.Shared.Whitelist;
|
||||
|
||||
namespace Content.Server.Lathe.Components
|
||||
{
|
||||
@@ -10,9 +11,11 @@ namespace Content.Server.Lathe.Components
|
||||
public sealed class LatheComponent : SharedLatheComponent
|
||||
{
|
||||
/// <summary>
|
||||
/// How much volume in cm^3 each sheet of material adds
|
||||
/// Whitelist for specifying the kind of materials that can be insert into the lathe
|
||||
/// </summary>
|
||||
public int VolumePerSheet = 100;
|
||||
[ViewVariables]
|
||||
[DataField("whitelist")]
|
||||
public EntityWhitelist? LatheWhitelist;
|
||||
|
||||
/// <summary>
|
||||
/// The lathe's construction queue
|
||||
@@ -46,10 +49,16 @@ namespace Content.Server.Lathe.Components
|
||||
/// </summary>
|
||||
[DataField("producingSound")]
|
||||
public SoundSpecifier? ProducingSound;
|
||||
|
||||
/// <summary>
|
||||
/// The sound that plays when inserting an item into the lathe, if any
|
||||
/// </summary>
|
||||
[DataField("insertingSound")]
|
||||
public SoundSpecifier? InsertingSound;
|
||||
|
||||
/// <summmary>
|
||||
/// The lathe's UI.
|
||||
/// </summary>
|
||||
[ViewVariables] public BoundUserInterface? UserInterface;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user