From 67ee9d18b5341c1493f59ed6242a98c4f9663f4c Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Mon, 13 May 2024 22:07:08 +0400 Subject: [PATCH] Revert "vending machines requiring money" --- .../UI/VendingMachineMenu.xaml | 6 - .../UI/VendingMachineMenu.xaml.cs | 7 +- .../VendingMachineBoundUserInterface.cs | 1 - Content.IntegrationTests/Tests/CargoTest.cs | 1 - .../Tests/VendingMachineRestockTest.cs | 2 +- .../VendingMachines/VendingMachineSystem.cs | 109 ++---------------- .../SharedVendingMachineSystem.cs | 68 ++++++++++- .../VendingMachineComponent.cs | 12 +- .../VendingMachineInterfaceState.cs | 4 +- Resources/Changelog/ChangelogADT.yml | 13 +-- .../vending-machine-component.ftl | 1 - .../vending-machine-component.ftl | 1 - .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../Fills/Backpacks/StarterGear/satchel.yml | 2 +- .../ADT/Catalog/Fills/Cargo/cargo_food.yml | 2 +- .../ADT/Catalog/Fills/Cargo/cargo_fun.yml | 4 +- .../ADT/Catalog/Fills/Cargo/cargo_service.yml | 2 +- .../Catalog/Cargo/cargo_emergency.yml | 2 +- .../Catalog/Cargo/cargo_vending.yml | 4 +- .../Fills/Backpacks/StarterGear/backpack.yml | 46 ++++---- .../Fills/Backpacks/StarterGear/duffelbag.yml | 47 ++++---- .../Fills/Backpacks/StarterGear/satchel.yml | 47 ++++---- .../Entities/Clothing/Back/backpacks.yml | 2 - .../Clothing/Eyes/base_clothingeyes.yml | 2 - .../Clothing/Hands/base_clothinghands.yml | 2 - .../Clothing/Head/base_clothinghead.yml | 2 - .../Clothing/Neck/base_clothingneck.yml | 2 - .../Clothing/Shoes/base_clothingshoes.yml | 2 - .../Uniforms/base_clothinguniforms.yml | 3 - .../Consumable/Drinks/drinks_bottles.yml | 2 - .../Objects/Consumable/Drinks/drinks_cans.yml | 2 - .../Objects/Consumable/Drinks/drinks_cups.yml | 4 +- .../Objects/Consumable/Food/snacks.yml | 2 - .../Smokeables/Cigarettes/packs.yml | 2 - .../Entities/Objects/Devices/radio.yml | 2 - .../Entities/Objects/Fun/whistles.yml | 2 - .../Entities/Objects/Misc/fluff_lights.yml | 2 - .../Entities/Objects/Misc/handcuffs.yml | 2 - .../Entities/Objects/Misc/space_cash.yml | 22 ---- .../Objects/Specific/Medical/healing.yml | 2 - .../Objects/Specific/Salvage/ore_bag.yml | 2 - .../Entities/Objects/Tools/flare.yml | 4 +- .../Prototypes/Entities/Objects/Tools/gps.yml | 2 - .../Entities/Objects/Tools/lighters.yml | 6 - .../Objects/Weapons/Bombs/plastic.yml | 4 +- .../Guns/Ammunition/Boxes/antimateriel.yml | 2 - .../Guns/Ammunition/Boxes/caseless_rifle.yml | 3 +- .../Guns/Ammunition/Boxes/light_rifle.yml | 5 +- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 3 +- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 3 +- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 3 +- .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 4 +- .../Objects/Weapons/Guns/Basic/pka.yml | 2 - .../Objects/Weapons/Melee/pickaxe.yml | 2 - .../Objects/Weapons/Throwable/clusterbang.yml | 4 - .../Objects/Weapons/Throwable/grenades.yml | 4 - .../Entities/Objects/Weapons/security.yml | 2 +- .../Prototypes/Entities/Objects/base_item.yml | 1 - 58 files changed, 165 insertions(+), 333 deletions(-) diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml index 7de6844631d..1fcb1a7898c 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml @@ -4,12 +4,6 @@ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" xmlns:style="clr-namespace:Content.Client.Stylesheets"> - - inventory, out List if (itemName.Length > longestEntry.Length) longestEntry = itemName; - vendingItem.Text = $"${entry.Cost} | {itemName} [{entry.Amount}]"; + vendingItem.Text = $"{itemName} [{entry.Amount}]"; vendingItem.Icon = icon; filteredInventory.Add(i); } @@ -106,10 +106,5 @@ private void SetSizeAfterUpdate(int longestEntryLength, int contentCount) SetSize = new Vector2(Math.Clamp((longestEntryLength + 2) * 12, 250, 300), Math.Clamp(contentCount * 50, 150, 350)); } - - public void UpdateBalance(int points) - { - PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", points.ToString())); - } } } diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 2c29552fe85..17ddba77ffc 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -49,7 +49,6 @@ protected override void UpdateState(BoundUserInterfaceState state) _cachedInventory = newState.Inventory; _menu?.Populate(_cachedInventory, out _cachedFilteredIndex, _menu.SearchBar.Text); - _menu?.UpdateBalance(newState.Balance); } private void OnItemSelected(ItemList.ItemListSelectedEventArgs args) diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index f0e32bcedeb..09f179cf4f5 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -3,7 +3,6 @@ using System.Numerics; using Content.Server.Cargo.Components; using Content.Server.Cargo.Systems; -using Content.Shared.Cargo.Components; using Content.Shared.Cargo.Prototypes; using Content.Shared.Stacks; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs index a17191398d4..99481db70e7 100644 --- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs @@ -334,7 +334,7 @@ public async Task TestRestockInventoryBounds() var entityManager = server.ResolveDependency(); var entitySystemManager = server.ResolveDependency(); - var vendingMachineSystem = entitySystemManager.GetEntitySystem(); + var vendingMachineSystem = entitySystemManager.GetEntitySystem(); var testMap = await pair.CreateTestMap(); diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 45e7c834e53..9443b0b3948 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -10,21 +10,18 @@ using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Actions; -using Content.Shared.Cargo.Components; using Content.Shared.Damage; using Content.Shared.Destructible; using Content.Shared.DoAfter; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; using Content.Shared.Emp; -using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Throwing; using Content.Shared.UserInterface; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -43,7 +40,6 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly AdvertiseSystem _advertise = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; private ISawmill _sawmill = default!; @@ -74,18 +70,11 @@ public override void Initialize() SubscribeLocalEvent(OnDoAfter); SubscribeLocalEvent(OnPriceCalculation); - - SubscribeLocalEvent(OnInteractUsing); } private void OnComponentMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args) { _action.AddAction(uid, ref component.ActionEntity, component.Action, uid); - RestockInventoryFromPrototype(uid, component); - if (HasComp(uid)) - { - TryUpdateVisualState(uid, component); - } Dirty(uid, component); } @@ -107,6 +96,16 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re args.Price += price; } + protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) + { + base.OnComponentInit(uid, component, args); + + if (HasComp(uid)) + { + TryUpdateVisualState(uid, component); + } + } + private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args) { if (component.Broken) @@ -130,7 +129,7 @@ private void OnBoundUIClosed(EntityUid uid, VendingMachineComponent component, B private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component) { - var state = new VendingMachineInterfaceState(GetAllInventory(uid, component), component.Balance); + var state = new VendingMachineInterfaceState(GetAllInventory(uid, component)); _userInterfaceSystem.TrySetUiState(uid, VendingMachineUiKey.Key, state); } @@ -293,15 +292,8 @@ public void TryEjectVendorItem(EntityUid uid, InventoryType type, string itemId, if (string.IsNullOrEmpty(entry.ID)) return; - if (vendComponent.Balance < entry.Cost) - { - Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-not-enough-money"), uid); - Deny(uid, vendComponent); - return; - } // Start Ejecting, and prevent users from ordering while anim playing - vendComponent.Balance = Math.Max(0, vendComponent.Balance - entry.Cost); vendComponent.Ejecting = true; vendComponent.NextItemToEject = entry.ID; vendComponent.ThrowNextItem = throwItem; @@ -527,84 +519,5 @@ private void OnEmpPulse(EntityUid uid, VendingMachineComponent component, ref Em component.NextEmpEject = _timing.CurTime; } } - public void RestockInventoryFromPrototype(EntityUid uid, - VendingMachineComponent? component = null) - { - if (!Resolve(uid, ref component)) - { - return; - } - - if (!PrototypeManager.TryIndex(component.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype)) - return; - - AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component); - AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component); - AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component); - - UpdateVendingMachineInterfaceState(uid, component); - } - - private void AddInventoryFromPrototype(EntityUid uid, Dictionary? entries, - InventoryType type, - VendingMachineComponent? component = null) - { - if (!Resolve(uid, ref component) || entries == null) - { - return; - } - - Dictionary inventory; - switch (type) - { - case InventoryType.Regular: - inventory = component.Inventory; - break; - case InventoryType.Emagged: - inventory = component.EmaggedInventory; - break; - case InventoryType.Contraband: - inventory = component.ContrabandInventory; - break; - default: - return; - } - - foreach (var (id, amount) in entries) - { - if (PrototypeManager.TryIndex(id, out var proto)) - { - if (inventory.TryGetValue(id, out var entry)) - // Prevent a machine's stock from going over three times - // the prototype's normal amount. This is an arbitrary - // number and meant to be a convenience for someone - // restocking a machine who doesn't want to force vend out - // all the items just to restock one empty slot without - // losing the rest of the restock. - entry.Amount = Math.Min(entry.Amount + amount, 3 * amount); - else - { - var minCost = Math.Max(0, (int) _pricing.GetEstimatedPrice(proto)); - inventory.Add(id, new VendingMachineInventoryEntry(type, id, amount, _random.Next(minCost, 1 * minCost))); - } - } - } - } - - private void OnInteractUsing(EntityUid uid, VendingMachineComponent component, ref InteractUsingEvent args) - { - if (!HasComp(args.Used)) - return; - - var price = _pricing.GetPrice(args.Used); - - if (price == 0) - return; - - _audio.PlayPvs(component.SoundConfirm, uid); - component.Balance += (int) price; - UpdateVendingMachineInterfaceState(uid, component); - QueueDel(args.Used); - } } } diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 74d536acdfc..50803e8ee26 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -7,7 +7,6 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; -using Robust.Shared.Random; namespace Content.Shared.VendingMachines; @@ -18,15 +17,35 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly IComponentFactory _factory = default!; - [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnComponentInit); SubscribeLocalEvent(OnAfterInteract); } + protected virtual void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) + { + RestockInventoryFromPrototype(uid, component); + } + + public void RestockInventoryFromPrototype(EntityUid uid, + VendingMachineComponent? component = null) + { + if (!Resolve(uid, ref component)) + { + return; + } + + if (!PrototypeManager.TryIndex(component.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype)) + return; + + AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component); + AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component); + AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component); + } + /// /// Returns all of the vending machine's inventory. Only includes emagged and contraband inventories if /// exists and is true @@ -58,4 +77,47 @@ public List GetAvailableInventory(EntityUid uid, V return GetAllInventory(uid, component).Where(_ => _.Amount > 0).ToList(); } + + private void AddInventoryFromPrototype(EntityUid uid, Dictionary? entries, + InventoryType type, + VendingMachineComponent? component = null) + { + if (!Resolve(uid, ref component) || entries == null) + { + return; + } + + Dictionary inventory; + switch (type) + { + case InventoryType.Regular: + inventory = component.Inventory; + break; + case InventoryType.Emagged: + inventory = component.EmaggedInventory; + break; + case InventoryType.Contraband: + inventory = component.ContrabandInventory; + break; + default: + return; + } + + foreach (var (id, amount) in entries) + { + if (PrototypeManager.HasIndex(id)) + { + if (inventory.TryGetValue(id, out var entry)) + // Prevent a machine's stock from going over three times + // the prototype's normal amount. This is an arbitrary + // number and meant to be a convenience for someone + // restocking a machine who doesn't want to force vend out + // all the items just to restock one empty slot without + // losing the rest of the restock. + entry.Amount = Math.Min(entry.Amount + amount, 3 * amount); + else + inventory.Add(id, new VendingMachineInventoryEntry(type, id, amount)); + } + } + } } diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 26af17bc548..a7c8ae299ad 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -104,9 +104,6 @@ public sealed partial class VendingMachineComponent : Component // Yoinked from: https://github.com/discordia-space/CEV-Eris/blob/35bbad6764b14e15c03a816e3e89aa1751660ba9/sound/machines/Custom_deny.ogg public SoundSpecifier SoundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg"); - [DataField] - public SoundSpecifier SoundConfirm = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg"); - /// /// The action available to the player controlling the vending machine /// @@ -118,10 +115,6 @@ public sealed partial class VendingMachineComponent : Component [AutoNetworkedField] public EntityUid? ActionEntity; - [ViewVariables(VVAccess.ReadWrite)] - [AutoNetworkedField] - public int Balance; - public float NonLimitedEjectForce = 7.5f; public float NonLimitedEjectRange = 5f; @@ -199,14 +192,11 @@ public sealed class VendingMachineInventoryEntry public string ID; [ViewVariables(VVAccess.ReadWrite)] public uint Amount; - [ViewVariables(VVAccess.ReadWrite)] - public int Cost; - public VendingMachineInventoryEntry(InventoryType type, string id, uint amount, int cost) + public VendingMachineInventoryEntry(InventoryType type, string id, uint amount) { Type = type; ID = id; Amount = amount; - Cost = cost; } } diff --git a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs index 6cc9e34de29..82758b17f60 100644 --- a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs +++ b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs @@ -6,12 +6,10 @@ namespace Content.Shared.VendingMachines public sealed class VendingMachineInterfaceState : BoundUserInterfaceState { public List Inventory; - public int Balance; - public VendingMachineInterfaceState(List inventory, int balance) + public VendingMachineInterfaceState(List inventory) { Inventory = inventory; - Balance = balance; } } diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 8501d2254bc..5c007c08cd6 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1763,16 +1763,9 @@ Entries: - author: Мудрый дуб changes: - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix} - id: 55746 #костыль отображения в Обновлениях - time: '2024-05-07T23:25:00.0000000+00:00' - -- author: Xelasto - changes: - - {message: "NanoTrasen решило поднять зарплату всем сотрудникам станции.", type: Tweak} - - {message: "Чтобы возместить расходы, торговые автоматы стали брать плату за товар.", type: Add} - id: 55747 #костыль отображения в Обновлениях - time: '2024-05-10T08:20:00.0000000+00:00' - + id: 55747 + time: '2024-05-07T23:25:00.0000000+00:00' + - author: JustKekc changes: - {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add} diff --git a/Resources/Locale/en-US/vending-machines/vending-machine-component.ftl b/Resources/Locale/en-US/vending-machines/vending-machine-component.ftl index f005c8b90ed..c00586a920e 100644 --- a/Resources/Locale/en-US/vending-machines/vending-machine-component.ftl +++ b/Resources/Locale/en-US/vending-machines/vending-machine-component.ftl @@ -4,4 +4,3 @@ vending-machine-component-try-eject-invalid-item = Invalid item vending-machine-component-try-eject-out-of-stock = Out of stock vending-machine-component-try-eject-access-denied = Access denied vending-machine-component-search-filter = Search... -vending-machine-component-try-eject-not-enough-money = Not enough money diff --git a/Resources/Locale/ru-RU/vending-machines/vending-machine-component.ftl b/Resources/Locale/ru-RU/vending-machines/vending-machine-component.ftl index f67e7a71847..6533e1a2641 100644 --- a/Resources/Locale/ru-RU/vending-machines/vending-machine-component.ftl +++ b/Resources/Locale/ru-RU/vending-machines/vending-machine-component.ftl @@ -3,4 +3,3 @@ vending-machine-component-try-eject-invalid-item = Несуществующий предмет vending-machine-component-try-eject-out-of-stock = Нет в наличии vending-machine-component-try-eject-access-denied = Доступ запрещён -vending-machine-component-try-eject-not-enough-money = Недостаточно кредитов diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 82e6be23e31..24b21c6e340 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash750 + - id: SpaceCash500 - type: entity parent: ClothingBackpackDuffelSyndicateBundle diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 8233d51f538..4a32d348a7f 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -7,4 +7,4 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash750 + - id: SpaceCash500 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml index 1b4a2cef468..e0bb19ff0dd 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml @@ -106,7 +106,7 @@ sprite: ADT/Objects/Misc/halloween_smilecandy_bowl.rsi state: icon-0 product: ADTCrateHalloweenFood - cost: 2100 + cost: 1200 category: cargoproduct-category-name-food group: market diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml index 610564f52a3..ac516a10e1b 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml @@ -4,7 +4,7 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortgreen.rsi state: icon product: ADTCrateOktoberfestCloth - cost: 1900 + cost: 750 category: cargoproduct-category-name-fun group: market @@ -24,7 +24,7 @@ sprite: ADT/Objects/Storage/halloween_box.rsi state: pennywise product: ADTCrateHalloweenCloth - cost: 6250 + cost: 4250 category: cargoproduct-category-name-fun group: market diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml index 171f9d6a8c9..4a53c98e5dc 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml @@ -4,6 +4,6 @@ sprite: ADT/Objects/Specific/Service/vending_machine_restock.rsi state: base product: ADTCrateVendingMachineRestockStyleoMatFilled - cost: 7250 + cost: 4000 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index e1ed4281dcc..2715e0c3501 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml @@ -14,7 +14,7 @@ sprite: Objects/Misc/fire_extinguisher.rsi state: fire_extinguisher_closed product: CrateEmergencyFire - cost: 1550 + cost: 1500 category: cargoproduct-category-name-emergency group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 885b7b34b2b..6874d402db4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 10550 + cost: 7000 category: cargoproduct-category-name-service group: market @@ -224,7 +224,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockGetmoreChocolateCorpFilled - cost: 2400 + cost: 1200 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 228f557466e..e68c157ac60 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -18,7 +18,7 @@ - id: BoxHug - id: RubberStampClown - id: CrayonRainbow - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -31,7 +31,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -44,7 +44,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -56,7 +56,7 @@ - id: Flash - id: BoxSurvivalSecurity - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -66,7 +66,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -77,7 +77,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -89,8 +89,8 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash10000 - + - id: SpaceCash1000 + - id: SpaceCash1000 - type: entity noSpawn: true @@ -103,7 +103,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -116,7 +115,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -129,7 +127,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -142,7 +139,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -155,7 +151,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -168,7 +163,6 @@ - id: Flash - id: MagazinePistol - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -178,7 +172,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -188,7 +182,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -198,7 +192,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1250 + - id: SpaceCash500 - type: entity noSpawn: true @@ -208,7 +202,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -219,7 +213,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -229,7 +223,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -241,7 +235,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -263,7 +257,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -274,7 +268,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -288,7 +282,7 @@ - id: CigPackBlack - id: HandLabeler - id: BoxForensicPad - - id: SpaceCash1000 + - id: SpaceCash500 # ERT @@ -533,7 +527,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash1000 + - id: SpaceCash500 # Pirate @@ -564,4 +558,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash1000 + - id: SpaceCash500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 4be4eed7d23..a9b1dad2ce7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -17,7 +17,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -30,7 +30,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -43,7 +43,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -54,7 +54,7 @@ contents: - id: Flash - id: BoxSurvivalSecurity - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -64,7 +64,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -75,7 +75,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -87,7 +87,8 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash10000 + - id: SpaceCash1000 + - id: SpaceCash1000 - type: entity noSpawn: true @@ -100,7 +101,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -113,7 +113,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -126,7 +125,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -139,7 +137,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -152,7 +149,6 @@ - id: Flash - id: ADTtelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -165,7 +161,6 @@ - id: Flash - id: MagazinePistol - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -175,7 +170,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -185,7 +180,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity @@ -196,7 +191,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1250 + - id: SpaceCash500 - type: entity noSpawn: true @@ -206,7 +201,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -217,7 +212,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -227,7 +222,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -239,7 +234,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -261,7 +256,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -272,7 +267,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -286,7 +281,7 @@ - id: CigPackBlack - id: BoxForensicPad - id: HandLabeler - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -296,7 +291,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -306,7 +301,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash1000 + - id: SpaceCash500 #ADT - type: entity @@ -323,4 +318,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash1000 + - id: SpaceCash500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 6de8a2e0dfa..ec8a2c66043 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -29,7 +29,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash750 + - id: SpaceCash500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -41,7 +41,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -53,7 +53,7 @@ - id: BoxForensicPad - id: ADTSpaceLaw - id: Flash - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity parent: ClothingBackpackSatchelBrigmedic @@ -63,7 +63,7 @@ contents: - id: Flash - id: BoxSurvivalSecurity - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity parent: ClothingBackpackSatchelMedical @@ -72,7 +72,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -83,7 +83,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -94,7 +94,8 @@ contents: - id: BoxSurvival - id: Flash - - id: SpaceCash10000 + - id: SpaceCash1000 + - id: SpaceCash1000 - type: entity noSpawn: true @@ -107,7 +108,6 @@ - id: Flash #- id: TelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -120,7 +120,6 @@ - id: Flash #- id: TelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -133,7 +132,6 @@ - id: Flash #- id: TelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -146,7 +144,6 @@ - id: Flash #- id: TelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -159,7 +156,6 @@ - id: Flash #- id: TelescopicBaton - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -172,7 +168,6 @@ - id: Flash - id: MagazinePistol - id: SpaceCash1000 - - id: SpaceCash1000 - type: entity noSpawn: true @@ -182,7 +177,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -192,7 +187,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -202,7 +197,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1250 + - id: SpaceCash500 - type: entity noSpawn: true @@ -212,7 +207,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -222,7 +217,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -234,7 +229,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -256,7 +251,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -267,7 +262,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash750 + - id: SpaceCash500 - type: entity noSpawn: true @@ -281,7 +276,7 @@ - id: Lighter - id: CigPackBlack - id: HandLabeler - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -291,7 +286,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -301,7 +296,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true @@ -312,7 +307,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash750 + - id: SpaceCash500 #ADT - type: entity @@ -329,7 +324,7 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash1000 + - id: SpaceCash500 - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index bc42de51f44..68ce42e6ee1 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -30,8 +30,6 @@ delay: 0.5 - type: ExplosionResistance damageCoefficient: 0.9 - - type: StaticPrice - price: 30 - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml index 0969e51dda8..10f265a4a2c 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -10,5 +10,3 @@ - type: Item size: Small storedRotation: -90 - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index a1e791a52ac..38472e3901d 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -23,8 +23,6 @@ tags: - ClothMade - WhitelistChameleon - - type: StaticPrice - price: 30 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index d57502fbb6b..d13b284ff29 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -24,8 +24,6 @@ tags: - ClothMade - WhitelistChameleon - - type: StaticPrice - price: 30 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index f1e439ead47..1bccb4c92a3 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -29,5 +29,3 @@ tags: - ClothMade - WhitelistChameleon - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index edd749ec3c0..1119d5cda74 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -23,8 +23,6 @@ tags: - ClothMade - WhitelistChameleon - - type: StaticPrice - price: 25 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 41108a44f0f..0329f82b5b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -50,9 +50,6 @@ - type: WirelessNetworkConnection range: 1200 - type: StationLimitedNetwork - - type: StaticPrice - price: 50 - - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 0098579e795..2077f5686b5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -38,8 +38,6 @@ - type: PhysicalComposition materialComposition: Plastic: 100 - - type: StaticPrice - price: 15 - type: entity parent: DrinkBottlePlasticBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 076ef3ea3f4..38ebc132c9f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -62,8 +62,6 @@ - type: Tag tags: - DrinkCan - - type: StaticPrice - price: 15 - type: entity parent: DrinkCanBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 070166b8b42..c7bb2dee557 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -37,8 +37,6 @@ damage: types: Blunt: 0 - - type: StaticPrice - price: 15 - type: entity parent: DrinkBaseCup @@ -359,4 +357,4 @@ slots: - HEAD quickEquip: false - sprite: Clothing/Head/Hats/party_water_cup.rsi + sprite: Clothing/Head/Hats/party_water_cup.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index d7d081d7e60..a665fade042 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -23,8 +23,6 @@ sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet size: Tiny - - type: StaticPrice - price: 15 # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index dc1f46e82fe..bc9079fb2db 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -65,8 +65,6 @@ - cig5 - cig6 - type: Appearance - - type: StaticPrice - price: 20 - type: entity id: CigPackMixedBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index efc405c4f2d..74c2865d07d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -23,5 +23,3 @@ - type: Tag tags: - Radio - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml index d53bbfd4f18..10c41efc54a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml @@ -17,8 +17,6 @@ collection: BaseWhistle - type: Whistle distance: 5 - - type: StaticPrice - price: 15 - type: entity parent: BaseWhistle diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 257ad692207..945c2911830 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -235,8 +235,6 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: StaticPrice - price: 30 - type: entity name: broken floodlight diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index a3c9f3bc5b3..5f970da1840 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -28,8 +28,6 @@ - Security - type: UseDelay delay: 6 - - type: StaticPrice - price: 20 - type: entity name: makeshift handcuffs diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml index 3568d529940..57dfb400984 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -92,17 +92,6 @@ - type: Stack count: 500 -- type: entity - parent: SpaceCash - id: SpaceCash750 - suffix: 750 - components: - - type: Icon - sprite: Objects/Economy/cash.rsi - state: cash_500 - - type: Stack - count: 750 - - type: entity parent: SpaceCash id: SpaceCash1000 @@ -114,17 +103,6 @@ - type: Stack count: 1000 -- type: entity - parent: SpaceCash - id: SpaceCash1250 - suffix: 1250 - components: - - type: Icon - sprite: Objects/Economy/cash.rsi - state: cash_1000 - - type: Stack - count: 1250 - - type: entity parent: SpaceCash id: SpaceCash2500 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index da29df0d1b3..563c77e8e76 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -255,8 +255,6 @@ path: "/Audio/Items/Medical/brutepack_begin.ogg" healingEndSound: path: "/Audio/Items/Medical/brutepack_end.ogg" - - type: StaticPrice - price: 15 - type: entity name: roll of gauze diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index 5ca34fcf8ad..a36bfaf676b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -26,5 +26,3 @@ - ArtifactFragment - Ore - type: Dumpable - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index be09587ea01..dbdb935b916 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: emergency flare parent: BaseItem id: Flare @@ -93,5 +93,3 @@ Quantity: 2 - ReagentId: Sulfur Quantity: 2 - - type: StaticPrice - price: 5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml index 79daf0a4a44..8ae34573ffa 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gps.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gps.yml @@ -15,5 +15,3 @@ - type: Tag tags: - GPS - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index bc74a5ba8e7..631e2a247ea 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -87,8 +87,6 @@ netsync: false radius: 1.1 #smallest possible color: orange - - type: StaticPrice - price: 40 - type: entity name: cheap lighter @@ -118,8 +116,6 @@ - ReagentId: WeldingFuel Quantity: 4 maxVol: 4 #uses less fuel than a welder, so this isnt as bad as it looks - - type: StaticPrice - price: 25 - type: entity name: flippo lighter @@ -205,8 +201,6 @@ netsync: false radius: 1.2 #slightly stronger than the other lighters color: orange - - type: StaticPrice - price: 50 - type: entity name: flippo engraved lighter diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index a0708e6a4df..62f81fa5466 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BasePlasticExplosive parent: BaseItem abstract: true @@ -106,5 +106,3 @@ maxIntensity: 30 canCreateVacuum: false - type: ExplodeOnTrigger - - type: StaticPrice - price: 20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index 24a70ef8d8c..28157ef3450 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -23,8 +23,6 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 # Boxes - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 403e25f0938..063268d8b53 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -23,8 +23,7 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 + # Boxes - type: entity parent: BaseMagazineBoxCaselessRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index dc9f73176fb..0670e376360 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -23,8 +23,7 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 + # Boxes - type: entity parent: BaseMagazineBoxLightRifle @@ -118,4 +117,4 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: uranium + - state: uranium \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index c42be65d4ce..65f6bff00eb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -22,8 +22,7 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 + # Boxes - type: entity parent: BaseMagazineBoxMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index b6aeb6cd048..9f6a8e8257d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -23,8 +23,7 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 + # Boxes - type: entity parent: BaseMagazineBoxPistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 067f274f7a4..c321b77d10b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -22,8 +22,7 @@ steps: 2 zeroVisible: false - type: Appearance - - type: StaticPrice - price: 25 + # Boxes - type: entity parent: BaseMagazineBoxRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index d78d6a1fb9e..831c3c33525 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -22,8 +22,6 @@ tags: - ShellShotgun capacity: 12 - - type: StaticPrice - price: 25 # Shotgun Shells - type: entity @@ -115,4 +113,4 @@ - type: Sprite layers: - state: boxwide - - state: shellslug + - state: shellslug \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 85e2ffb5a13..226fa29164f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -11,7 +11,5 @@ - state: animation-icon visible: false map: [ "empty-icon" ] - - type: StaticPrice - price: 50 # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index a335c1b1d4f..9f811cd172e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -37,8 +37,6 @@ sprite: Objects/Weapons/Melee/pickaxe.rsi storedRotation: -45 - type: UseDelay - - type: StaticPrice - price: 15 - type: entity name: mining drill diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index b71e0afb04f..36d4c947fcd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -48,8 +48,6 @@ - type: ContainerContainer containers: cluster-payload: !type:Container - - type: StaticPrice - price: 50 - type: entity parent: GrenadeBase @@ -144,8 +142,6 @@ - type: ContainerContainer containers: cluster-payload: !type:Container - - type: StaticPrice - price: 50 - type: entity parent: GrenadeBase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 7bbfda99dc3..01ca41ed742 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -80,8 +80,6 @@ - type: GuideHelp guides: - Security - - type: StaticPrice - price: 30 - type: entity id: GrenadeFlashEffect @@ -396,8 +394,6 @@ reagents: - ReagentId: TearGas Quantity: 50 - - type: StaticPrice - price: 30 # Non-explosive "dummy" grenades to use as a distraction. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 25b7ffb0b6b..5458a9399ca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -144,7 +144,7 @@ sprite: Objects/Weapons/Melee/flash.rsi - type: UseDelay - type: StaticPrice - price: 5 + price: 40 - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index f154bd8e703..55c4bbd6b79 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -43,7 +43,6 @@ - type: Pullable - type: DamageExaminable - - type: entity name: "storage item" id: BaseStorageItem