Merge pull request #69 from dvir001/Vend-Change

Vend change
new-frontiers-14 · Jul 23, 2023 · 12862c2 · 12862c2
2 parents 41e4cbe + 71ab625
commit 12862c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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)
@@ -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)

diff --git 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