[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag #26743
+1,233
−1,194
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
added 13 commits
September 10, 2024 14:26
Contrabang
requested changes
Sep 10, 2024
ParadiseSS13-Bot
added
the
-Status: Awaiting type assignment
ParadiseSS13-Bot
added
Testmerge Requested
Adrer
commented
Sep 12, 2024
added 5 commits
October 21, 2024 09:56
Contrabang
requested changes
Nov 3, 2024
Co-authored-by: Contrabang <[email protected]> Signed-off-by: Chap <[email protected]>
… into SLOT_FLAG_NONESENSE
Contrabang
approved these changes
Nov 3, 2024
ParadiseSS13-Bot
added
-Status: Awaiting merge
|
Ready for TM |
added 2 commits
November 7, 2024 15:06
ParadiseSS13-Bot
added
the
Testmerge Active
DGamerL
approved these changes
Nov 13, 2024
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.
What Does This PR Do
THIS SHOULD PROBABLY BE TESTMERGED BEFORE BEING FULLY MERGED
This PR consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag, this should make it easier to compare and check inventory flags without needing to perform weird conversions between the two.
Note
In doing this I accidentally fixed the "offear" feature, which would block your second ear slot if you were wearing a bowman headset. For the time being, code relating to this has been commented out. Fixing/removing this will be done in a PR seperate from this one.
Why It's Good For The Game
These flags perform literally the same job, there is no reason for them to be seperated like this. This should make some things at least somewhat easier to do.
Testing
I can equip stuff fine
I can remove stuff just fine
Stripping people and putting stuff on them seems to work still
As far as I can tell nothing is broken but this should still be testmerged for a little bit just in case.
Declaration
Changelog
NPFC