From 563932c3e0464fbcd8dc86b8fc9f9a5e1dd4030b Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 22 Dec 2024 19:28:18 -0500 Subject: [PATCH] TradeCrate: no freebies without destinations --- Content.Server/_NF/Cargo/Systems/CargoSystem.TradeCrates.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Content.Server/_NF/Cargo/Systems/CargoSystem.TradeCrates.cs b/Content.Server/_NF/Cargo/Systems/CargoSystem.TradeCrates.cs index 0ce3773bf54..459b873d2aa 100644 --- a/Content.Server/_NF/Cargo/Systems/CargoSystem.TradeCrates.cs +++ b/Content.Server/_NF/Cargo/Systems/CargoSystem.TradeCrates.cs @@ -32,6 +32,7 @@ private void OnTradeCrateGetPriceEvent(EntityUid uid, TradeCrateComponent compon private void OnTradeCrateInit(EntityUid uid, TradeCrateComponent component, ref ComponentInit ev) { + // If there are no available destinations, tough luck. if (_destinations.Count > 0) { var destination = _destinations[_random.Next(_destinations.Count)]; @@ -39,11 +40,6 @@ private void OnTradeCrateInit(EntityUid uid, TradeCrateComponent component, ref if (TryComp(destination, out var destComp)) _appearance.SetData(uid, TradeCrateVisuals.DestinationIcon, destComp.DestinationProto); } - else - { - // No destination, everywhere is elsewhere, throw the courier a bone. - component.ValueElsewhere = component.ValueAtDestination; - } if (component.ExpressDeliveryDuration > TimeSpan.Zero) {