Skip to content

Commit

Permalink
Barrels (#1776)
Browse files Browse the repository at this point in the history
* initial commit

* fix congraph

* one pixel annoying me

* new keg

* further refinement of sprites

* fix perspective

* fix yml a bit

* basic sprites, un-mussied

* explodey time

* Update barrel.yml

* im stupiod

* Update barrel.yml

* Update barrel.yml

* chemicals

* better sprites

* no suffixes

* no suffixes

* Update salvage.yml

* Update barrel.yml

* Update barrel.yml

* Update barrel.yml

* Kegs

* Cleanup

* Update cargo_medical.yml

* Update barrel.yml

* Update cargo_food.yml

* Cleanup

* Cleanup

* Update barrel.yml

* Price

* Update barrel.yml

* Update cargo_medical.yml

* No used for refill, ever

* sprite

* Update barrel.yml

* Cleanup

* Yep

* Sprites, white, black barrels, cargo entries

* it's called o2 because there's two of them

* Barrel spawner, service-ish barrels

* white/black sprite touchups, paper labels & fixes

* Booze barrels, barrel spawners

* Oliveoil, not OliveOil

* Open option

* Up all the prices

nothing final but should be good for first merge

* ChefVend: reduce oil jug count, 1 of each

* mayo is a condiment, not an oil

* realphabetize reagent labels

* reorder empty barrel

* Removed chemicals from cargo

* SpaceCleaner

* Update dungeon_items_kitchen.yml

* Update migration.yml

---------

Co-authored-by: rosieposie <[email protected]>
Co-authored-by: ErhardSteinhauer <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
  • Loading branch information
5 people authored Dec 21, 2024
1 parent 0a8c74a commit d198d11
Show file tree
Hide file tree
Showing 54 changed files with 2,039 additions and 87 deletions.
49 changes: 49 additions & 0 deletions Resources/Locale/en-US/_NF/reagents/labels.ftl
Original file line number Diff line number Diff line change
@@ -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]
19 changes: 10 additions & 9 deletions Resources/Prototypes/Catalog/Cargo/cargo_food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
299 changes: 299 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,302 @@
cost: 3000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrel
name: barrel (empty)
icon:
sprite: _NF/Objects/Storage/Barrels/white.rsi
state: icon
product: MetalBarrelWhite
cost: 2000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelCarbon
name: barrel of carbon
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/black.rsi
state: icon
product: ChemicalBarrelCarbon
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelIodine
name: barrel of iodine
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/red.rsi
state: icon
product: ChemicalBarrelIodine
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelFluorine
name: barrel of fluorine
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/blue.rsi
state: icon
product: ChemicalBarrelFluorine
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelChlorine
name: barrel of chlorine
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/green.rsi
state: icon
product: ChemicalBarrelChlorine
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelAluminium
name: barrel of aluminium
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/white.rsi
state: icon
product: ChemicalBarrelAluminium
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelPhosphorus
name: barrel of phosphorus
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/red.rsi
state: icon
product: ChemicalBarrelPhosphorus
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelSulfur
name: barrel of sulfur
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/yellow.rsi
state: icon
product: ChemicalBarrelSulfur
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelSilicon
name: barrel of silicon
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/black.rsi
state: icon
product: ChemicalBarrelSilicon
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelHydrogen
name: barrel of hydrogen
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/white.rsi
state: icon
product: ChemicalBarrelHydrogen
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelLithium
name: barrel of lithium
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/grey.rsi
state: icon
product: ChemicalBarrelLithium
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelSodium
name: barrel of sodium
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/grey.rsi
state: icon
product: ChemicalBarrelSodium
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelPotassium
name: barrel of potassium
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/yellow.rsi
state: icon
product: ChemicalBarrelPotassium
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelRadium
name: barrel of radium
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/green.rsi
state: icon
product: ChemicalBarrelRadium
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelIron
name: barrel of iron
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/grey.rsi
state: icon
product: ChemicalBarrelIron
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelCopper
name: barrel of copper
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/red.rsi
state: icon
product: ChemicalBarrelCopper
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelGold
name: barrel of gold
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/yellow.rsi
state: icon
product: ChemicalBarrelGold
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelMercury
name: barrel of mercury
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/grey.rsi
state: icon
product: ChemicalBarrelMercury
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelSilver
name: barrel of silver
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/white.rsi
state: icon
product: ChemicalBarrelSilver
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelEthanol
name: barrel of ethanol
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/blue.rsi
state: icon
product: ChemicalBarrelEthanol
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelSugar
name: barrel of sugar
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/white.rsi
state: icon
product: ChemicalBarrelSugar
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelNitrogen
name: barrel of nitrogen
# abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/red.rsi
state: icon
product: ChemicalBarrelNitrogen
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelOxygen
name: barrel of oxygen
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/blue.rsi
state: icon
product: ChemicalBarrelOxygen
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelOil
name: barrel of oil
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/black.rsi
state: icon
product: ChemicalBarrelOil
cost: 5000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: CargoBarrelDiethylamine
name: barrel of diethylamine
abstract: true
icon:
sprite: _NF/Objects/Storage/Barrels/green.rsi
state: icon
product: ChemicalBarrelDiethylamine
cost: 5000
category: cargoproduct-category-name-medical
group: market
Loading

0 comments on commit d198d11

Please sign in to comment.