Merge remote-tracking branch 'WD-core/master' into upstream-core

This commit is contained in:
BIGZi0348
2024-12-30 22:39:50 +03:00
2 changed files with 6295 additions and 2 deletions

View File

@@ -25,7 +25,7 @@ public sealed partial class CargoSystem
private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg");
private const string TradeStationMapPath = "/Maps/Shuttles/trading_outpost.yml";
private const string TradeStationMapPath = "/Maps/Shuttles/White/trading_outpostNY.yml"; // WD
private void InitializeShuttle()
{
@@ -355,7 +355,7 @@ public sealed partial class CargoSystem
return;
var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType);
_stack.Spawn((int)price, stackPrototype, xform.Coordinates);
_stack.Spawn((int) price, stackPrototype, xform.Coordinates);
_audio.PlayPvs(ApproveSound, uid);
UpdatePalletConsoleInterface(uid);
}

File diff suppressed because it is too large Load Diff