[MIRROR] Cups end their attack chain early when attacked with specific items #1030
Conversation
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
…c items [MDB IGNORE] (#25495) * Cups end their attack chain early when attacked with specific items (#80140) ## About The Pull Request - Fixes #80132 The problem lies in `/obj/item/reagent_containers/cup/attackby()` proc. We want this to return TRUE when dealing with specific items(like eggs, fire extinguishers) so that the attack chain ends early and subtypes like the soup pot has the correct behaviour ## Changelog :cl: fix: Eggs don't leave behind their shells when cracked into a soup pot. Cups end their attack chain early when dealing with specific items /:cl: * Cups end their attack chain early when attacked with specific items --------- Co-authored-by: SyncIt21 <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Dec 9, 2023
Iajret
pushed a commit
that referenced
this pull request
Feb 18, 2024
* BBQ ribs can be grilled & adds qdel checks for grills (#81536) ## About The Pull Request - Fixes #81511. BBQ ribs can be grilled again and takes anywhere between 30 to 40 seconds to get proper grilled ribs or turn into a mouldy mess. 20 seconds would only yield lightly grilled ribs and that's not good. - Grill checks if the item got deleted to avoid runtimes. Also cook time is set based on the individual items type & not a constant of 20 seconds ## Changelog :cl: fix: Grill checks if the item got deleted to avoid runtimes. Also cook time is set based on the individual items type & not a constant of 20 seconds fix: BBQ ribs can be grilled on a grill but now takes anywhere between 30 to 40 seconds to get proper smoked ribs and not lightly smoked ribs or turn into a mouldy mess on a girddle. Delicious. /:cl: --------- Co-authored-by: jimmyl <[email protected]> * BBQ ribs can be grilled & adds qdel checks for grills --------- Co-authored-by: SyncIt21 <[email protected]> Co-authored-by: jimmyl <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25495
Original PR: tgstation/tgstation#80140
About The Pull Request
The problem lies in
/obj/item/reagent_containers/cup/attackby()proc. We want this to return TRUE when dealing with specific items(like eggs, fire extinguishers) so that the attack chain ends early and subtypes like the soup pot has the correct behaviourChangelog
🆑 SyncIt21
fix: Eggs don't leave behind their shells when cracked into a soup pot. Cups end their attack chain early when dealing with specific items
/:cl: