mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-10-01 08:37:26 +00:00
+24









Debug
deltanedas
metalgearsloth
Nemanja
PJBot
Psychpsyo
deltanedas
metalgearsloth
ravage
Pieter-Jan Briers
LEVELcat
Repo
nikthechampiongr
Doru991
DrSmugleaf
Skarletto
NULL882
lunarcomets
Miro Kavaliou
Kara
Kacper Urbańczyk
TsjipTsjip
daerSeebaer
Fluffiest Floofers
Flareguy
Leon Friedrich
Kevin Zheng
drteaspoon420
Ubaser
Nim
Kacper Urbańczyk
Tox Cruize
Ed
Michael Cu
fd2cc8570d
* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com> Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Miro Kavaliou <miraslauk@gmail.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com> Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com> Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com> Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
253 lines
9.5 KiB
C#
253 lines
9.5 KiB
C#
using System.Linq;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Interaction.Components;
|
|
using Content.Shared.Stacks;
|
|
using JetBrains.Annotations;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Timing;
|
|
|
|
namespace Content.Shared.Materials;
|
|
|
|
/// <summary>
|
|
/// This handles storing materials and modifying their amounts
|
|
/// <see cref="MaterialStorageComponent"/>
|
|
/// </summary>
|
|
public abstract class SharedMaterialStorageSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly IGameTiming _timing = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototype = default!;
|
|
|
|
/// <inheritdoc/>
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<MaterialStorageComponent, MapInitEvent>(OnMapInit);
|
|
SubscribeLocalEvent<MaterialStorageComponent, InteractUsingEvent>(OnInteractUsing);
|
|
SubscribeLocalEvent<InsertingMaterialStorageComponent, EntityUnpausedEvent>(OnUnpaused);
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
base.Update(frameTime);
|
|
var query = EntityQueryEnumerator<InsertingMaterialStorageComponent>();
|
|
while (query.MoveNext(out var uid, out var inserting))
|
|
{
|
|
if (_timing.CurTime < inserting.EndTime)
|
|
continue;
|
|
|
|
_appearance.SetData(uid, MaterialStorageVisuals.Inserting, false);
|
|
RemComp(uid, inserting);
|
|
}
|
|
}
|
|
|
|
private void OnMapInit(EntityUid uid, MaterialStorageComponent component, MapInitEvent args)
|
|
{
|
|
_appearance.SetData(uid, MaterialStorageVisuals.Inserting, false);
|
|
}
|
|
|
|
private void OnUnpaused(EntityUid uid, InsertingMaterialStorageComponent component, ref EntityUnpausedEvent args)
|
|
{
|
|
component.EndTime += args.PausedTime;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the volume of a specified material contained in this storage.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="material"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>The volume of the material</returns>
|
|
[PublicAPI]
|
|
public int GetMaterialAmount(EntityUid uid, MaterialPrototype material, MaterialStorageComponent? component = null)
|
|
{
|
|
return GetMaterialAmount(uid, material.ID, component);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the volume of a specified material contained in this storage.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="material"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>The volume of the material</returns>
|
|
public int GetMaterialAmount(EntityUid uid, string material, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return 0; //you have nothing
|
|
return !component.Storage.TryGetValue(material, out var amount) ? 0 : amount;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the total volume of all materials in the storage.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>The volume of all materials in the storage</returns>
|
|
public int GetTotalMaterialAmount(EntityUid uid, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return 0;
|
|
return component.Storage.Values.Sum();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests if a specific amount of volume will fit in the storage.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="volume"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>If the specified volume will fit</returns>
|
|
public bool CanTakeVolume(EntityUid uid, int volume, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return false;
|
|
return component.StorageLimit == null || GetTotalMaterialAmount(uid, component) + volume <= component.StorageLimit;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks if the specified material can be changed by the specified volume.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="materialId"></param>
|
|
/// <param name="volume"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>If the amount can be changed</returns>
|
|
public bool CanChangeMaterialAmount(EntityUid uid, string materialId, int volume, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return false;
|
|
return CanTakeVolume(uid, volume, component) &&
|
|
(component.MaterialWhiteList == null || component.MaterialWhiteList.Contains(materialId)) &&
|
|
(!component.Storage.TryGetValue(materialId, out var amount) || amount + volume >= 0);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Changes the amount of a specific material in the storage.
|
|
/// Still respects the filters in place.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="materialId"></param>
|
|
/// <param name="volume"></param>
|
|
/// <param name="component"></param>
|
|
/// <returns>If it was successful</returns>
|
|
public bool TryChangeMaterialAmount(EntityUid uid, string materialId, int volume, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return false;
|
|
if (!CanChangeMaterialAmount(uid, materialId, volume, component))
|
|
return false;
|
|
if (!component.Storage.ContainsKey(materialId))
|
|
component.Storage.Add(materialId, 0);
|
|
component.Storage[materialId] += volume;
|
|
|
|
var ev = new MaterialAmountChangedEvent();
|
|
RaiseLocalEvent(uid, ref ev);
|
|
Dirty(component);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tries to set the amount of material in the storage to a specific value.
|
|
/// Still respects the filters in place.
|
|
/// </summary>
|
|
/// <param name="uid">The entity to change the material storage on.</param>
|
|
/// <param name="materialId">The ID of the material to change.</param>
|
|
/// <param name="volume">The stored material volume to set the storage to.</param>
|
|
/// <param name="component">The storage component on <paramref name="uid"/>. Resolved automatically if not given.</param>
|
|
/// <returns>True if it was successful (enough space etc).</returns>
|
|
public bool TrySetMaterialAmount(
|
|
EntityUid uid,
|
|
string materialId,
|
|
int volume,
|
|
MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component))
|
|
return false;
|
|
|
|
var curAmount = GetMaterialAmount(uid, materialId, component);
|
|
var delta = volume - curAmount;
|
|
return TryChangeMaterialAmount(uid, materialId, delta, component);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tries to insert an entity into the material storage.
|
|
/// </summary>
|
|
public virtual bool TryInsertMaterialEntity(EntityUid user,
|
|
EntityUid toInsert,
|
|
EntityUid receiver,
|
|
MaterialStorageComponent? storage = null,
|
|
MaterialComponent? material = null,
|
|
PhysicalCompositionComponent? composition = null)
|
|
{
|
|
if (!Resolve(receiver, ref storage))
|
|
return false;
|
|
|
|
if (!Resolve(toInsert, ref material, ref composition, false))
|
|
return false;
|
|
|
|
if (storage.Whitelist?.IsValid(toInsert) == false)
|
|
return false;
|
|
|
|
if (HasComp<UnremoveableComponent>(toInsert))
|
|
return false;
|
|
|
|
// Material Whitelist checked implicitly by CanChangeMaterialAmount();
|
|
|
|
var multiplier = TryComp<StackComponent>(toInsert, out var stackComponent) ? stackComponent.Count : 1;
|
|
var totalVolume = 0;
|
|
foreach (var (mat, vol) in composition.MaterialComposition)
|
|
{
|
|
if (!CanChangeMaterialAmount(receiver, mat, vol * multiplier, storage))
|
|
return false;
|
|
totalVolume += vol * multiplier;
|
|
}
|
|
|
|
if (!CanTakeVolume(receiver, totalVolume, storage))
|
|
return false;
|
|
|
|
foreach (var (mat, vol) in composition.MaterialComposition)
|
|
{
|
|
TryChangeMaterialAmount(receiver, mat, vol * multiplier, storage);
|
|
}
|
|
|
|
var insertingComp = EnsureComp<InsertingMaterialStorageComponent>(receiver);
|
|
insertingComp.EndTime = _timing.CurTime + storage.InsertionTime;
|
|
if (!storage.IgnoreColor)
|
|
{
|
|
_prototype.TryIndex<MaterialPrototype>(composition.MaterialComposition.Keys.First(), out var lastMat);
|
|
insertingComp.MaterialColor = lastMat?.Color;
|
|
}
|
|
_appearance.SetData(receiver, MaterialStorageVisuals.Inserting, true);
|
|
Dirty(insertingComp);
|
|
|
|
var ev = new MaterialEntityInsertedEvent(material);
|
|
RaiseLocalEvent(receiver, ref ev);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Broadcasts an event that will collect a list of which materials
|
|
/// are allowed to be inserted into the materialStorage.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="component"></param>
|
|
public void UpdateMaterialWhitelist(EntityUid uid, MaterialStorageComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component, false))
|
|
return;
|
|
var ev = new GetMaterialWhitelistEvent(uid);
|
|
RaiseLocalEvent(uid, ref ev);
|
|
component.MaterialWhiteList = ev.Whitelist;
|
|
Dirty(component);
|
|
}
|
|
|
|
private void OnInteractUsing(EntityUid uid, MaterialStorageComponent component, InteractUsingEvent args)
|
|
{
|
|
if (args.Handled || !component.InsertOnInteract)
|
|
return;
|
|
args.Handled = TryInsertMaterialEntity(args.User, args.Used, uid, component);
|
|
}
|
|
}
|