Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

let chemvend restock refill syndiejuice #2143

Merged
merged 2 commits into from
Nov 9, 2024
Merged

let chemvend restock refill syndiejuice #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65b877
let chemvend restock refill syndiejuice
Nov 7, 2024
7a12528
Merge branch 'master' into syndiejuice-ops
MilonPL Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@
- type: VendingMachineRestock
canRestock:
- ChemVendInventory
- ChemVendInventorySyndicate # DeltaV: Let it restock synthesis/nukie vendor
- type: Sprite
layers:
- state: base
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,7 @@
parent: VendingMachineChemicals
id: VendingMachineChemicalsSyndicate
name: SyndieJuice
description: Not made with freshly squeezed syndies I hope.
description: Not made with freshly squeezed syndies I hope. Backwards compatible with standard ChemVend restocks. # DeltaV: Add chemvend part
components:
- type: VendingMachine
pack: ChemVendInventorySyndicate
Expand Down
Loading