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.

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

Vends Reorder #328

Merged
merged 2 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
- type: vendingMachineInventory
id: TankDispenserEVAInventory
startingInventory:
OxygenTankFilled: 5
NitrogenTankFilled: 5
EmergencyOxygenTankFilled: 5
ExtendedEmergencyOxygenTankFilled: 5
DoubleEmergencyOxygenTankFilled: 5
EmergencyNitrogenTankFilled: 5
ExtendedEmergencyNitrogenTankFilled: 5
DoubleEmergencyNitrogenTankFilled: 5
# EmergencyOxygenTankFilled: 5
# ExtendedEmergencyOxygenTankFilled: 5
OxygenTankFilled: 10
DoubleEmergencyOxygenTankFilled: 10
# EmergencyNitrogenTankFilled: 5
# ExtendedEmergencyNitrogenTankFilled: 5
NitrogenTankFilled: 10
DoubleEmergencyNitrogenTankFilled: 10

- type: vendingMachineInventory
id: TankDispenserEngineeringInventory
startingInventory:
PlasmaTankFilled: 5
OxygenTankFilled: 5
PlasmaTankFilled: 10
OxygenTankFilled: 10
73 changes: 0 additions & 73 deletions Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: vendingMachineInventory
id: AstroVendInventory
startingInventory:
ClothingOuterHardsuitSpatio: 5
ClothingShoesBootsMag: 15
ClothingOuterHardsuitBasic: 5
ClothingOuterHardsuitEVA: 10
ClothingHeadHelmetEVA: 15
RadioHandheld: 15
HandheldGPSBasic: 15
AirTankFilled: 10
JetpackMiniFilled: 10
EncryptionKeyCommand: 30
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: vendingMachineInventory
id: BountyVendInventory
startingInventory:
PinpointerUniversal: 15
WeaponGrapplingGun: 10
HandheldGPSBasic: 5
JetpackMiniFilled: 10
WeaponDisabler: 10
WeaponEmpEmitter: 10
Zipties: 20
Flash: 15
ClothingEyesGlassesSunglasses: 12
ClothingHeadHatHoshat: 4
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: vendingMachineInventory
id: CircuitVendInventory
startingInventory:
## SalvageExpeditionsComputerCircuitboard: 8
OreProcessorMachineCircuitboard: 10
CircuitImprinterMachineCircuitboard: 6
ProtolatheMachineCircuitboard: 6
AutolatheMachineCircuitboard: 6
ResearchComputerCircuitboard: 6
ResearchAndDevelopmentServerMachineCircuitboard: 12
TelecomServerCircuitboard: 6
ComputerIFFCircuitboard: 4
EngineeringTechFabCircuitboard: 4
MedicalTechFabCircuitboard: 4
ServiceTechFabCircuitboard: 4
ScienceTechFabCircuitboard: 4
MaterialReclaimerMachineCircuitboard: 4
ExosuitFabricatorMachineCircuitboard: 4
UniformPrinterMachineCircuitboard: 4
HydroponicsTrayMachineCircuitboard: 16
DawInstrumentMachineCircuitboard: 4
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- type: vendingMachineInventory
id: ContraVendInventory
startingInventory:
CigPackSyndicate: 8
Stimpack: 6
StimkitFilled: 4
SyndicateJawsOfLife: 4
ToolboxSyndicateFilled: 4
RadioJammer: 8
PowerSink: 2
BoxEncryptionKeySyndie: 8
AgentIDCard: 8
StealthBox: 6
ClothingMaskGasVoiceChameleon: 6
ClothingBackpackChameleonFill: 4
HypopenBox: 4
Emag: 2
StorageImplanter: 4
ClothingShoesBootsMagSyndie: 4
ClothingShoesChameleonNoSlips: 8
ClothingBackpackDuffelSyndicateEVABundle: 12
BoxHoloparasite: 2
Loading