Merge branch 'add-trait-voracious' of github.com:angelofallars/Einste…

…in-Engines into add-trait-voracious
Simple-Station · Aug 4, 2024 · a148176 · a148176
2 parents d5209a4 + 5a4f6a6
commit a148176
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4861,3 +4861,11 @@ Entries:
         anything other than grey. 
   id: 6208
   time: '2024-08-04T00:23:53.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        SweatMAX, "hot foods", Mars Mart, and Nippon-tan vendors have all been
+        added to vendor spawners. 
+  id: 6209
+  time: '2024-08-04T06:26:34.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -31,4 +31,8 @@
       - VendingMachineSoda
       - VendingMachineStarkist
       - VendingMachineSpaceUp
+      - VendingMachineFitness
+      - VendingMachineHotfood
+      - VendingMachineSolsnack
+      - VendingMachineWeeb
     chance: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml
@@ -22,4 +22,5 @@
       - VendingMachineSoda
       - VendingMachineStarkist
       - VendingMachineSpaceUp
+      - VendingMachineFitness
     chance: 1