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

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

Browse Source
This commit is contained in:
BIGZi0348
2024-12-30 22:39:50 +03:00
parent 15af2bcbfd 87df29ef1f
commit e25104c2c2
2 changed files with 6295 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
View File

@@ -25,7 +25,7 @@ public sealed partial class CargoSystem
private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg"); 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() private void InitializeShuttle()
{ {
@@ -355,7 +355,7 @@ public sealed partial class CargoSystem
return; return;
var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType); 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); _audio.PlayPvs(ApproveSound, uid);
UpdatePalletConsoleInterface(uid); UpdatePalletConsoleInterface(uid);
} }

6293
Resources/Maps/Shuttles/White/trading_outpostNY.yml Normal file
View File

File diff suppressed because it is too large Load Diff