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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MRE automatic trashing and nade box trashing #6285

Merged
merged 2 commits into from
May 15, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented May 14, 2024

About the pull request

This PR fixes runtimes with MREs if they spawn on someone that doesn't have space for them (causing 2 extra qdels than needed), fixes MREs getting thrown away when you aren't dropping them on the ground, and changes the behavior of nade_box to not automatically qdel when it is emptied but instead now has the same behavior as a MRE without food being dropped on the ground.

Explain why it's good for the game

Fixes
image

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

馃啈 Drathek
add: Nade boxes now have the same throw away logic when dropped to the ground instead of in update_icon when empty.
fix: Fixed MREs getting thrown away if you don't drop them to the ground.
fix: Fixed MREs throwing runtimes if spawned on a person that doesn't have space for the MRE.
/:cl:

Fix mre runtimes if spawned on mob but no space
Add same auto throwaway on dropped signal to grenade box
@github-actions github-actions bot added Feature Feature coder badge Fix Fix one bug, make ten more labels May 14, 2024
@harryob harryob added this pull request to the merge queue May 15, 2024
Merged via the queue into cmss13-devs:master with commit 24c73cb May 15, 2024
29 checks passed
cm13-github added a commit that referenced this pull request May 15, 2024
@Drulikar Drulikar deleted the Fix_Box_Trash branch May 15, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants