Skip to content

Commit

Permalink
revert changes to food stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
ErhardSteinhauer committed Mar 27, 2024
1 parent ae63687 commit 0a32a49
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 82 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@
- cobwebs
- bread
- type: Food
quality: Toxin # Frontier, New Food Quality System
- type: Sprite
layers:
- state: spidermeat
Expand All @@ -476,6 +475,7 @@
tags:
- Meat
- Bread
# Tastes like bread, cobwebs.

- type: entity
name: spider meat bread slice
Expand All @@ -488,7 +488,6 @@
- cobwebs
- bread
- type: Food
quality: Toxin # Frontier, New Food Quality System
- type: Sprite
layers:
- state: spidermeat-slice
Expand Down Expand Up @@ -801,8 +800,6 @@
Quantity: 4
- ReagentId: Mold
Quantity: 7
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
# Tastes like decaying fungus.

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,5 +467,3 @@
reagents:
- ReagentId: Amatoxin
Quantity: 10
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
- type: Tag
tags:
- Pie
- type: Food # Frontier, New Food Quality System
quality: High # Frontier, New Food Quality System

- type: entity
parent: FoodInjectableBase # Not sliceable
Expand All @@ -58,8 +56,6 @@
Quantity: 1
- ReagentId: Flavorol
Quantity: 1.5
- type: Food # Frontier, New Food Quality System
quality: High # Frontier, New Food Quality System

# Pie

Expand Down Expand Up @@ -438,8 +434,6 @@
Quantity: 4
- ReagentId: Flavorol
Quantity: 6
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
# Tastes like pie, mushrooms.

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
- oily
- bread
- type: Food
quality: High # Frontier, New Food Quality System
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
- type: SolutionContainerManager
Expand Down Expand Up @@ -44,7 +43,6 @@
- oily
- bread
- type: Food
quality: Toxin # Frontier, New Food Quality System
- type: Sprite
sprite: Objects/Consumable/Food/Baked/pizza.rsi
- type: SolutionContainerManager
Expand Down
27 changes: 0 additions & 27 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
- bun
- meaty
- type: Food
quality: High # Frontier, New Food Quality System
transferAmount: 5
- type: Sprite
sprite: Objects/Consumable/Food/burger.rsi
Expand Down Expand Up @@ -97,8 +96,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System
# Tastes like bun, grass.

- type: entity
Expand Down Expand Up @@ -127,8 +124,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System
# Tastes like bun, bacon.

- type: entity
Expand Down Expand Up @@ -159,8 +154,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System

- type: entity
name: bearger
Expand Down Expand Up @@ -190,8 +183,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System

- type: entity
name: big bite burger
Expand Down Expand Up @@ -309,8 +300,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System
# TODO: Make this work.
# - type: Sprite
# state: plate
Expand Down Expand Up @@ -381,8 +370,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System

- type: entity
name: corger #not curger
Expand Down Expand Up @@ -468,8 +455,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System

- type: entity
name: duck sandwich # Burger for you sick bastards
Expand Down Expand Up @@ -541,8 +526,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System
# Tastes like bun, fish.

- type: entity
Expand Down Expand Up @@ -631,8 +614,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System

- type: entity
name: McGuffin
Expand Down Expand Up @@ -724,8 +705,6 @@
Quantity: 1
- ReagentId: Flavorol
Quantity: 5
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System
# Tastes like .

- type: entity
Expand Down Expand Up @@ -756,8 +735,6 @@
- type: Tag
tags:
- Meat
- type: Food
quality: Normal # Frontier, New Food Quality System

- type: entity
name: rat burger
Expand Down Expand Up @@ -787,8 +764,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System
# Tastes like bun, HEAT.

- type: entity
Expand Down Expand Up @@ -961,8 +936,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
# Tastes like bun, acid.

# Note: I would put a bunch of colored burgers here as listed in the tg .dm but
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,6 @@
- type: Tag
tags:
- Trash
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: cocoa beans
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
- type: Item
storedRotation: -90
- type: Food
quality: High # Frontier, New Food Quality System
- type: Sprite
sprite: Objects/Consumable/Food/meals.rsi
- type: SolutionContainerManager
Expand Down Expand Up @@ -253,8 +252,6 @@
tags:
- CubanCarp
- Meat
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
# Tastes like fish, batter, hot peppers.

- type: entity
Expand Down Expand Up @@ -550,8 +547,6 @@
- type: Tag
tags:
- Meat
- type: Food # Frontier, New Food Quality System
quality: Nasty # Frontier, New Food Quality System
# tastes exotic

- type: entity
Expand Down
12 changes: 0 additions & 12 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
entity: FoodMeatRotten
# once it would say bloated, turn into the rotten prototype
stage: 1
- type: Food
quality: Nasty # Frontier, New Food Quality System

# bruh
- type: Tag
Expand Down Expand Up @@ -156,8 +154,6 @@
reagents:
- ReagentId: CarpoToxin
Quantity: 5
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: raw bacon
Expand Down Expand Up @@ -459,8 +455,6 @@
Quantity: 4
- ReagentId: Fat
Quantity: 4
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: raw spider meat
Expand Down Expand Up @@ -560,8 +554,6 @@
- type: SliceableFood
count: 3
slice: FoodMeatXenoCutlet
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: raw rouny meat
Expand Down Expand Up @@ -1255,8 +1247,6 @@
reagents:
- ReagentId: SulfuricAcid
Quantity: 20
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: raw killer tomato cutlet
Expand Down Expand Up @@ -1479,5 +1469,3 @@
Quantity: 1
- ReagentId: Protein
Quantity: 1
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,6 @@
- type: Extractable
grindableSolutionName: food
- type: BadFood
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System

- type: entity
name: gatfruit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@
Quantity: 2
- ReagentId: Flavorol
Quantity: 5
- type: Food
quality: Nasty # Frontier, New Food Quality System

- type: entity
name: double rat kebab
Expand All @@ -152,8 +150,6 @@
Quantity: 6
- ReagentId: Flavorol
Quantity: 10
- type: Food
quality: Nasty # Frontier, New Food Quality System

- type: entity
name: fiesta kebab
Expand Down
14 changes: 0 additions & 14 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
abstract: true
components:
- type: Food
quality: Junk # Frontier, New Food Quality System
- type: Tag
tags:
- FoodSnack
Expand Down Expand Up @@ -479,19 +478,6 @@
- type: SpaceGarbage
- type: StaticPrice
price: 1
- type: FlavorProfile # Frontier, Goblins
flavors: # Frontier, Goblins
- funny # Frontier, Goblins
- type: Food # Frontier, Goblins
quality: Trash # Frontier, New Food Quality System
# requiresSpecialDigestion: true # Frontier, Goblins
- type: SolutionContainerManager # Frontier
solutions: # Frontier
food: # Frontier
maxVol: 1 # Frontier
reagents: # Frontier
- ReagentId: TrashJuice # Frontier
Quantity: 1 # Frontier

- type: entity
noSpawn: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,6 @@
Quantity: 6
- ReagentId: Flavorol
Quantity: 5
- type: Food # Frontier, New Food Quality System
quality: Toxin # Frontier, New Food Quality System
# Soup

- type: entity
Expand Down

0 comments on commit 0a32a49

Please sign in to comment.