diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 20ba4c04cd9..2a20f96409c 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -20,6 +20,9 @@ using Content.Server._Mono.VendingMachine; // Mono using System.Linq; using Content.Shared.Research.Prototypes; +using Content.Shared.Body.Organ; // LuaM +using Content.Shared.Body.Part; // LuaM + namespace Content.Server.Cargo.Systems; @@ -276,6 +279,10 @@ public double GetPrice(EntityUid uid, bool includeContents = true) { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end price += GetPrice(ent); } } @@ -321,6 +328,10 @@ public double GetPriceWithVendingDiscount(EntityUid uid, EntityUid currentGrid, { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end price += GetPriceWithVendingDiscount(ent, currentGrid); } } @@ -350,6 +361,10 @@ public double GetPriceConditional(EntityUid uid, bool includeContents = true, Fu { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end: price += GetPriceConditional(ent, true, predicate); } } diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml index 85d1d00fdcc..c1ed95f1e3e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml @@ -54,6 +54,7 @@ - id: ClothingBeltQuiverCrossbowFilledBolt - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -74,6 +75,7 @@ - id: ClothingBeltQuiverCrossbowFilledUranium - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -93,6 +95,7 @@ - id: ClothingBeltQuiverCrossbowFilledPlasma - id: SpaceCash500 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -111,6 +114,7 @@ items: - id: SpaceCash500 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -140,6 +144,7 @@ - id: MaterialBones prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -175,6 +180,7 @@ - id: MaterialBones prob: 0.1 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -210,6 +216,7 @@ - id: MaterialBones1 prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -236,6 +243,7 @@ - id: MaterialBones1 prob: 0.05 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml index 382fd666332..025b586ade5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml @@ -103,6 +103,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -143,6 +144,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -183,6 +185,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -231,6 +234,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -283,6 +287,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml index b37650ed0f7..a2b03cbd2c0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml @@ -65,6 +65,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -121,6 +122,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -182,6 +184,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -240,6 +243,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -309,6 +313,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -384,6 +389,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -497,6 +503,7 @@ - id: AmmoTechFabCircuitboard prob: 0.1 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml index f405ea6322a..3433a49e62e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml @@ -71,6 +71,7 @@ amount: 1 prob: 0.05 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -114,6 +115,7 @@ amount: 1 prob: 0.05 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -161,6 +163,7 @@ amount: 1 prob: 0.05 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -216,6 +219,7 @@ amount: 1 prob: 0.45 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -274,6 +278,7 @@ prob: 0.1 amount: 1 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpaceCash1000 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml index ca9d09d079e..ddb33f4c8a4 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml @@ -78,6 +78,7 @@ - id: SpeedLoader45_magnumAP - id: SpaceCash5000 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -108,6 +109,7 @@ - id: SpeedLoader45_magnumFMJ - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -136,6 +138,7 @@ - id: SpeedLoader45_magnumFMJ - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -163,6 +166,7 @@ items: - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -194,6 +198,7 @@ - id: PowerCellHyperPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -223,6 +228,7 @@ - id: PowerCellHighPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -251,6 +257,7 @@ - id: PowerCellHighPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -279,6 +286,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -311,6 +319,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -340,6 +349,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -368,6 +378,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -393,6 +404,7 @@ items: - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -423,6 +435,7 @@ - id: SpaceCash1000 - id: SpaceCash1000 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -455,6 +468,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -487,6 +501,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -517,6 +532,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -548,6 +564,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -568,6 +585,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -588,6 +606,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -606,6 +625,7 @@ items: - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -654,6 +674,7 @@ - id: Stimpack - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -676,6 +697,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -697,6 +719,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -717,6 +740,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -743,6 +767,7 @@ - id: SpaceCash1000 - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -770,6 +795,7 @@ - id: JawsOfLife - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -796,6 +822,7 @@ - id: JawsOfLife - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -821,6 +848,7 @@ items: - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -853,6 +881,7 @@ - id: Stimpack - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -880,6 +909,7 @@ - id: Stimpack - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -906,6 +936,7 @@ - id: WeaponWaterBlaster - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -932,6 +963,7 @@ - id: WeaponWaterPistol - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -960,6 +992,7 @@ amount: 4 - id: SpaceCash5000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -987,6 +1020,7 @@ amount: 2 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -1014,6 +1048,7 @@ amount: 4 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -1041,6 +1076,7 @@ amount: 2 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000