Catch-Up Cherry Pick 2 #944
Merged
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
…m Glass Shards (#26764) * Hardsuits and softsuits count as having shoes for step triggers * Add softsuit tag prototype * Change to suitEVA tag * Get rid of softsuit tag, found suitEVA tag * Full pass of ShoesRequiredStepTriggerImmune * Adds check to outerClothing for ShoesRequiredStepTriggerImmune * return * fuck Dionas * Convert to comp, space dragons immune as well * Merge conflict * Merge conflict * fix leftover tags * empty spaces * turns out the dragon didn't need it * minor optimization * Add access for system, add comp to baseShoes, check slotflags for every slot besides pockets * fix * fuck it we ball --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 0efcd30ac6d58fe0a24565c3ddd102277997fbba)
Update bow.yml (cherry picked from commit 1efdf4a40a434e52a7c909e496c0675fef406ee4)
(cherry picked from commit f3e9db014194d7517bb1ae1188c71553bb49b893)
* WIP * sprites n stuff * flavour * maybe fix * add stack * fix parent (cherry picked from commit 008935f6ec6f9cd5c56e943a5ce02c1f54cec893)
(cherry picked from commit 2135cbdb23ccd73236a008512ae6d788c88f206b)
Make smile grabbable like geras Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 4416a21dd529768472de7f0f76a78a5b39f39b24)
Fix doubled message Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 405e020bfa1d5990b86a7dfa69d0f70711d54a0d)
…7446) innital commit (cherry picked from commit cdd900cef65cda204c34a00d7309656e10bb2d09)
(cherry picked from commit a466b35b275c48294cb465aa7c9ca50b7b4ea75f)
(cherry picked from commit 1eb81427d38ffd063f823df01853f5e8a1584a0d)
Give more items a PhysicalComposition for recycling (cherry picked from commit 5118865d475ee329ea75e4e754d27597ac82edd6)
the meat and potatoes yup (cherry picked from commit 33e1752a49ebaad3552385ddcf4f299a1040289b)
* weh. * get the weh out of my repository * add best lizard figurine * remove umbra stuff from master * sprite time!! * revert stuff? * newer spritesss (cherry picked from commit 9cb3287de4225eda4debca77c37fdb6602dad5ad)
* rainbow weed * Lipolicide * psicodine + mannitol * happiness * ground + dried + smokables * damn you notepad++ * fix WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!! * work * work i beg you * recipe good * possibly fix merge conflict * remove reagents (cherry picked from commit cd90c05ce58d0b8ce48c3ea4fcf960ecc89b88ae)
* ActivatableUI tweaks * EntGotRemovedFromContainerMessage * A (cherry picked from commit 7c7d8eb645010f02faccd6394f1229ce130e81dc)
* Fixing mistakes * How did I make the same mistake twice --------- Co-authored-by: Kara <[email protected]> (cherry picked from commit eb41f1da5fd6cf5aec3e596dd1b6f381e037836c)
* borg law 2 explode * attributions fix + CL fix * please dear god work i beg you * maybe this will work :godo: * 50% off deal + disc change * absolving merge conflict * merge conflict fix * Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml * Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml * Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml * Apply suggestions from code review --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Kara <[email protected]> (cherry picked from commit 8afae8a1f14d0f935b25470ece5a38e6ddeaa6ac)
* Update PR Labeler to v5 * Change conflict labeler. * Implement draft filtering functionality * Actually, pull_request_target is appropriate here. (cherry picked from commit aab103865e006abe9c4117436d705ad697553eba)
* Add more telecomms variations * fox :fox: * oops (cherry picked from commit eb9ee4541f5cd03a41c9f0878bacb5e6b58736f0)
* Tippy is BACK * Clean up clippy from aprils fools * Changed names from clippy to tippy, added localization, removed local_clippy command, made it easier to target a specific player * Rename clippy.yml to tippy.yml --------- Co-authored-by: Kara <[email protected]> (cherry picked from commit 373c368b94de808ff8da1f9956b489daecee64d8)
* Basic emote radial menu * Move out from corvax * Move to UI controller & add to top menu bar and key bind * Make emote play * Add name localization for emotes * Localize chat messages * Fix emote menu * Add categories localization * Fixes * Fix * Add emotes entity blacklist * Fix entity whitelist required all logic * Remove unused wagging emote * Revert sprite * Set default texture for emote icon * Update Resources/keybinds.yml --------- Co-authored-by: Kara <[email protected]> (cherry picked from commit 16b3e2233a43ce5130d000f5ac7a57d9d2509cdd)
* New borg sounds * Add manic laughter of an assault borg Never wanted, but needed * Fix wrong attribution * Some requested changes * Change borgwalk sounds * Forgor (cherry picked from commit 7ee18433c8936dd053a1f9dad652c3d2a0d2cb30)
(cherry picked from commit 199e05fb341a68ea1cf499f9e3c35b6c0cd5e22f)
Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 7dae58c9f84e3ebaeaebaa09e51626f35675e55d)
(cherry picked from commit 6471f55a49c2548e437a1a101f92c3416c676893)
How does that UISystemDependency not crash. (cherry picked from commit 6d619c942071390243d101d02f492ae038152305)
* Content changes for engine exception tolerance PR * Poke tests (cherry picked from commit 3c154abb5bd9a1e21e3d2f3efb61c338bb6cd608)
(cherry picked from commit 569253940ff12a827f30062399b3c0475dc25b50)
(cherry picked from commit e2087115af9a5d4a2062fd640886dfcee9e5814e)
* Fix snappop Bunch of stuff slipped through. * name (cherry picked from commit 386454706b71bd047dc14abd869b9c0dea2a8e18)
This reverts commit 5bb5f0a.
* Resolve all non-obsoleting warnings in content * Update ClientGameTicker.cs * Update SkeletonAccentSystem.cs * Update BwoinkSystem.cs
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FoxxoTrystan
approved these changes
Oct 14, 2024
|
This was the only bug I could find that wasn't pre-existing. |
|
Fuck it let's go. |
SimpleStation14
added a commit
that referenced
this pull request
Oct 14, 2024
VMSolidus
pushed a commit
that referenced
this pull request
Oct 25, 2024
# Description It was missing from the #944 for some reasons. # Changelog :cl: - fix: Added missing deflect alert locale. Signed-off-by: Remuchi <[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.
Description
Picked 400 commits (and skipped many, many more) from WizDen since #540.
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor).
TODO
Changelog
🆑