Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 2 #376

Merged
merged 5 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@
- state: margherita
- type: SliceableFood
slice: FoodPizzaMargheritaSlice
- type: Tag
tags:
- Pizza
- Vegetable

- type: entity
name: slice of margherita pizza
Expand All @@ -98,10 +94,6 @@
- type: Sprite
layers:
- state: margherita-slice
- type: Tag
tags:
- Pizza
- Vegetable

- type: entity
name: meat pizza
Expand Down Expand Up @@ -210,11 +202,7 @@
Quantity: 5
- ReagentId: Vitamin
Quantity: 5
- type: Tag
tags:
- Pizza
- Vegetable


- type: entity
name: slice of vegetable pizza
parent: FoodPizzaSliceBase
Expand Down Expand Up @@ -244,10 +232,6 @@
Quantity: 1
- ReagentId: Vitamin
Quantity: 1
- type: Tag
tags:
- Pizza
- Vegetable

# Tastes like crust, tomato, cheese, carrot.

Expand Down Expand Up @@ -340,10 +324,6 @@
Quantity: 5
- ReagentId: DoctorsDelight
Quantity: 6
- type: Tag
tags:
- Pizza
- Vegetable

- type: entity
name: slice of dank pizza
Expand Down Expand Up @@ -371,10 +351,6 @@
Quantity: 0.8
- ReagentId: DoctorsDelight
Quantity: 1
- type: Tag
tags:
- Pizza
- Vegetable
# Tastes like crust, tomato, cheese, meat, satisfaction.

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- type: Tag
tags:
- Pizza
- Vegetable # Yes, I am aware that corn is technically a fruit, but the tagging system is enough of a mess as it is

- type: entity
name: slice of corncob crust pizza
Expand All @@ -50,7 +49,6 @@
- type: Tag
tags:
- Pizza
- Vegetable

- type: entity
name: firecracker pizza
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
False: { visible: false }
- type: Speech
speechVerb: Robotic
- type: ItemToggle
soundActivate:
path: /Audio/Items/Defib/defib_safety_on.ogg
soundDeactivate:
path: /Audio/Items/Defib/defib_safety_off.ogg
- type: StaticPrice
price: 50

Expand Down
Loading