diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index 07dd35a005..d81eaea72a 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -1,12 +1,10 @@ using Content.Shared.Research.Components; -using Robust.Client.GameObjects; namespace Content.Client.Research.UI { public sealed class ResearchClientBoundUserInterface : BoundUserInterface { - [ViewVariables] - private ResearchClientServerSelectionMenu? _menu; + [ViewVariables] private ResearchClientServerSelectionMenu? _menu; public ResearchClientBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { @@ -36,7 +34,7 @@ namespace Content.Client.Research.UI { base.UpdateState(state); if (state is not ResearchClientBoundInterfaceState rState) return; - _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId); + _menu?.Populate(rState.ServerNames, rState.ServerIds, rState.SelectedServerId); } protected override void Dispose(bool disposing) diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index ceaa965e59..303da32ec2 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -8,9 +8,7 @@ namespace Content.Client.Research.UI [GenerateTypedNameReferences] public sealed partial class ResearchClientServerSelectionMenu : DefaultWindow { - private int _serverCount; - private string[] _serverNames = Array.Empty(); - private int[] _serverIds = Array.Empty(); + private List _serverIds = []; private int _selectedServerId = -1; private ResearchClientBoundUserInterface Owner { get; } @@ -26,20 +24,18 @@ namespace Content.Client.Research.UI Servers.OnItemDeselected += OnItemDeselected; } - public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs) + private void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs) { Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]); } - public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs) + private void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs) { Owner.DeselectServer(); } - public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId) + public void Populate(List serverNames, List serverIds, int selectedServerId) { - _serverCount = serverCount; - _serverNames = serverNames; _serverIds = serverIds; _selectedServerId = selectedServerId; @@ -48,10 +44,12 @@ namespace Content.Client.Research.UI Servers.OnItemDeselected -= OnItemDeselected; Servers.Clear(); - for (var i = 0; i < _serverCount; i++) + for (var i = 0; i < serverIds.Count; i++) { - var id = _serverIds[i]; - Servers.AddItem(Loc.GetString("research-client-server-selection-menu-server-entry-text", ("id", id), ("serverName", _serverNames[i]))); + var id = serverIds[i]; + var name = serverNames[i]; + Servers.AddItem(Loc.GetString("research-client-server-selection-menu-server-entry-text", ("id", id), + ("serverName", name))); if (id == _selectedServerId) { Servers[i].Selected = true; diff --git a/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs b/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs index 806135ad25..0b417a6c76 100644 --- a/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs +++ b/Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs @@ -38,6 +38,7 @@ public sealed partial class VendingMenu : DefaultWindow return; OnWithdraw?.Invoke(new VendingMachineWithdrawMessage()); }; + VendingContents.RemoveAllChildren(); if (inventory.Count == 0) { @@ -45,6 +46,7 @@ public sealed partial class VendingMenu : DefaultWindow SetSizeAfterUpdate(OutOfStockLabel.Text?.Length ?? 0); return; } + OutOfStockLabel.Visible = false; var longestEntry = string.Empty; @@ -65,14 +67,11 @@ public sealed partial class VendingMenu : DefaultWindow if (itemName.Length > longestEntry.Length) longestEntry = itemName; - var price = (int) (entry.Price * priceMultiplier); - var vendingItem = new VendingItem($"{itemName} [{entry.Amount}]", $"{price} ¢", icon); + var price = (int)(entry.Price * priceMultiplier); + var vendingItem = new VendingItem($"{itemName} [{entry.Amount}]", price > 0 ? $"{price} \u00a2" : "выдать", icon); var j = i; - vendingItem.VendingItemBuyButton.OnPressed += _ => - { - OnItemSelected?.Invoke(j); - }; + vendingItem.VendingItemBuyButton.OnPressed += _ => { OnItemSelected?.Invoke(j); }; VendingContents.AddChild(vendingItem); } @@ -85,4 +84,4 @@ public sealed partial class VendingMenu : DefaultWindow SetSize = new Vector2(Math.Clamp((longestEntryLength + 10) * 12, 250, 700), Math.Clamp(VendingContents.ChildCount * 50, 150, 400)); } -} +} \ No newline at end of file diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs index 6bd5300d8f..836f0125dc 100644 --- a/Content.Server/Research/Systems/ResearchSystem.Client.cs +++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs @@ -84,9 +84,8 @@ public sealed partial class ResearchSystem TryGetClientServer(uid, out _, out var serverComponent, component); - var names = GetServerNames(); - var state = new ResearchClientBoundInterfaceState(names.Length, names, - GetServerIds(), serverComponent?.Id ?? -1); + var servers = GetAllServers(uid); + var state = new ResearchClientBoundInterfaceState(servers, serverComponent?.Id ?? -1); _uiSystem.TrySetUiState(uid, ResearchClientUiKey.Key, state); } diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs index f8c4d6902a..23ec94a71e 100644 --- a/Content.Server/Research/Systems/ResearchSystem.cs +++ b/Content.Server/Research/Systems/ResearchSystem.cs @@ -1,5 +1,4 @@ using System.Diagnostics.CodeAnalysis; -using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Radio.EntitySystems; using Content.Shared.Access.Systems; @@ -58,34 +57,70 @@ namespace Content.Server.Research.Systems } /// - /// Gets the names of all the servers. + /// Gets all the servers on the grid. /// - /// - public string[] GetServerNames() + public List GetAllServers(EntityUid client) { - var allServers = EntityQuery(true).ToArray(); - var list = new string[allServers.Length]; + var query = EntityQueryEnumerator(); + var clientTransform = Transform(client); + var list = new List(3); - for (var i = 0; i < allServers.Length; i++) + while (query.MoveNext(out var uid, out var server)) { - list[i] = allServers[i].ServerName; + var serverTransform = Transform(uid); + if (clientTransform.GridUid != serverTransform.GridUid) + { + continue; + } + + list.Add(server); } return list; } /// - /// Gets the ids of all the servers + /// Gets the names of all the servers on the grid. /// /// - public int[] GetServerIds() + public List GetServerNames(EntityUid client) { - var allServers = EntityQuery(true).ToArray(); - var list = new int[allServers.Length]; + var query = EntityQueryEnumerator(); + var clientTransform = Transform(client); + var list = new List(3); - for (var i = 0; i < allServers.Length; i++) + while (query.MoveNext(out var uid, out var server)) { - list[i] = allServers[i].Id; + var serverTransform = Transform(uid); + if (clientTransform.GridUid != serverTransform.GridUid) + { + continue; + } + + list.Add(server.ServerName); + } + + return list; + } + + /// + /// Gets the ids of all the servers on the grid. + /// + /// + public List GetServerIds(EntityUid client) + { + var query = EntityQueryEnumerator(); + var clientTransform = Transform(client); + var list = new List(3); + while (query.MoveNext(out var uid, out var server)) + { + var serverTransform = Transform(uid); + if (clientTransform.GridUid != serverTransform.GridUid) + { + continue; + } + + list.Add(server.Id); } return list; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 35233215f5..417f7c195b 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -52,7 +52,7 @@ namespace Content.Server.VendingMachines [Dependency] private readonly StackSystem _stackSystem = default!; // WD END - private double _priceMultiplier = 1.0; // WD + private const double GlobalPriceMultiplier = 2.0; // WD public override void Initialize() { @@ -241,7 +241,8 @@ namespace Content.Server.VendingMachines protected override int GetEntryPrice(EntityPrototype proto) { - return (int) _pricing.GetEstimatedPrice(proto); + var price = (int) _pricing.GetEstimatedPrice(proto); + return price > 0 ? price : 25; } private int GetPrice(VendingMachineInventoryEntry entry, VendingMachineComponent comp) @@ -251,13 +252,13 @@ namespace Content.Server.VendingMachines private double GetPriceMultiplier(VendingMachineComponent comp) { - return comp.PriceMultiplier * _priceMultiplier; + return comp.PriceMultiplier * GlobalPriceMultiplier; } private void OnWithdrawMessage(EntityUid uid, VendingMachineComponent component, VendingMachineWithdrawMessage args) { - _stackSystem.Spawn(component.Credits, - PrototypeManager.Index(component.CreditStackPrototype), Transform(uid).Coordinates); + _stackSystem.Spawn(component.Credits, PrototypeManager.Index(component.CreditStackPrototype), + Transform(uid).Coordinates); component.Credits = 0; Audio.PlayPvs(component.SoundWithdrawCurrency, uid); diff --git a/Content.Shared/Research/Components/ResearchClientComponent.cs b/Content.Shared/Research/Components/ResearchClientComponent.cs index 7ab47ad260..fa29fe0106 100644 --- a/Content.Shared/Research/Components/ResearchClientComponent.cs +++ b/Content.Shared/Research/Components/ResearchClientComponent.cs @@ -63,17 +63,21 @@ namespace Content.Shared.Research.Components [Serializable, NetSerializable] public sealed class ResearchClientBoundInterfaceState : BoundUserInterfaceState { - public int ServerCount; - public string[] ServerNames; - public int[] ServerIds; + public List ServerNames; + public List ServerIds; public int SelectedServerId; - public ResearchClientBoundInterfaceState(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId = -1) + public ResearchClientBoundInterfaceState(List servers, int selectedServerId = -1) { - ServerCount = serverCount; - ServerNames = serverNames; - ServerIds = serverIds; + ServerNames = new List(servers.Count); + ServerIds = new List(servers.Count); + foreach (var server in servers) + { + ServerNames.Add(server.ServerName); + ServerIds.Add(server.Id); + } + SelectedServerId = selectedServerId; } } -} +} \ No newline at end of file diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index c6ef2bd917..b9f8902b1f 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -126,6 +126,6 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem protected virtual int GetEntryPrice(EntityPrototype proto) { - return 0; + return 25; } // WD } diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 61ca05b573..78f96a9b1c 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -1,6 +1,5 @@ using Content.Shared.Actions; using Content.Shared.Stacks; -using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; @@ -16,8 +15,9 @@ namespace Content.Shared.VendingMachines /// /// PrototypeID for the vending machine's inventory, see /// - [DataField("pack", customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] - public string PackPrototypeId = string.Empty; + [DataField("pack", required: true)] + public ProtoId PackPrototypeId + = string.Empty; /// /// Used by the server to determine how long the vending machine stays in the "Deny" state. @@ -130,6 +130,7 @@ namespace Content.Shared.VendingMachines public TimeSpan NextEmpEject = TimeSpan.Zero; #region Client Visuals + /// /// RSI state for when the vending machine is unpowered. /// Will be displayed on the layer @@ -180,24 +181,26 @@ namespace Content.Shared.VendingMachines /// [DataField("loopDeny")] public bool LoopDenyAnimation = true; + #endregion //WD EDIT - [DataField("priceMultiplier")] - public double PriceMultiplier; + [DataField] + public double PriceMultiplier = 1.0; - [ValidatePrototypeId] - public string CreditStackPrototype = "Credit"; + public ProtoId CreditStackPrototype = "Credit"; - [DataField("currencyType")] + [DataField] public string CurrencyType = "SpaceCash"; - [DataField("soundInsertCurrency")] - public SoundSpecifier SoundInsertCurrency = new SoundPathSpecifier("/Audio/White/Machines/polaroid2.ogg"); + [DataField] + public SoundSpecifier SoundInsertCurrency = + new SoundPathSpecifier("/Audio/White/Machines/polaroid2.ogg"); - [DataField("soundWithdrawCurrency")] - public SoundSpecifier SoundWithdrawCurrency = new SoundPathSpecifier("/Audio/White/Machines/polaroid1.ogg"); + [DataField] + public SoundSpecifier SoundWithdrawCurrency = + new SoundPathSpecifier("/Audio/White/Machines/polaroid1.ogg"); [ViewVariables] public int Credits; @@ -209,12 +212,16 @@ namespace Content.Shared.VendingMachines { [ViewVariables(VVAccess.ReadWrite)] public InventoryType Type; + [ViewVariables(VVAccess.ReadWrite)] public string ID; + [ViewVariables(VVAccess.ReadWrite)] public uint Amount; + [ViewVariables(VVAccess.ReadWrite)] public int Price; // WD + public VendingMachineInventoryEntry(InventoryType type, string id, uint amount, int price) { Type = type; @@ -254,10 +261,12 @@ namespace Content.Shared.VendingMachines /// Off / Broken. The other layers will overlay this if the machine is on. /// Base, + /// /// Normal / Deny / Eject /// BaseUnshaded, + /// /// Screens that are persistent (where the machine is not off or broken) /// @@ -279,6 +288,5 @@ namespace Content.Shared.VendingMachines public sealed partial class VendingMachineSelfDispenseEvent : InstantActionEvent { - }; -} +} \ No newline at end of file diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl index bdac67fb6c..0157477f13 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl @@ -18,8 +18,8 @@ ent-SeniorOfficerIDCard = ID карта ветерана СБ .desc = { ent-IDCardStandard.desc } ent-SeniorSalvageSpecialistIDCard = ID карта охотника карго .desc = { ent-IDCardStandard.desc } -ent-ModularReceiver = модульный приемник - .desc = Жизненно важная часть, используемая в создании огнестрельного оружия. +ent-ModularReceiver = ствольная коробка + .desc = Важнейшая деталь, используемая для создании огнестрельного оружия. ent-RifleStock = приклад .desc = Прочный деревянный приклад, используемый при создании огнестрельного оружия. ent-MedalCase = футляр для медали diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-29.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-29.ftl index bef1453f81..e14a3f1356 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-29.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-29.ftl @@ -18,7 +18,7 @@ ent-JugPhosphorus = кувшин (фосфор) .desc = { ent-Jug.desc } ent-JugSulfur = кувшин (сера) .desc = { ent-Jug.desc } -ent-JugSilicon = кувшин (силикон) +ent-JugSilicon = кувшин (кремний) .desc = { ent-Jug.desc } ent-JugHydrogen = кувшин (водород) .desc = { ent-Jug.desc } @@ -36,3 +36,7 @@ ent-JugCopper = кувшин (медь) .desc = { ent-Jug.desc } ent-JugGold = кувшин (золото) .desc = { ent-Jug.desc } +ent-JugSugar = кувшин (сахар) + .desc = { ent-Jug.desc } +ent-JugWeldingFuel = кувшин (сварочное топливо) + .desc = { ent-Jug.desc } diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-42.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-42.ftl index 9e058a33b2..06e2d77812 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-42.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-42.ftl @@ -20,7 +20,7 @@ ent-VendingMachineWinter = ЗимКомод .desc = Лучшее место, чтобы насладиться холодом! ent-VendingMachineSustenance = Продовольственный вендомат .desc = Торговый автомат, который продает еду, как того требует раздел 47-C Соглашения об этическом обращении с заключенными NT. -ent-VendingMachineSyndieDrobe = СиндиКомод +ent-VendingMachineSyndieDrobe = СиндиШкаф .desc = Гардеробная машина, закодированная синдикатом, содержит элитное снаряжение для различных операций. ent-VendingMachineChemicals = ХимВенд .desc = Вероятно, это не кофемашина. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 8bccdbef9a..7a21962e1e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -1,23 +1,23 @@ - type: vendingMachineInventory id: BoozeOMatInventory startingInventory: - DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze. - DrinkShotGlass: 10 - DrinkGlassCoupeShaped: 10 - DrinkVacuumFlask: 5 - DrinkFlaskBar: 5 - DrinkShaker: 5 + DrinkGlass: 10 #Kept glasses at top for ease to differentiate from booze. + DrinkShotGlass: 5 + DrinkGlassCoupeShaped: 5 + DrinkVacuumFlask: 3 + DrinkFlaskBar: 3 + DrinkShaker: 3 CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAbsintheBottleFull: 2 - DrinkAleBottleFull: 5 - DrinkBeerBottleFull: 5 + DrinkAleBottleFull: 3 + DrinkBeerBottleFull: 3 DrinkBlueCuracaoBottleFull: 2 - DrinkCognacBottleFull: 4 + DrinkCognacBottleFull: 3 DrinkCoconutWaterCarton: 3 - DrinkColaBottleFull: 4 + DrinkColaBottleFull: 3 DrinkMilkCarton: 2 - DrinkCreamCarton: 5 - DrinkGinBottleFull: 3 + DrinkCreamCarton: 3 + DrinkGinBottleFull: 2 DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two DrinkGrenadineBottleFull: 2 DrinkJuiceLimeCarton: 3 @@ -27,20 +27,20 @@ DrinkMelonLiquorBottleFull: 3 DrinkPatronBottleFull: 2 DrinkRumBottleFull: 4 - DrinkSodaWaterCan: 8 - DrinkSolDryCan: 8 + DrinkSodaWaterCan: 5 + DrinkSolDryCan: 5 DrinkSpaceMountainWindBottleFull: 3 DrinkSpaceUpBottleFull: 3 DrinkTequilaBottleFull: 3 - DrinkTonicWaterCan: 8 + DrinkTonicWaterCan: 5 DrinkVermouthBottleFull: 5 - DrinkVodkaBottleFull: 5 - DrinkWhiskeyBottleFull: 5 - DrinkWineBottleFull: 5 + DrinkVodkaBottleFull: 3 + DrinkWhiskeyBottleFull: 3 + DrinkWineBottleFull: 3 DrinkChampagneBottleFull: 2 #because the premium drink DrinkSakeBottleFull: 3 Eftpos: 4 - DrinkBeerCan: 5 - DrinkWineCan: 5 + DrinkBeerCan: 4 + DrinkWineCan: 4 emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index 2d65fa1f71..56f0e43cb2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: HotDrinksMachineInventory startingInventory: - DrinkHotCoffee: 5 - DrinkCafeLatte: 5 - DrinkTeacup: 5 - DrinkGreenTea: 5 - DrinkHotCoco: 5 + DrinkHotCoffee: 3 + DrinkCafeLatte: 3 + DrinkTeacup: 3 + DrinkGreenTea: 3 + DrinkHotCoco: 3 emaggedInventory: DrinkNothing: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index a152ad378d..624e5710ee 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: GoodCleanFunInventory startingInventory: - PlayerCardBag: 20 + PlayerCardBag: 10 CardBag36: 4 CardBag52: 4 UnoCardBag: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 9de2a4c9c6..307ab594ab 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -4,8 +4,8 @@ ClothingBackpackDuffelMedical: 4 ClothingBackpackMedical: 4 ClothingBackpackSatchelMedical: 4 - ClothingHeadHelmetVoidParamed: 2 - ClothingOuterHardsuitVoidParamed: 2 + ClothingHeadHelmetVoidParamed: 1 + ClothingOuterHardsuitVoidParamed: 1 ClothingHeadHatBeretBrigmedic: 4 ClothingHeadNurseHat: 4 ClothingHeadHatParamedicsoft: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 07e145e636..ef265eac75 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -2,21 +2,19 @@ id: SalvageEquipmentInventory startingInventory: WeaponProtoKineticAccelerator: 2 - WeaponCrusher: 2 - WeaponCrusherDagger: 4 - WeaponGrapplingGun: 3 - HandheldGPSBasic: 10 - Crowbar: 6 - BoxMRE: 6 - Pickaxe: 6 - SurvivalKnife: 3 - OreBag: 6 - Flare: 20 - FlashlightLantern: 6 + WeaponCrusher: 1 + WeaponCrusherDagger: 2 + HandheldGPSBasic: 4 + Crowbar: 2 + BoxMRE: 3 + Pickaxe: 4 + SurvivalKnife: 2 + OreBag: 4 + Flare: 10 + FlashlightLantern: 3 Floodlight: 2 - RadioHandheld: 10 - Brutepack: 2 - InflatableWallStack1: 40 + RadioHandheld: 4 + InflatableWallStack1: 20 InflatableDoorStack1: 10 SeismicCharge: 3 FultonBeacon: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index b3634d4dab..d16f4dbe27 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -10,7 +10,6 @@ ClothingHeadsetSecurity: 4 ClothingEyesGlassesSecurity: 4 ClothingOuterWinterSec: 4 - ClothingOuterArmorBasic: 4 ClothingUniformJumpsuitSec: 4 ClothingUniformJumpskirtSec: 4 ClothingUniformJumpsuitSecGrey: 4 diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index a2e18d99aa..660f9767b8 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -26,6 +26,8 @@ - type: GuideHelp guides: - Radio + - type: StaticPrice + price: 20 - type: entity parent: ClothingHeadset diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 83d2ffe0f5..e6c7626a6a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -181,6 +181,8 @@ - type: ShowSecurityIcons - type: IdentityBlocker coverage: EYES + - type: StaticPrice + price: 25 - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index 3963f3e24b..ebae76128c 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -315,6 +315,8 @@ - type: Fiber fiberMaterial: fibers-insulative fiberColor: fibers-yellow + - type: StaticPrice + price: 50 # Budget Insulated Gloves - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index f785bd1822..b5951c44ad 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -113,6 +113,8 @@ sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon - type: TransformableContainer + - type: StaticPrice + price: 10 - type: entity name: coupe glass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 6865ae513e..6dcf556d04 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -68,7 +68,7 @@ types: Blunt: 0 - type: StaticPrice - price: 20 + price: 10 - type: EmitSoundOnPickup sound: path: /Audio/White/Items/Cup/pickup.ogg diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 4595329635..ee944ca2ef 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -57,6 +57,8 @@ - type: Tag tags: - Trash + - type: StaticPrice + price: 10 - type: entity name: broken bowl diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 63c47df67e..01d3c95d78 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -54,6 +54,8 @@ materialComposition: Glass: 60 - type: SpaceGarbage + - type: StaticPrice + price: 10 - type: entity name: broken plate @@ -108,6 +110,8 @@ - type: PhysicalComposition materialComposition: Glass: 30 + - type: StaticPrice + price: 5 - type: entity parent: FoodPlateTrash @@ -137,6 +141,8 @@ - type: Tag tags: - Trash + - type: StaticPrice + price: 15 - type: entity name: plastic plate @@ -154,6 +160,8 @@ - type: Tag tags: - Trash + - type: StaticPrice + price: 7 # Pie Tin @@ -178,3 +186,5 @@ materialComposition: Steel: 60 - type: SpaceGarbage + - type: StaticPrice + price: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 6c16a541cd..6c195955d2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -47,6 +47,8 @@ tags: - Trash - Skewer + - type: StaticPrice + price: 10 # Custom Kebab Example diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 4f1a4b403c..f40ad34f15 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -135,6 +135,8 @@ - cig5 - cig6 - type: Appearance + - type: StaticPrice + price: 10 - type: entity id: CigPackGreen diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index d86fdfff1e..3e2acf30ec 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -675,7 +675,7 @@ Steel: 30 Plastic: 30 - type: StaticPrice - price: 15 + price: 10 - type: entity id: PowerCageRechargerCircuitboard @@ -720,7 +720,7 @@ Steel: 30 Plastic: 30 - type: StaticPrice - price: 15 + price: 10 - type: entity id: WeaponCapacitorRechargerCircuitboard @@ -742,7 +742,7 @@ Steel: 30 Plastic: 30 - type: StaticPrice - price: 15 + price: 10 - type: entity id: TurboItemRechargerCircuitboard @@ -784,7 +784,7 @@ chemicalComposition: Silicon: 20 - type: StaticPrice - price: 58 + price: 50 - type: entity parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml index c62721f80f..bfd52ab1cd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml @@ -14,4 +14,4 @@ - DroneUsable - StationMapElectronics - type: StaticPrice - price: 15 + price: 10 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml index b1e3116f32..f309d8498d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml @@ -12,7 +12,7 @@ - DroneUsable - AirAlarmElectronics - type: StaticPrice - price: 61 + price: 50 - type: entity id: FireAlarmElectronics @@ -30,4 +30,4 @@ - DroneUsable - FireAlarmElectronics - type: StaticPrice - price: 61 + price: 50 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml index 9278e34706..e9aff65247 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml @@ -12,4 +12,4 @@ - DroneUsable - MailingUnitElectronics - type: StaticPrice - price: 55 + price: 50 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml index 0a3c3986eb..15bb975668 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml @@ -13,7 +13,7 @@ - DroneUsable - type: DoorElectronics - type: StaticPrice - price: 55 + price: 50 - type: AccessReader - type: ActivatableUI key: enum.DoorElectronicsConfigurationUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml index 4c2ab79f5a..f66bb00e35 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml @@ -14,4 +14,4 @@ - DroneUsable - FirelockElectronics - type: StaticPrice - price: 61 + price: 55 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml index b59654cf02..496ef3918e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml @@ -12,4 +12,4 @@ - DroneUsable - IntercomElectronics - type: StaticPrice - price: 55 + price: 50 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml index 9a806a6bf2..b977fd8d90 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml @@ -15,7 +15,7 @@ chemicalComposition: Silicon: 20 - type: StaticPrice - price: 34 + price: 20 # Wallmount Substation - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml index 8a74e1cee4..ad4008a73f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/timer.yml @@ -15,7 +15,7 @@ tags: - TimerSignalElectronics - type: StaticPrice - price: 15 + price: 10 - type: entity id: ScreenTimerElectronics diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index 4250669581..9dddf8cd75 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml @@ -50,6 +50,8 @@ damage: types: Piercing: 5 + - type: StaticPrice + price: 10 - type: entity parent: UtensilBasePlastic @@ -61,7 +63,9 @@ state: plastic_fork - type: Utensil types: - - Fork + - Fork + - type: StaticPrice + price: 10 - type: entity parent: UtensilBase @@ -87,6 +91,8 @@ Blunt: 1 - type: Shovel speedModifier: 0.1 # you can try + - type: StaticPrice + price: 10 - type: entity parent: UtensilBasePlastic @@ -103,6 +109,8 @@ - Spoon - type: Shovel speedModifier: 0.1 # you can try + - type: StaticPrice + price: 10 - type: entity parent: UtensilBasePlastic @@ -120,3 +128,5 @@ - Plastic - Trash - Knife + - type: StaticPrice + price: 10 diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml index 442e939d42..f1c6a2fa5e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml @@ -19,7 +19,7 @@ tags: - DroneUsable - type: StaticPrice - price: 100 + price: 60 - type: ContainerContainer containers: light_replacer_storage: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index 851c127647..8ffd46f30a 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -213,6 +213,8 @@ - type: UseDelay - type: IgnitionSource ignited: false + - type: StaticPrice + price: 20 - type: entity name: flippo engraved lighter diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d76eda5307..3d8754d226 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -640,3 +640,5 @@ - type: Tag tags: - RollingPin + - type: StaticPrice + price: 15 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 161ea25bc4..f7b3998971 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -70,7 +70,7 @@ True: {visible: false} False: {visible: true} - type: StaticPrice - price: 120 + price: 100 - type: entity parent: RollerBed diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d46270c6b8..02d466667d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -110,7 +110,6 @@ - type: VendingMachine pack: CondimentInventory offState: off - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/condiments.rsi drawdepth: SmallObjects @@ -176,6 +175,7 @@ normalState: normal-unshaded denyState: deny-unshaded loopDeny: false + priceMultiplier: 0.0 - type: Advertise pack: BoozeOMatAds - type: SpeakOnUIClosed @@ -210,6 +210,7 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded + priceMultiplier: 0.0 - type: Sprite sprite: Structures/Machines/VendingMachines/cart.rsi layers: @@ -239,6 +240,7 @@ brokenState: broken normalState: normal-unshaded ejectState: eject-unshaded + priceMultiplier: 0.0 - type: Advertise pack: ChefvendAds - type: SpeakOnUIClosed @@ -275,7 +277,6 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Advertise pack: CigaretteMachineAds - type: SpeakOnUIClosed @@ -304,7 +305,6 @@ brokenState: broken normalState: normal-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ClothesMateAds - type: SpeakOnUIClosed @@ -341,7 +341,6 @@ brokenState: broken normalState: normal-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ClothesMateAds - type: SpeakOnUIClosed @@ -383,7 +382,6 @@ screenState: screen ejectDelay: 5 soundVend: /Audio/Machines/machine_vend_hot_drink.ogg - priceMultiplier: 1.0 - type: Advertise pack: HotDrinksMachineAds - type: SpeakOnUIClosed @@ -423,7 +421,6 @@ ejectState: eject-unshaded denyState: deny-unshaded ejectDelay: 1.9 - priceMultiplier: 1.0 - type: Advertise pack: RobustSoftdrinksAds - type: SpeakOnUIClosed @@ -493,7 +490,6 @@ components: - type: VendingMachine pack: SpaceUpInventory - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/spaceup.rsi layers: @@ -516,7 +512,6 @@ components: - type: VendingMachine pack: SodaInventory - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/soda.rsi layers: @@ -540,7 +535,6 @@ components: - type: VendingMachine pack: StarkistInventory - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/starkist.rsi layers: @@ -572,7 +566,6 @@ ejectState: eject-unshaded denyState: deny-unshaded ejectDelay: 1.9 - priceMultiplier: 1.0 - type: Advertise pack: RobustSoftdrinksAds - type: Speech @@ -607,7 +600,6 @@ ejectState: eject-unshaded denyState: deny-unshaded ejectDelay: 1.9 - priceMultiplier: 1.0 - type: Advertise pack: RobustSoftdrinksAds - type: SpeakOnUIClosed @@ -708,6 +700,7 @@ offState: off brokenState: broken normalState: normal-unshaded + priceMultiplier: 0.0 - type: Advertise pack: MagiVendAds - type: SpeakOnUIClosed @@ -740,7 +733,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: DiscountDansAds - type: SpeakOnUIClosed @@ -805,6 +797,7 @@ ejectState: eject-unshaded denyState: deny-unshaded ejectDelay: 0.6 + priceMultiplier: 0.0 - type: Advertise pack: NanoMedAds - type: SpeakOnUIClosed @@ -842,6 +835,7 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded + priceMultiplier: 0.5 - type: Advertise pack: NutriMaxAds - type: SpeakOnUIClosed @@ -876,6 +870,7 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded + priceMultiplier: 0.0 - type: Advertise pack: SecTechAds - type: SpeakOnUIClosed @@ -914,6 +909,7 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded + priceMultiplier: 0.0 - type: Advertise pack: MegaSeedAds - type: SpeakOnUIClosed @@ -956,7 +952,6 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Advertise pack: GetmoreChocolateCorpAds - type: SpeakOnUIClosed @@ -1103,7 +1098,6 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Advertise pack: BodaAds - type: SpeakOnUIClosed @@ -1138,7 +1132,6 @@ ejectState: eject-unshaded denyState: deny-unshaded screenState: screen - priceMultiplier: 1.0 - type: Advertise pack: AutoDrobeAds - type: SpeakOnUIClosed @@ -1280,6 +1273,7 @@ normalState: normal-unshaded ejectState: eject-unshaded ejectDelay: 1.8 + priceMultiplier: 0.2 - type: Advertise pack: GoodCleanFunAds - type: SpeakOnUIClosed @@ -1312,7 +1306,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ChangAds - type: SpeakOnUIClosed @@ -1378,7 +1371,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: DonutAds - type: SpeakOnUIClosed @@ -1432,6 +1424,7 @@ brokenState: broken normalState: normal-unshaded denyState: deny-unshaded + priceMultiplier: 0.0 - type: Sprite sprite: Structures/Machines/VendingMachines/wallmed.rsi layers: @@ -1461,7 +1454,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: HyDrobeAds - type: SpeakOnUIClosed @@ -1490,7 +1482,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: LawDrobeAds - type: SpeakOnUIClosed @@ -1519,7 +1510,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: SecDrobeAds - type: SpeakOnUIClosed @@ -1548,7 +1538,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: BarDrobeAds - type: SpeakOnUIClosed @@ -1577,7 +1566,6 @@ brokenState: broken normalState: normal-unshaded denyState: deny-unshaded - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/chapdrobe.rsi layers: @@ -1606,7 +1594,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: CargoDrobeAds - type: SpeakOnUIClosed @@ -1635,7 +1622,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: MediDrobeAds - type: SpeakOnUIClosed @@ -1664,7 +1650,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ChemDrobeAds - type: SpeakOnUIClosed @@ -1721,7 +1706,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: AtmosDrobeAds - type: SpeakOnUIClosed @@ -1750,7 +1734,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: EngiDrobeAds - type: SpeakOnUIClosed @@ -1779,7 +1762,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ChefDrobeAds - type: SpeakOnUIClosed @@ -1808,7 +1790,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: DetDrobeAds - type: SpeakOnUIClosed @@ -1837,7 +1818,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: JaniDrobeAds - type: SpeakOnUIClosed @@ -1866,7 +1846,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: SciDrobeAds - type: SpeakOnUIClosed @@ -1895,6 +1874,7 @@ offState: off brokenState: broken normalState: normal-unshaded + priceMultiplier: 0.0 - type: Advertise pack: SyndieDrobeAds - type: SpeakOnUIClosed @@ -1923,7 +1903,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: RoboDrobeAds - type: SpeakOnUIClosed @@ -1952,7 +1931,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: GeneDrobeAds - type: SpeakOnUIClosed @@ -1981,7 +1959,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Advertise pack: ViroDrobeAds - type: SpeakOnUIClosed @@ -2010,7 +1987,6 @@ offState: off brokenState: broken normalState: normal-unshaded - priceMultiplier: 1.0 - type: Sprite sprite: Structures/Machines/VendingMachines/centdrobe.rsi layers: @@ -2044,7 +2020,7 @@ denyState: deny-unshaded ejectDelay: 1.9 soundVend: /Audio/Items/bikehorn.ogg - priceMultiplier: 1.0 + priceMultiplier: 0.2 - type: Sprite sprite: Structures/Machines/VendingMachines/happyhonk.rsi layers: @@ -2077,6 +2053,7 @@ components: - type: VendingMachine pack: TankDispenserEVAInventory + priceMultiplier: 0.0 - type: Sprite sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers state: dispenser @@ -2090,6 +2067,7 @@ components: - type: VendingMachine pack: TankDispenserEngineeringInventory + priceMultiplier: 0.0 - type: Sprite sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers layers: @@ -2109,6 +2087,7 @@ normalState: normal denyState: deny ejectDelay: 2 + priceMultiplier: 0.0 - type: Sprite sprite: Structures/Machines/VendingMachines/chemvend.rsi layers: @@ -2137,6 +2116,7 @@ normalState: normal denyState: deny ejectDelay: 2 + priceMultiplier: 0.0 - type: AccessReader access: [["SyndicateAgent"]]