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

Lunchboxes! #716

Closed
wants to merge 14 commits into from
Closed

Lunchboxes! #716

wants to merge 14 commits into from

Conversation

DangerRevolution
Copy link
Contributor

@DangerRevolution DangerRevolution commented Jan 23, 2024

About the PR

Added Lunchboxes
Added pre-filled Lunchboxes, containing a few snacks.

Why / 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

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

image

Changelog
🆑 DangerRevolution and Noctis

  • add: Added lunchboxes!
  • add: Added lunchboxes to the chefvend and dinnerwarevend for the Chef to fill or hand out pre-made!

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Jan 23, 2024
Copy link
Contributor

github-actions bot commented Jan 23, 2024

RSI Diff Bot; head commit df6d205 merging into 666194b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/command.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/engineering.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/epistemics.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/generic.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/logistics.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/medical.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/security.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/service.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Resources/Textures/DeltaV/Objects/Storage/Lunchbox/syndicate.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Edit: diff updated after df6d205

@deltanedas
Copy link
Member

happy honk meals do this already :trollface:
grab burger put it in meal and leave at every dept front desk

@DangerRevolution
Copy link
Contributor Author

DangerRevolution commented Jan 23, 2024

happy honk meals do this already :trollface: grab burger put it in meal and leave at every dept front desk

happy honk meal = corporate gift box with a toy inside
lunchbox = box designed to hold food & snacks for the chef to fill (maybe filled if mapper maps it in)

@DangerRevolution DangerRevolution marked this pull request as ready for review January 25, 2024 16:57
@DangerRevolution
Copy link
Contributor Author

This is fully ready for review.

Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge all the textures into a single RSI or I wont even look at this

@DangerRevolution DangerRevolution marked this pull request as draft February 1, 2024 18:52
@DebugOk DebugOk mentioned this pull request Mar 19, 2024
1 task
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
## Mirror of PR DeltaV-Station#980: [Lunchboxes!
Revival](DeltaV-Station#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 DeltaV-Station#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]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

Various minor yaml and QOL ports from Floofstation.

Changelog entries go in order of author. I'm considering just copying
over the changelog at some point.

# Changelog

:cl: AeraAuling, ShatteredSwords and Cynical24
- add: Added the Explorer's Labcoat and a Hairflower into Loadouts.
- fix: Fixed Epistemics being unable to take Survival Boxes
- fix: Fixed the NearSighted trait making you unable to take glasses in
your loadout
- add: Added a variety of Cowboy Hats into loadouts.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants