June 2024 Upstream Merge #1536
Merged
June 2024 Upstream Merge #1536
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
…instead of the eye's (#29012)
* hell 💀 * you're right i'm dumb * use the beautiful protoid and or in localization 🥩 * 🙏
* Update ClothingSystem.cs * did it in a better way * Update ClothingSystem.cs
* Adds New Shoes to Sec loadouts * Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
…#29064) change they're to their
Co-authored-by: PJBot <[email protected]>
* Remove Explosive Component from ClothingShoesBootsMagSyndie * Makes BaseJetpack a parent of ClothingShoesBootsMagSyndie * fix boots in hand looking like jetpack bug * make syndicate magboots child of magboots
…chines: Fixes #28997 (#29071) add CAPITALIZE()
* Fix magboots not needing a grid to work * ok fix it for realsies
* substation * apcs * top pixels * new screens
* Add cvar to disable ghosting killing your crit mob * Update Content.Shared/CCVar/CCVars.cs Co-authored-by: ShadowCommander <[email protected]> --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ShadowCommander <[email protected]>
* add mechanotoxin * make tarantulas use mechanotoxin * trolled --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Musician Instruments to Musician lodouts * Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory * Whoops, I removed bagpipes for some reason
* FactionClothing * swtich carp to the Dragon faction * add carp hardsuit * add carp hardsuit to uplink * fixes * webedit ops 1 * why did i name it that wtf * among --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
|
For the love of god pass tests |
|
Submodule update in pr found (pull_request)? |
|
Merge time |
|
Oh boy.. |
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.
About the PR
Merges against space-wizards' space-station-14 after #29100 (updating RobustToolbox to 226.0.0).
Why / Balance
It is time.
How to test
Very carefully.
Media
Breaking changes
Everything.
Changelog
Nope.