-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Mirror of PR #980: [Lunchboxes! Revival](DeltaV-Station/Delta-v#980) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/49997488?v=4" width="16"/><a href="https://github.com/DebugOk"> DebugOk</a> at 2024-03-19 11:23:47 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/49997488?v=4" width="16"/><a href="https://github.com/DebugOk"> DebugOk</a> at 2024-03-19 11:39:39 UTC</aside> <sup> `9ad761ae18818a8842b3a60c63cfff0b92b18e85` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Changes: Localization - Changes: Sprite --- <details open="true"><summary><h1>Original Body</h1></summary> > The following is copied from #716, but with the sprites all put into a single .RSI file > > ## About the PR > <!-- What did you change in this PR? --> > > Added Lunchboxes > Added pre-filled Lunchboxes, containing a few snacks. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > Variety, lets the chef pack meals for people that they can take with them, rather than leaving food on the kitchen counter! > Also a new storage item, for people to use nested inventory or for people to hide evil items in. > > ## Media > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ![image](https://github.com/DeltaV-Station/Delta-v/assets/142105406/de381c6f-616d-40f1-aab0-eff8204a52e3) > > > > **Changelog** > 🆑 DangerRevolution and Noctis > - add: Added lunchboxes to the chefvend and dinnerwarevend for the Chef to fill or hand out pre-made! > </details> Co-authored-by: Debug <[email protected]>
- Loading branch information
1 parent
cddbcba
commit 81bc8be
Showing
42 changed files
with
490 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
book-text-lunchbox-generic = Hello Honey! | ||
I've packed your lunch for this shift, I hope you enjoy it!! | ||
Love you so so much, | ||
- Mum. | ||
book-text-lunchbox-healthy = Hello Honey! | ||
I've packed you something healthy for this shift! I hope you enjoy it!! | ||
Love you so so much, | ||
- Mum. | ||
book-text-lunchbox-unhealthy = Hello Honey! | ||
I've packed you something fun for this shift! I hope you enjoy it!! | ||
Love you so so much, | ||
- Mum. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,4 +20,4 @@ | |
FoodButter: 4 | ||
FoodCheese: 1 | ||
FoodMeat: 6 | ||
|
||
LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,3 +24,4 @@ | |
DrinkMugOne: 1 | ||
DrinkMugRainbow: 2 | ||
DrinkMugRed: 2 | ||
LunchboxGeneric: 10 # Delta-V Adds Lunchbox |
26 changes: 26 additions & 0 deletions
26
Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
- type: entity | ||
parent: Paper | ||
id: PaperWrittenNoteFromMumGeneric | ||
name: note from mom | ||
suffix: Lunchbox, Generic | ||
components: | ||
- type: Paper | ||
content: book-text-lunchbox-generic | ||
|
||
- type: entity | ||
parent: PaperWrittenNoteFromMumGeneric | ||
id: PaperWrittenNoteFromMumHealthy | ||
name: note from mom | ||
suffix: Lunchbox, Healthy | ||
components: | ||
- type: Paper | ||
content: book-text-lunchbox-healthy | ||
|
||
- type: entity | ||
parent: PaperWrittenNoteFromMumGeneric | ||
id: PaperWrittenNoteFromMumUnhealthy | ||
name: note from mom | ||
suffix: Lunchbox, Unhealthy | ||
components: | ||
- type: Paper | ||
content: book-text-lunchbox-unhealthy |
313 changes: 313 additions & 0 deletions
313
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,313 @@ | ||
- type: entity | ||
id: LunchboxGeneric | ||
parent: [ BoxCardboard, BaseBagOpenClose ] | ||
name: lunchbox | ||
description: For on-the-go meal carrying needs. | ||
components: | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Storage/lunchbox.rsi | ||
layers: | ||
- state: generic | ||
- state: generic-open | ||
map: ["openLayer"] | ||
- type: Item | ||
size: Normal | ||
shape: null | ||
sprite: DeltaV/Objects/Storage/lunchbox.rsi | ||
heldPrefix: generic | ||
- type: Storage | ||
maxItemSize: Normal | ||
grid: | ||
- 0,0,1,1 | ||
- 3,0,1,1 | ||
- 4,0,4,2 | ||
- type: PhysicalComposition | ||
materialComposition: | ||
Plastic: 100 | ||
- type: MeleeWeapon | ||
damage: | ||
types: | ||
Blunt: 2 | ||
soundHit: | ||
path: "/Audio/Weapons/click.ogg" | ||
- type: StaticPrice | ||
price: 10 | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxGenericFilledRandom | ||
suffix: Filled, Random | ||
name: pre-packed lunchbox | ||
description: Packed with love. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FoodPizzaArnoldSlice | ||
orGroup: HealthyOrUnhealthyMain | ||
prob: 0.5 | ||
amount: 2 | ||
- id: FoodApple | ||
orGroup: HealthyOrUnhealthyMain | ||
prob: 0.5 | ||
- id: DrinkWaterBottleFull | ||
orGroup: HealthyOrUnhealthyDrink | ||
prob: 0.5 | ||
- id: DrinkCartonOrange | ||
orGroup: HealthyOrUnhealthyDrink | ||
prob: 0.5 | ||
- id: FoodSnackCheesie | ||
orGroup: HealthyOrUnhealthySnack | ||
prob: 0.25 | ||
- id: FoodSnackChocolate | ||
orGroup: HealthyOrUnhealthySnack | ||
prob: 0.25 | ||
- id: FoodCarrot | ||
orGroup: HealthyOrUnhealthySnack | ||
prob: 0.5 | ||
- id: PaperWrittenNoteFromMumGeneric | ||
prob: 0.1 | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxGenericFilledHealthy | ||
suffix: Filled, Healthy | ||
name: pre-packed lunchbox | ||
description: Packed with healthy love. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FoodApple | ||
- id: DrinkWaterBottleFull | ||
- id: FoodCarrot | ||
- id: PaperWrittenNoteFromMumHealthy | ||
prob: 0.1 | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxGenericFilledUnhealthy | ||
suffix: Filled, Unhealthy | ||
name: pre-packed lunchbox | ||
description: Packed with love. | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FoodPizzaArnoldSlice | ||
amount: 2 | ||
- id: DrinkCartonOrange | ||
- id: FoodSnackCheesie | ||
orGroup: UnhealthySnack | ||
prob: 0.25 | ||
- id: FoodSnackChocolate | ||
orGroup: UnhealthySnack | ||
prob: 0.25 | ||
- id: PaperWrittenNoteFromMumUnhealthy | ||
prob: 0.1 | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxCommand | ||
suffix: Command | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: command | ||
- state: command-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: command | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxCommandFilledRandom | ||
suffix: Command, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: command | ||
- state: command-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: command | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxSecurity | ||
suffix: Security | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: security | ||
- state: security-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: security | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxSecurityFilledRandom | ||
suffix: Security, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: security | ||
- state: security-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: security | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxMedical | ||
suffix: Medical | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: medical | ||
- state: medical-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: medical | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxMedicalFilledRandom | ||
suffix: Medical, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: medical | ||
- state: medical-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: medical | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxLogistics | ||
suffix: Logistics | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: logistics | ||
- state: logistics-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: logistics | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxLogisticsFilledRandom | ||
suffix: Logistics, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: logistics | ||
- state: logistics-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: logistics | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxEngineering | ||
suffix: Engineering | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: engineering | ||
- state: engineering-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: engineering | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxEngineeringFilledRandom | ||
suffix: Engineering, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: engineering | ||
- state: engineering-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: engineering | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxEpistemics | ||
suffix: Epistemics | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: epistemics | ||
- state: epistemics-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: epistemics | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxEpistemicsFilledRandom | ||
suffix: Epistemics, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: epistemics | ||
- state: epistemics-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: epistemics | ||
|
||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxService | ||
suffix: Service | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: service | ||
- state: service-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: service | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxServiceFilledRandom | ||
suffix: Service, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: service | ||
- state: service-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: service | ||
|
||
- type: entity | ||
parent: LunchboxGeneric | ||
id: LunchboxSyndicate | ||
suffix: Syndicate | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: syndicate | ||
- state: syndicate-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: syndicate | ||
|
||
- type: entity | ||
parent: LunchboxGenericFilledRandom | ||
id: LunchboxSyndicateFilledRandom | ||
suffix: Syndicate, Filled, Random | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: syndicate | ||
- state: syndicate-open | ||
map: [ "openLayer" ] | ||
- type: Item | ||
heldPrefix: syndicate |
Binary file added
BIN
+437 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+478 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+356 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+450 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+492 Bytes
...urces/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+331 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+372 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+447 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+492 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+349 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+388 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+426 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+466 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+246 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+443 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+489 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+308 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+346 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+466 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+503 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+309 Bytes
Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.