Barrels

Resources/Locale/en-US/_NF/reagents/labels.ftl

@@ -0,0 +1,49 @@
+# Labels for reagent barrels
+# Elements & basic reagents
+reagent-label-aluminium = [bold]Aluminium[/bold]
+reagent-label-carbon = [bold]Carbon[/bold]
+reagent-label-chlorine = [bold]Chlorine[/bold]
+reagent-label-copper = [bold]Copper[/bold]
+reagent-label-ethanol = [bold]Ethanol[/bold]
+reagent-label-fluorine = [bold]Fluorine[/bold]
+reagent-label-gold = [bold]Gold[/bold]
+reagent-label-hydrogen = [bold]Hydrogen[/bold]
+reagent-label-iodine = [bold]Iodine[/bold]
+reagent-label-iron = [bold]Iron[/bold]
+reagent-label-lithium = [bold]Lithium[/bold]
+reagent-label-mercury = [bold]Mercury[/bold]
+reagent-label-nitrogen = [bold]Nitrogen[/bold]
+reagent-label-oxygen = [bold]Oxygen[/bold]
+reagent-label-phosphorus = [bold]Phosphorus[/bold]
+reagent-label-potassium = [bold]Potassium[/bold]
+reagent-label-radium = [bold]Radium[/bold]
+reagent-label-silicon = [bold]Silicon[/bold]
+reagent-label-silver = [bold]Silver[/bold]
+reagent-label-sodium = [bold]Sodium[/bold]
+reagent-label-sugar = [bold]Sugar[/bold]
+reagent-label-sulfur = [bold]Sulfur[/bold]
+# Service & other reagents
+reagent-label-cornoil = [bold]Corn Oil[/bold]
+reagent-label-diethylamine = [bold]Diethylamine[/bold]
+reagent-label-ketchup = [bold]Ketchup[/bold]
+reagent-label-mayo = [bold]Mayonnaise[/bold]
+reagent-label-mustard = [bold]Mustard[/bold]
+reagent-label-oil = [bold]Oil[/bold]
+reagent-label-oil-olive = [bold]Olive Oil[/bold]
+reagent-label-space-cleaner = [bold]Space Cleaner[/bold]
+reagent-label-space-lube = [bold]Space Lube[/bold]
+reagent-label-welding-fuel = [bold]Welding Fuel[/bold]
+# Drinks
+reagent-label-absinthe = [bold]Absinthe[/bold]
+reagent-label-ale = [bold]Ale[/bold]
+reagent-label-beer = [bold]Beer[/bold]
+reagent-label-coffeeliqueur = [bold]Coffee Liqueur[/bold]
+reagent-label-cognac = [bold]Cognac[/bold]
+reagent-label-gin = [bold]Gin[/bold]
+reagent-label-rum = [bold]Rum[/bold]
+reagent-label-tequila = [bold]Tequila[/bold]
+reagent-label-vermouth = [bold]Vermouth[/bold]
+reagent-label-vodka = [bold]Vodka[/bold]
+reagent-label-water = [bold]Water[/bold]
+reagent-label-whiskey = [bold]Whiskey[/bold]
+reagent-label-wine = [bold]Wine[/bold]

Resources/Prototypes/Catalog/Cargo/cargo_food.yml

@@ -75,12 +75,13 @@
   category: cargoproduct-category-name-food
   group: market
 
-# - type: cargoProduct
-  # id: FoodSoftdrinksLarge
-  # icon:
-    # sprite: Objects/Consumable/Drinks/colabottle.rsi
-    # state: icon
-  # product: CrateFoodSoftdrinksLarge
-  # cost: 2400
-  # category: cargoproduct-category-name-food
-  # group: market
+- type: cargoProduct
+  id: FoodSoftdrinksLarge
+  abstract: true # Frontier
+  icon:
+    sprite: Objects/Consumable/Drinks/colabottle.rsi
+    state: icon
+  product: CrateFoodSoftdrinksLarge
+  cost: 2400
+  category: cargoproduct-category-name-food
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_medical.yml

@@ -130,6 +130,7 @@
 
 - type: cargoProduct
   id: ChemistryP
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon
@@ -140,6 +141,7 @@
 
 - type: cargoProduct
   id: ChemistryS
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon
@@ -150,6 +152,7 @@
 
 - type: cargoProduct
   id: CrateChemistryD
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon

Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml

@@ -10,18 +10,16 @@
 #    FoodCondimentPacketSalt: 4 # Frontier - Replaced with big salt
     ReagentContainerSalt: 5 # Frontier
     ReagentContainerPepper: 5 # Frontier
-    DrinkKegPlasticKetchup: 1 # Frontier - Refills
-    DrinkKegPlasticMustard: 1 # Frontier - Refills
     FoodCondimentBottleEnzyme: 5 # Frontier 2<5
     FoodCondimentBottleHotsauce: 2
     FoodCondimentBottleKetchup: 2
     FoodCondimentBottleBBQ: 2
     FoodCondimentBottleVinegar: 5  # Frontier 2<5
 #    ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive
-    OilJarOlive: 3
-    OilJarCorn: 3
-    OilJarGhee: 3
     ReagentContainerMayo: 2
+    OilJarOlive: 1 # Frontier
+    OilJarCorn: 1 # Frontier
+    OilJarGhee: 1 # Frontier
     #VariantCubeBox: 3 # Frontier
     MonkeyCubeBox: 2 # Frontier
     KoboldCubeBox: 2 # Frontier