-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from Plyushsune/Branch_2
2nd
- Loading branch information
Showing
16 changed files
with
129 additions
and
132 deletions.
There are no files selected for viewing
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: RobustSoftdrinksInventory | ||
| startingInventory: | ||
| DrinkColaCan: 4 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkColaCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
14 changes: 7 additions & 7 deletions
14
Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| - type: vendingMachineInventory | ||
| id: DiscountDansInventory | ||
| startingInventory: | ||
| FoodSnackCheesie: 3 | ||
| FoodSnackChips: 3 | ||
| FoodSnackBoritos: 3 | ||
| DrinkEnergyDrinkCan: 4 | ||
| FoodSnackPopcorn: 3 | ||
| FoodSnackEnergy: 3 | ||
| CigPackMixed: 2 | ||
| FoodSnackCheesie: 5 | ||
| FoodSnackChips: 5 | ||
| FoodSnackBoritos: 5 | ||
| DrinkEnergyDrinkCan: 5 | ||
| FoodSnackPopcorn: 5 | ||
| FoodSnackEnergy: 5 | ||
| CigPackMixed: 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
Resources/Prototypes/Catalog/VendingMachines/Inventories/fitness.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| - type: vendingMachineInventory | ||
| id: FitnessVendInventory | ||
| startingInventory: | ||
| FoodSnackProteinbar: 3 | ||
| FoodCondimentPacketProtein: 3 | ||
| DrinkMilkCartonMini: 3 | ||
| DrinkMilkCartonMiniChocolate: 3 | ||
| DrinkWaterBottleFull: 3 | ||
| DrinkFitnessShakerBlack: 2 | ||
| DrinkFitnessShakerRed: 2 | ||
| DrinkFitnessShakerBlue: 2 | ||
| FoodSnackProteinbar: 5 | ||
| FoodCondimentPacketProtein: 5 | ||
| DrinkMilkCartonMini: 5 | ||
| DrinkMilkCartonMiniChocolate: 5 | ||
| DrinkWaterBottleFull: 5 | ||
| DrinkFitnessShakerBlack: 3 | ||
| DrinkFitnessShakerRed: 3 | ||
| DrinkFitnessShakerBlue: 3 |
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: DrGibbInventory | ||
| startingInventory: | ||
| DrinkDrGibbCan: 4 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkDrGibbCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
10 changes: 5 additions & 5 deletions
10
Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| - type: vendingMachineInventory | ||
| id: HappyHonkDispenserInventory | ||
| startingInventory: | ||
| HappyHonk: 10 | ||
| HappyHonkMime: 4 | ||
| emaggedInventory: | ||
| HappyHonkCluwne: 1 | ||
| HappyHonkNukie: 1 | ||
| HappyHonk: 3 | ||
| HappyHonkMime: 3 | ||
| # emaggedInventory: | ||
| HappyHonkCluwne: 3 | ||
| HappyHonkNukie: 3 |
22 changes: 11 additions & 11 deletions
22
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| - type: vendingMachineInventory | ||
| id: PwrGameInventory | ||
| startingInventory: | ||
| DrinkPwrGameCan: 4 | ||
| DrinkEnergyDrinkCan: 4 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkPwrGameCan: 5 | ||
| DrinkEnergyDrinkCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: ShamblersJuiceInventory | ||
| startingInventory: | ||
| DrinkShamblersJuiceCan: 4 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkShamblersJuiceCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
16 changes: 8 additions & 8 deletions
16
Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| - type: vendingMachineInventory | ||
| id: GetmoreChocolateCorpInventory | ||
| startingInventory: | ||
| FoodSnackRaisins: 3 | ||
| FoodSnackChocolate: 3 | ||
| FoodSnackCnDs: 3 | ||
| FoodSnackPistachios: 3 | ||
| FoodSnackSus: 3 | ||
| FoodSnackSemki: 3 | ||
| emaggedInventory: | ||
| FoodSnackSyndi: 3 | ||
| FoodSnackRaisins: 5 | ||
| FoodSnackChocolate: 5 | ||
| FoodSnackCnDs: 5 | ||
| FoodSnackPistachios: 5 | ||
| FoodSnackSus: 5 | ||
| FoodSnackSemki: 5 | ||
| # emaggedInventory: | ||
| FoodSnackSyndi: 5 | ||
|
|
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: SodaInventory | ||
| startingInventory: | ||
| DrinkColaCan: 3 | ||
| DrinkGrapeCan: 3 | ||
| DrinkRootBeerCan: 3 | ||
| DrinkIcedTeaCan: 3 | ||
| DrinkSolDryCan: 3 | ||
| DrinkLemonLimeCan: 3 | ||
| DrinkFourteenLokoCan: 3 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 3 | ||
| DrinkChangelingStingCan: 3 | ||
| DrinkColaCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/solsnack.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: SolsnackInventory | ||
| startingInventory: | ||
| FoodSnackLunacakeWrapped: 3 | ||
| FoodSnackMochicakeWrapped: 3 | ||
| FoodSnackMooncakeWrapped: 3 | ||
| FoodSnackTidegobs: 3 | ||
| FoodSnackSaturnos: 3 | ||
| FoodSnackJoveGello: 3 | ||
| FoodSnackPlutoniumrods: 3 | ||
| FoodSnackMarsFrouka: 3 | ||
| FoodSnackVenusianhotcakes: 3 | ||
| FoodSnackOortrocks: 3 | ||
| FoodSnackLunacakeWrapped: 5 | ||
| FoodSnackMochicakeWrapped: 5 | ||
| FoodSnackMooncakeWrapped: 5 | ||
| FoodSnackTidegobs: 5 | ||
| FoodSnackSaturnos: 5 | ||
| FoodSnackJoveGello: 5 | ||
| FoodSnackPlutoniumrods: 5 | ||
| FoodSnackMarsFrouka: 5 | ||
| FoodSnackVenusianhotcakes: 5 | ||
| FoodSnackOortrocks: 5 |
22 changes: 11 additions & 11 deletions
22
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| - type: vendingMachineInventory | ||
| id: SpaceUpInventory | ||
| startingInventory: | ||
| DrinkSpaceUpCan: 3 | ||
| DrinkSpaceMountainWindCan: 3 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkSpaceUpCan: 5 | ||
| DrinkSpaceMountainWindCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
20 changes: 10 additions & 10 deletions
20
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: StarkistInventory | ||
| startingInventory: | ||
| DrinkStarkistCan: 4 | ||
| DrinkGrapeCan: 2 | ||
| DrinkRootBeerCan: 2 | ||
| DrinkIcedTeaCan: 2 | ||
| DrinkSolDryCan: 2 | ||
| DrinkLemonLimeCan: 2 | ||
| DrinkFourteenLokoCan: 2 | ||
| emaggedInventory: | ||
| DrinkNukieCan: 2 | ||
| DrinkChangelingStingCan: 2 | ||
| DrinkStarkistCan: 5 | ||
| DrinkGrapeCan: 5 | ||
| DrinkRootBeerCan: 5 | ||
| DrinkIcedTeaCan: 5 | ||
| DrinkSolDryCan: 5 | ||
| DrinkLemonLimeCan: 5 | ||
| DrinkFourteenLokoCan: 5 | ||
| # emaggedInventory: | ||
| DrinkNukieCan: 5 | ||
| DrinkChangelingStingCan: 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
Resources/Prototypes/Catalog/VendingMachines/Inventories/weebvend.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| - type: vendingMachineInventory | ||
| id: WeebVendInventory | ||
| startingInventory: | ||
| FoodSnackRedalertnuts: 3 | ||
| FoodSnackRicecake: 3 | ||
| FoodSnackPokeysticks: 3 | ||
| FoodSnackChocobanana: 3 | ||
| FoodSnackDango: 3 | ||
| FoodSnackRedalertnuts: 5 | ||
| FoodSnackRicecake: 5 | ||
| FoodSnackPokeysticks: 5 | ||
| FoodSnackChocobanana: 5 | ||
| FoodSnackDango: 5 |