[MIRROR] Fixes standard RPEDs not working on machines #2839
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
* Fixes standard RPEDs not working on machines (#82528) ## About The Pull Request Previously, `exchange_parts(...)` would cancel if both the `NO_DECONSTRUCTION` flag was set and you couldn't use your part replacer from a distance. https://github.com/tgstation/tgstation/blob/1583cf0cc968cd9f5da2398035feb8d70d58bcf2/code/game/machinery/_machinery.dm#L958-L959 Our recent removal of `NO_DECONSTRUCTION`, however, has left this to _only_ be the latter. https://github.com/tgstation/tgstation/blob/f0ed4ba4ce6b114509c10ee2f36ab0af6d7c81d2/code/game/machinery/_machinery.dm#L956-L957 Buuuuut this makes it unconditionally cancel for normal RPEDs, instead of only blocking them if `NO_DECONSTRUCTION` was set. As `NO_DECONSTRUCTION` is very much no longer relevant for this purpose, we simply remove the ranged RPED check altogether. This fixes our issue. ## Why It's Good For The Game Fixes #82525. ## Changelog :cl: fix: Standard RPEDs work on machines again. /:cl: * Fixes standard RPEDs not working on machines --------- Co-authored-by: _0Steven <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Apr 11, 2024
Iajret
pushed a commit
that referenced
this pull request
Jun 5, 2024
…GNORE] (#2839) * Updates wendigo, adamantine and berserker armor icons (#83677) ## About The Pull Request Turns out people don't like DOOM or the armor packaged within, so here's trying to resprite the berserker, adamsuit and wendigo armor on their own, maybe the DOOM armor could be a armorless costume in the costume vendor later on. ## Why It's Good For The Game Better, newer icons, now excluding the unpopular DOOM armor.  ## Changelog :cl: image: New icons for berserker, godslayer and adamantine armor. Removes the old icons. /:cl: * Updates wendigo, adamantine and berserker armor icons --------- Co-authored-by: githubuser4141 <[email protected]> Co-authored-by: NovaBot13 <[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 Nova: NovaSector/NovaSector#1919
Original PR: tgstation/tgstation#82528
About The Pull Request
Previously,
exchange_parts(...)would cancel if both theNO_DECONSTRUCTIONflag was set and you couldn't use your part replacer from a distance.https://github.com/tgstation/tgstation/blob/1583cf0cc968cd9f5da2398035feb8d70d58bcf2/code/game/machinery/_machinery.dm#L958-L959
Our recent removal of
NO_DECONSTRUCTION, however, has left this to only be the latter.https://github.com/tgstation/tgstation/blob/f0ed4ba4ce6b114509c10ee2f36ab0af6d7c81d2/code/game/machinery/_machinery.dm#L956-L957
Buuuuut this makes it unconditionally cancel for normal RPEDs, instead of only blocking them if
NO_DECONSTRUCTIONwas set.As
NO_DECONSTRUCTIONis very much no longer relevant for this purpose, we simply remove the ranged RPED check altogether.This fixes our issue.
Why It's Good For The Game
Fixes #82525.
Changelog
🆑 00-Steven
fix: Standard RPEDs work on machines again.
/:cl: