Catch-Up Cherry Pick 2#944
Merged
VMSolidus merged 442 commits intoSimple-Station:masterfrom Oct 14, 2024
Merged
Conversation
…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 <plykiya@protonmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 0efcd30)
Update bow.yml (cherry picked from commit 1efdf4a)
(cherry picked from commit f3e9db0)
* WIP * sprites n stuff * flavour * maybe fix * add stack * fix parent (cherry picked from commit 008935f)
(cherry picked from commit 2135cbd)
Make smile grabbable like geras Co-authored-by: Plykiya <plykiya@protonmail.com> (cherry picked from commit 4416a21)
Fix doubled message Co-authored-by: Plykiya <plykiya@protonmail.com> (cherry picked from commit 405e020)
…7446) innital commit (cherry picked from commit cdd900c)
(cherry picked from commit a466b35)
(cherry picked from commit 1eb8142)
Give more items a PhysicalComposition for recycling (cherry picked from commit 5118865)
the meat and potatoes yup (cherry picked from commit 33e1752)
* 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 9cb3287)
* 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 cd90c05)
* ActivatableUI tweaks * EntGotRemovedFromContainerMessage * A (cherry picked from commit 7c7d8eb)
* Fixing mistakes * How did I make the same mistake twice --------- Co-authored-by: Kara <lunarautomaton6@gmail.com> (cherry picked from commit eb41f1d)
* 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 <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> (cherry picked from commit 8afae8a)
* Update PR Labeler to v5 * Change conflict labeler. * Implement draft filtering functionality * Actually, pull_request_target is appropriate here. (cherry picked from commit aab1038)
* Add more telecomms variations * fox :fox: * oops (cherry picked from commit eb9ee45)
* 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 <lunarautomaton6@gmail.com> (cherry picked from commit 373c368)
* 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 <lunarautomaton6@gmail.com> (cherry picked from commit 16b3e22)
* 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 7ee1843)
(cherry picked from commit 199e05f)
Co-authored-by: Plykiya <plykiya@protonmail.com> (cherry picked from commit 7dae58c)
(cherry picked from commit 6471f55)
How does that UISystemDependency not crash. (cherry picked from commit 6d619c9)
* Content changes for engine exception tolerance PR * Poke tests (cherry picked from commit 3c154ab)
(cherry picked from commit 5692539)
(cherry picked from commit e208711)
* Fix snappop Bunch of stuff slipped through. * name (cherry picked from commit 3864547)
This reverts commit 5bb5f0a.
* Resolve all non-obsoleting warnings in content * Update ClientGameTicker.cs * Update SkeletonAccentSystem.cs * Update BwoinkSystem.cs
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
ShadesMars
approved these changes
Oct 14, 2024
Member
|
This was the only bug I could find that wasn't pre-existing. |
Member
|
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 <RemuchiOfficial@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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 332f54a (Lobby Refactor).
TODO
Changelog
🆑