[MIRROR] Alt click no longer conflicts with mech suit [no gbp] #2984
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
Alt click no longer conflicts with mech suit [no gbp] Co-authored-by: Jeremiah <[email protected]> Co-authored-by: Bloop <[email protected]>
Steals-The-PRs
added
Mirroring conflict
…into upstream-mirror-2093
AnywayFarus
added a commit
that referenced
this pull request
Apr 20, 2024
Iajret
pushed a commit
that referenced
this pull request
Jul 15, 2024
… handful of items to start) [MDB IGNORE] (#2984) * Adds Character Loadout Tab to preferences (with just a small handful of items to start) * Making a few initial edits trying to start fixing things around * Gets rid of all of the merge conflicts * Now it all compiles, I doubt it all works yet though. * Adds abstract_type to a bunch of donator loadout_item subtypes * Adds missing loadout categories * Actually makes the loadout possibly work??? * Fixes two small bugs I quickly noticed * Every item can now be renamed * Removes a bunch of duplicate loadout entries * Fixes another duplicate entry * Loadout pull from the right list again * Adds handling for setting item descriptions, with some groundworks for additional item restrictions * Fixes more missing abstract_types * Migrates loadout_list preference to /datum/preference/loadout * Moves the population of loadout_list to preferences migration (gonna remove it entirely later) * Sorts the loadout tabs better, gives some of them better icons too * Removes the loadout dupes unit test, as loadout dupes are no longer allowed * Preemptively fixing a merge conflict * Shrinks down a few additional_displayed_text values * No longer displays Renamable, as everything can be renamed * Makes sure that the disable_erp_preferences config is respected when building loadout item lists * Displays more info about an item's restriction, hides donator/veteran-only & ckey-whitelisted items from players that can't use them * Fixes assistants getting a gray jumpsuit in the prefs menu when they have a loadout undersuit * Removes the deprecated Show Loadout Menu button * Updates the visuals of the loadout items so that they have a better display for restrictions * Increases the max amount of pocket items back to 3 * This just broke shit, I don't know why I added it, it was technically already working * This should actually make it work properly (will need to add `force = TRUE` later once the bug in the loadout_item's qdel() is fixed) * Actually makes sure that the loadout is properly saved and not reset when you're on a new character (hopefully) * Temporary fix so that renaming/changing the description for a loadout item actually updates the UI to show that there's a custom name/description set * Trying to update Alternate Tests' version, to hopefully allow it to pass * Okay, maybe 31? * 1632, then? * I'll keep going until this passes * Still going up * Update loadout_datum_inhands.dm * It better work now, otherwise I'm really lost as to what's not working * Fixes ckey-locked donator items not always being sanitized with ckey() --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Bloop <[email protected]>
Iajret
added a commit
that referenced
this pull request
Jul 16, 2024
… handful of items to start) (#4494) * [MIRROR] Adds Character Loadout Tab to preferences (with just a small handful of items to start) [MDB IGNORE] (#2984) * Adds Character Loadout Tab to preferences (with just a small handful of items to start) * Making a few initial edits trying to start fixing things around * Gets rid of all of the merge conflicts * Now it all compiles, I doubt it all works yet though. * Adds abstract_type to a bunch of donator loadout_item subtypes * Adds missing loadout categories * Actually makes the loadout possibly work??? * Fixes two small bugs I quickly noticed * Every item can now be renamed * Removes a bunch of duplicate loadout entries * Fixes another duplicate entry * Loadout pull from the right list again * Adds handling for setting item descriptions, with some groundworks for additional item restrictions * Fixes more missing abstract_types * Migrates loadout_list preference to /datum/preference/loadout * Moves the population of loadout_list to preferences migration (gonna remove it entirely later) * Sorts the loadout tabs better, gives some of them better icons too * Removes the loadout dupes unit test, as loadout dupes are no longer allowed * Preemptively fixing a merge conflict * Shrinks down a few additional_displayed_text values * No longer displays Renamable, as everything can be renamed * Makes sure that the disable_erp_preferences config is respected when building loadout item lists * Displays more info about an item's restriction, hides donator/veteran-only & ckey-whitelisted items from players that can't use them * Fixes assistants getting a gray jumpsuit in the prefs menu when they have a loadout undersuit * Removes the deprecated Show Loadout Menu button * Updates the visuals of the loadout items so that they have a better display for restrictions * Increases the max amount of pocket items back to 3 * This just broke shit, I don't know why I added it, it was technically already working * This should actually make it work properly (will need to add `force = TRUE` later once the bug in the loadout_item's qdel() is fixed) * Actually makes sure that the loadout is properly saved and not reset when you're on a new character (hopefully) * Temporary fix so that renaming/changing the description for a loadout item actually updates the UI to show that there's a custom name/description set * Trying to update Alternate Tests' version, to hopefully allow it to pass * Okay, maybe 31? * 1632, then? * I'll keep going until this passes * Still going up * Update loadout_datum_inhands.dm * It better work now, otherwise I'm really lost as to what's not working * Fixes ckey-locked donator items not always being sanitized with ckey() --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Bloop <[email protected]> * conflict resolve * erm, yea * Update _quirk.dm * actually removes pride pins --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: MrMelbert <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Bloop <[email protected]> Co-authored-by: Iajret <[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#2093
Original PR: tgstation/tgstation#82758
About The Pull Request
Get in the gundam shinji!!!
Context: Mech users hold ALT to disable strafe, which would trigger the lootpanel to come up while committing war crimes (annoying!)
This prevents the panel from appearing and fixes the previous behavior, meaning you can alt click your own mech to disable strafing.
It also makes toggling strafe a balloon alert with sound. Parties for all occupants!!
Why It's Good For The Game
Fixes #82753
Changelog
🆑 jlsnow301
fix: Mecha pilots are no longer bothered by incessant loot panels while holding ALT for strafe disable.
/:cl: