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.

Sign up for GitHub

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

feat: Add emergency pie delivery #2211

Merged
merged 6 commits into from
Nov 25, 2024
Merged

feat: Add emergency pie delivery #2211

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
235b157
feat: Add emergency pie delivery
DisposableCrewmember42 Nov 16, 2024
6431d3d
refactor: add missing newline
DisposableCrewmember42 Nov 16, 2024
c38cafc
refactor: Move name and description to prototype
DisposableCrewmember42 Nov 16, 2024
ea723f2
tweak: Increase price to 3200 to make the integration test happy...
DisposableCrewmember42 Nov 16, 2024
2d2f350
tweak: Change price again and adjust amount
DisposableCrewmember42 Nov 16, 2024
9a682a8
refactor: unindent a level
DisposableCrewmember42 Nov 25, 2024
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
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-food.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ ent-FoodDonkpocketSavory = { ent-CrateFoodDonkpocketSavory }

ent-FoodDonkpocketSweet = { ent-CrateFoodDonkpocketSweet }
.desc = { ent-CrateFoodDonkpocketSweet.desc }

ent-FoodEmergencyPie = { ent-CrateFoodEmergencyPie }
.desc = { ent-CrateFoodEmergencyPie.desc }
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/food-crates.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ ent-CrateFoodDonkpocketSavory = Donk Pocket shipment (Savory)

ent-CrateFoodDonkpocketSweet = Donk Pocket shipment (Sweet)
.desc = A shipment of five boxes from the sweet Donk Pocket variety selection.

ent-CrateFoodEmergencyPie = emergency pie delivery
.desc = "Then let them eat pie."
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,13 @@
cost: 6000 # Thanks bounties
category: Food
group: market

- type: cargoProduct
id: FoodEmergencyPie
icon:
sprite: Objects/Consumable/Food/Baked/pie.rsi
state: tin
product: CrateFoodEmergencyPie
cost: 666
category: Food
group: market
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,12 @@
amount: 1
- id: FoodBoxDonkpocketDink
prob: 0.1

- type: entity
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
id: CrateFoodEmergencyPie
parent: CratePlastic
components:
- type: StorageFill
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
contents:
- id: FoodPieBananaCream
DisposableCrewmember42 marked this conversation as resolved.
Show resolved Hide resolved
amount: 4
Loading