tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke anchor fixes + cargo sell blacklist (#10286)

Browse Source
This commit is contained in:
Kara
2022-08-03 20:01:14 -07:00
committed by GitHub
parent 2a2ef4ac51
commit 5784c248ac
5 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,10 +317,15 @@ public sealed partial class CargoSystem
// Don't re-sell anything, sell anything anchored (e.g. light fixtures), or anything blacklisted
// (e.g. players).
if (toSell.Contains(ent) ||
(xformQuery.TryGetComponent(ent, out var xform) && xform.Anchored)) continue;
(xformQuery.TryGetComponent(ent, out var xform) && xform.Anchored))
continue;
if (HasComp<CargoSellBlacklistComponent>(ent))
continue;
var price = _pricing.GetPrice(ent);
if (price == 0) continue;
if (price == 0)
continue;
toSell.Add(ent);
amount += price;
}