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! Revival #980

Merged
merged 17 commits into from
Mar 19, 2024
Merged

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Mar 19, 2024

The following is copied from #716, but with the sprites all put into a single .RSI file

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 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 Mar 19, 2024
Copy link
Contributor

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

Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi

State Old New Status
command-inhand-left Added
command-inhand-right Added
command-open Added
command Added
engineering-inhand-left Added
engineering-inhand-right Added
engineering-open Added
engineering Added
epistemics-inhand-left Added
epistemics-inhand-right Added
epistemics-open Added
epistemics Added
generic-inhand-left Added
generic-inhand-right Added
generic-open Added
generic Added
logistics-inhand-left Added
logistics-inhand-right Added
logistics-open Added
logistics Added
medical-inhand-left Added
medical-inhand-right Added
medical-open Added
medical Added
security-inhand-left Added
security-inhand-right Added
security-open Added
security Added
service-inhand-left Added
service-inhand-right Added
service-open Added
service Added
syndicate-inhand-left Added
syndicate-inhand-right Added
syndicate-open Added
syndicate Added

@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 19, 2024

I guess the departmental lunchboxes dont really have a purpose right now, but whenever Sloth is done with loadouts upstream it'll be a nice downstream addition

@DebugOk DebugOk merged commit 9ad761a into DeltaV-Station:master Mar 19, 2024
13 checks passed
@DebugOk DebugOk deleted the 2024/03/19-Lunchboxes branch March 19, 2024 11:40
VMSolidus pushed a commit to Simple-Station/Einstein-Engines that referenced this pull request Apr 8, 2024
## 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]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
…V-Station#1052)

# Description

Bluespace crystals would turn into ore when ejected from autolathe, lead
me down a rabbit hole of issues with them.

- fixes above mentioned 
- normality crystals dont appear as bluespace when inserted into lathes
anymore
- adds textures for ores and crystals (grey cuz its "normal" duh)
- fixes glimmer drain using a DIFFERENT normality crystal that was made
with chems
- the old chem version now gives new normality crystals
- add crafting recipes for bluespace parts (fixes not being able to
reverse engineer them)

Fixes DeltaV-Station#980 

---

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/4464948b-edbe-4b8b-93ad-21aae192b2aa)


</p>
</details>

---

# Changelog

:cl:
- fix: Bluespace crystals now properly eject from lathes.
- fix: Bluespace parts can be reverse engineered.

---------

Signed-off-by: Aiden <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants