From 1db8f9908d2b22919fc1626baa327fb5e4d0203b Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 22 Feb 2021 09:11:59 +0000 Subject: [PATCH] Alphabetised dispenser .yaml files (#3275) * alphabetised * alphabetised * alphabetised * alphabetised * alphabetised * alphabetised * alphabetised * Added back SpaceTwinkie * added thirteenloko back Removed duplicate grape..silly me --- .../Catalog/VendingMachines/boozeomat.yml | 8 ++--- .../Catalog/VendingMachines/cola.yml | 3 +- .../Catalog/VendingMachines/seeds.yml | 12 ++++---- .../Catalog/VendingMachines/snack.yml | 6 ++-- .../Specific/Dispensers/booze_dispenser.yml | 8 ++--- .../Specific/Dispensers/chem_dispenser.yml | 30 +++++++++---------- .../Specific/Dispensers/soda_dispenser.yml | 8 ++--- 7 files changed, 36 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml index dc1511ed28..791a43fcd5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml @@ -1,13 +1,14 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: Booze-O-Mat name: Booze-O-Mat description: A vending machine containing multiple drinks for bartending. spriteName: boozeomat startingInventory: - DrinkGlass: 20 + DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze. DrinkAbsintheBottleFull: 3 DrinkAlcoGreenFull: 3 DrinkAleBottleFull: 3 + DrinkBeer: 10 DrinkCognacBottleFull: 3 DrinkGinBottleFull: 3 DrinkGoldschlagerBottleFull: 3 @@ -19,6 +20,3 @@ DrinkVodkaBottleFull: 4 DrinkWhiskeyBottleFull: 2 DrinkWineBottleFull: 3 - DrinkBeer: 10 - - diff --git a/Resources/Prototypes/Catalog/VendingMachines/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/cola.yml index 50990960ad..87e466b57c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/cola.yml @@ -6,11 +6,10 @@ spriteName: cola startingInventory: DrinkColaCan: 10 + DrinkGrapeCan: 10 DrinkIceTeaCan: 10 DrinkLemonLimeCan: 10 - DrinkGrapeCan: 10 DrinkSpaceMountainWindCan: 10 DrinkSpaceUpCan: 10 DrinkStarkistCan: 10 DrinkThirteenLokoCan: 10 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/seeds.yml index 424a5821d3..675a4c2a21 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/seeds.yml @@ -5,15 +5,15 @@ animationDuration: 1.3 spriteName: seeds startingInventory: - WheatSeeds: 10 + AppleSeeds: 10 BananaSeeds: 10 CarrotSeeds: 10 + ChanterelleSeeds: 10 + CornSeeds: 10 + EggplantSeeds: 10 LemonSeeds: 10 PotatoSeeds: 10 SugarcaneSeeds: 10 - TowercapSeeds: 10 TomatoSeeds: 10 - EggplantSeeds: 10 - AppleSeeds: 10 - CornSeeds: 10 - ChanterelleSeeds: 10 + TowercapSeeds: 10 + WheatSeeds: 10 diff --git a/Resources/Prototypes/Catalog/VendingMachines/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/snack.yml index 947e512d56..0ec0304b8d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/snack.yml @@ -5,9 +5,9 @@ animationDuration: 0.5 spriteName: snack startingInventory: - FoodSpaceTwinkie: 8 + Food4NoRaisins: 4 FoodCandy: 4 - FoodSyndiCakes: 4 FoodCandyCorn: 4 FoodPopcorn: 4 - Food4NoRaisins: 4 + FoodSpaceTwinkie: 8 + FoodSyndiCakes: 4 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml index 24b5de3306..93ce896a81 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml @@ -13,12 +13,12 @@ - type: reagentDispenserInventory id: BoozeDispenserInventory inventory: - - chem.Whiskey - chem.Ale - - chem.Wine - - chem.Ice - chem.Beer - - chem.Vodka - chem.Cognac + - chem.Ice - chem.Kahlua - chem.Rum + - chem.Vodka + - chem.Whiskey + - chem.Wine diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml index 92840e7a79..e6e4fd1059 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml @@ -17,27 +17,27 @@ - type: reagentDispenserInventory id: ChemDispenserStandardInventory inventory: - - chem.SulfuricAcid - - chem.Water - - chem.Ethanol - - chem.Glucose - - chem.Sugar - - chem.Hydrogen - - chem.Oxygen - - chem.Sulfur - - chem.Carbon - - chem.Copper - - chem.Nitrogen - - chem.Nutriment - - chem.Iron - - chem.Fluorine - chem.Aluminium - - chem.Silicon + - chem.Carbon - chem.Chlorine + - chem.Copper + - chem.Ethanol + - chem.Fluorine + - chem.Glucose + - chem.Hydrogen + - chem.Iron - chem.Lithium - chem.Mercury + - chem.Nitrogen + - chem.Nutriment + - chem.Oxygen - chem.Phosphorus - chem.Potassium - chem.Radium + - chem.Silicon - chem.Sodium + - chem.Sugar + - chem.Sulfur + - chem.SulfuricAcid - chem.Uranium + - chem.Water diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml index 8e08cedbe8..f1598dba65 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml @@ -13,9 +13,9 @@ - type: reagentDispenserInventory id: SodaDispenserInventory inventory: - - chem.Cola - chem.Coffee - - chem.Tea - - chem.Ice - - chem.Water + - chem.Cola - chem.Cream + - chem.Ice + - chem.Tea + - chem.Water