forked from space-wizards/space-station-14
-
-
Notifications
You must be signed in to change notification settings - Fork 74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream merge #295
Merged
Merged
Upstream merge #295
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
Fix vox box on bagel
This uses multiple API requests to directly send the publish to the CDN server, no more GitHub artifacts. Faster, less moving parts. Needs Robust.Cdn 2.2.0
changes missing ghost-role-information-rules-default-silicon to ghost-role-information-silicon-rules
Bugfix: Add 5 milk to cake batter recipe in the guidebook to correctly reflect new recipe
* Wires ui tooltip localization * Corrections after review
nerds only please
Cooldown localization
* add interaction success/failure events * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
…s#29998) * Add failing unbuckle InteractHand test * Skip trybuckle if strap doesn't have space * Unbuckle others not just user * Fix test failing due to delay * Change to raise event instead of calling OnInteractHand * Add test for buckle and unbuckle on InteractHand * Add tick delay * Remove unneeded tick delay and clean up * Comment code * Cleanup * Swap to fastest checks first * Fix reading empty sequence when there are no buckled entities
* Add a method to get the first available ItemSlot * Make TryInsertEmpty use TryGetAvailableSlot * Add param doc comments
* let FlashArea be called from shared * untroll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]>
* move component to shared * add fake systems * update server explosion system and remove duplicate transform query --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Update GivePrototype * File scoped namespace * Change to EntProtoId instead of ProtoId<> for better validation
…zards#31158) * Initial commit * review fix
* Make fire leave burnt decals on the tiles * License * Yes * Update * Spelling error * Prototypes reload support * To array
…ace-wizards#31501) * adds coord label beneath iff label * fixed wrong coordinate system being used * changes the clamping on the label UI to instead normalise the UI's distance vector from the centre of the screen, fixes corner-hugging * cleaned up if-statement by moving the calc ahead of it * fixed clamping, fixed parenting issue, added draw cull on coord label --------- Co-authored-by: archrbx <[email protected]>
…s#29972) * TEG now checks for power supply before checking for IsFullyBuilt * Update Content.Server/Power/Generation/Teg/TegSystem.cs Co-authored-by: ShadowCommander <[email protected]> --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ShadowCommander <[email protected]>
* clean up solution regen and drain comps * Tape applied. * Update Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs Co-authored-by: Tayrtahn <[email protected]> * remain entity * That has to be a rogue test fail. --------- Co-authored-by: Tayrtahn <[email protected]>
…ards#28766) * Make status effect networking not use `TryAddStatusEffect` * a
…e-wizards#28384) * Move placeable check to PlaceableSurfaceSystem This check stops entities from being inserted into a storage entity when it has a PlaceableSurfaceComponent. The entity is instead placed on top of the entity like a table. * Move SetPlaceable to PlaceableSurfaceSystem * Update to transform system and consolidate code * Fix interaction with storage that has a placeable component * deadlock --------- Co-authored-by: metalgearsloth <[email protected]>
* Back in the saddle again! <(8o) * if you like my STYLE you should see my SHEETS ;-) * stylesheet change works for ItemStatusNotHeld but broken for ItemStatus. Just using xaml for now. * teehee * beeg --------- Co-authored-by: metalgearsloth <[email protected]>
* Filter Set Outfit menu to exclude loadout sets * Apply loadouts to job outfits * Use appropriate species for Urists * squishy --------- Co-authored-by: metalgearsloth <[email protected]>
* WantedListCartridge has been added * WantedListCartridge user interface works * WantedListCartridge is added as standard in some PDAs * The CriminalRecordsSystem can now also take into account who created the record * Added offense history table * Fix of missing loaderUid for a cartridge without installing the program * Added personalized information about the target * The crime history has been finalized * Added StatusList * The officer's name has been added to the automatic history * WantedListCartridge has been added to the HOS locker * WantedListCartridge has been removed from brigmedic's preset programs * The StealConditionSystem now takes into account whether a cartridge is inserted or installed * Added target to thief on WantedListCartridge * Merge fix * Removing copypaste * Fix merge 2 * The sprite of WantedListCartridge has been changed * Update pda.yml * Fix scrollbar in the history table * Upstream localization fix * `StatusList` has been replaced by `ListContainer` with `TextureRect` * Margin fix
* crewmon filter * string case matching Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
Want to run test suite |
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.
surely I get it this time
note: this changes publish workflow so we need to edit
Tools/publish_multi_request
and update the CDN immediately after merging this