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

Jump to bottom

Various Lunchboxes #13

Closed
wants to merge 10 commits into from
Closed

Various Lunchboxes #13

wants to merge 10 commits into from

Conversation

DangerRevolution
Copy link
Contributor

@DangerRevolution DangerRevolution commented Mar 17, 2024 •
edited
Loading

About the PR

Adds various lunchboxes & their randomly-filled variants.

Why / Balance

RP - Chef can make meals on-the-go for the Crew
Antags - An inconspicious carrying option

Media

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

image

Changelog
🆑

  • add: Added lunchboxes of various varieties, able to be found in the chef's cutlery vend.

DangerRevolution
DangerRevolution commented Mar 17, 2024
View reviewed changes
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml
sprite: DeltaV/Objects/Storage/Lunchbox/lunchbox_security.rsi
#heldPrefix: box-security

- type: entity

This comment was marked as resolved.

Sign in to view

@DangerRevolution

This comment was marked as resolved.

Sign in to view
@DangerRevolution DangerRevolution changed the title Adds Various Lunchboxes [Port] [Kinda] Adds Various Lunchboxes Mar 17, 2024
@DangerRevolution DangerRevolution marked this pull request as ready for review March 17, 2024 22:48
@DEATHB4DEFEAT
Copy link
Member

[Port] [Kinda]

Is this a port or not? Where is it coming from?

@DangerRevolution
Copy link
Contributor Author

[Port] [Kinda]

Is this a port or not? Where is it coming from?

Delta: DeltaV-Station/Delta-v#716

It was never merged as Debug wanted all the spritesnib one folder and for the life of me I couldn't figure out how to do it, as doing it would break every sprite.

@DEATHB4DEFEAT DEATHB4DEFEAT changed the title [Port] [Kinda] Adds Various Lunchboxes [PORT] Various Lunchboxes Mar 19, 2024
@DangerRevolution DangerRevolution marked this pull request as draft March 19, 2024 11:36
@DangerRevolution
Copy link
Contributor Author

Debug managed to wizard them into one .rsi so just gonna copy it over when it's done :O

@DEATHB4DEFEAT DEATHB4DEFEAT changed the title [PORT] Various Lunchboxes Various Lunchboxes Mar 19, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Type: Port Brings something to here from another codebase labels Mar 19, 2024
@DangerRevolution DangerRevolution marked this pull request as ready for review March 19, 2024 21:12
@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
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 19, 2024 •
edited
Loading

RSI Diff Bot; head commit d3365a1 merging into 9b780cf
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

Edit: diff updated after d3365a1

@DangerRevolution
Copy link
Contributor Author

This should honestly just be merged from Delta's PR's by cherry-picking instead of a copypaste port. Anyways, I want to add the locker changes before this is PR-ed so gonna set this to draft

@DangerRevolution DangerRevolution marked this pull request as draft March 21, 2024 22:54
dasprino007 pushed a commit to dasprino007/Einstein-Engines that referenced this pull request Jul 20, 2024
@VMSolidus
Merge pull request Simple-Station#13 from VMSolidus/re-enable-harpy
ffd4cea 
Re-enable Harpy Species
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
@Fansana
Merge pull request Simple-Station#13 from FoxxoTrystan/Experimental-L…
f146c5d 
…anguages/Markers

Experimental languages/Markers
gluesniffler pushed a commit to gluesniffler/Einstein-Engines that referenced this pull request Oct 13, 2024
@Eagle-0
Merge pull request Simple-Station#13 from Eagle-0/Grabintent
3c9c996 
Grabintent
gluesniffler pushed a commit to gluesniffler/Einstein-Engines that referenced this pull request Oct 13, 2024
@Eagle-0
Revert "Merge pull request Simple-Station#13 from Eagle-0/Grabintent"
e2aa0f0 
This reverts commit 3c9c996, reversing
changes made to eff0a2b.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Type: Port Brings something to here from another codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DangerRevolution @DEATHB4DEFEAT