From 52c5c6270ed45695627694e9495e984ca4062dbd Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 22 Jul 2023 17:11:37 +0300 Subject: [PATCH 1/3] Update VendingMachineSystem.cs --- Content.Server/VendingMachines/VendingMachineSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index d42fe537e68..2a339466060 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -421,10 +421,10 @@ public void EjectRandom(EntityUid uid, bool throwItem, bool forceEject = false, var entry = GetEntry(uid, item.ID, item.Type, vendComponent); if (entry != null) entry.Amount--; - EjectItem(uid, vendComponent, forceEject); + //EjectItem(uid, vendComponent, forceEject); // Stop vending machine from giving free items } - else - TryEjectVendorItem(uid, item.Type, item.ID, throwItem, 0, vendComponent); + //else + //TryEjectVendorItem(uid, item.Type, item.ID, throwItem, 0, vendComponent); // Stop vending machine from giving free items } private void EjectItem(EntityUid uid, VendingMachineComponent? vendComponent = null, bool forceEject = false) From b6fd3f08f5430de682461d46a89f6a8f928cf46d Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 22 Jul 2023 17:23:44 +0300 Subject: [PATCH 2/3] Update VendingMachineSystem.cs Also making the machine worth less --- Content.Server/VendingMachines/VendingMachineSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 2a339466060..e4f8b37221f 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -84,10 +84,10 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re continue; } - price += entry.Amount * _pricing.GetEstimatedPrice(proto); + price += entry.Amount; //* _pricing.GetEstimatedPrice(proto); Removed this to make machine price without the items worth. } - args.Price += price; + //args.Price += price; Removed this to also make the machine price without the amount of items worth. } protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) From 71ab62540b37522515a98dd78bd658dc93735833 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 22 Jul 2023 17:36:29 +0300 Subject: [PATCH 3/3] Update vending_machines.yml --- .../Entities/Structures/Machines/vending_machines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index c14cff77f8b..e9e63b33958 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -87,7 +87,7 @@ - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-mechanical - type: StaticPrice - price: 100 + price: 1000 - type: Appearance - type: WiresVisuals - type: MarketModifier