juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ed-27-05-2025-upstream-sync

Browse Source
This commit is contained in:
Red
2025-05-29 00:50:36 +03:00
committed by GitHub
parent f509f0e152 9b6ceb8d18
commit 7642f49b00
273 changed files with 3890 additions and 4859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Cargo/Systems/PricingSystem.cs
View File

@@ -16,6 +16,7 @@ using Robust.Shared.Map.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using System.Linq;
using Content.Server._CP14.Trading;
using Content.Shared.Research.Prototypes;
namespace Content.Server.Cargo.Systems;
@@ -260,7 +261,9 @@ public sealed class PricingSystem : EntitySystem
{
double price = 0;
if (HasComp<MaterialComponent>(uid) &&
//CP14 We take materials into account when calculating the price in any case.
var proto = MetaData(uid).EntityPrototype?.ID ?? "";
if ((HasComp<MaterialComponent>(uid) || proto.StartsWith("CP14")) &&
TryComp<PhysicalCompositionComponent>(uid, out var composition))
{
var matPrice = GetMaterialPrice(composition);
@@ -277,7 +280,8 @@ public sealed class PricingSystem : EntitySystem
{
double price = 0;
if (prototype.Components.ContainsKey(Factory.GetComponentName<MaterialComponent>()) &&
//CP14 We take materials into account when calculating the price in any case.
if ((prototype.Components.ContainsKey(Factory.GetComponentName<MaterialComponent>()) || prototype.ID.StartsWith("CP14")) &&
prototype.Components.TryGetValue(Factory.GetComponentName<PhysicalCompositionComponent>(), out var composition))
{
var compositionComp = (PhysicalCompositionComponent) composition.Component;