Upstream sync - #365
Open
TheShuEd wants to merge 597 commits into
Open
Conversation
put 'command' and 'bridge' chat highlights in quotes
* Popup prediction refactor Co-authored-by: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com> * fix popupcoordinates prediction * review * ProtoMan --------- Co-authored-by: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com>
* Changeling-LastResort-Stasis * Update changeling_catalog.yml * fix * Merge fix * fix * Update ChangelingLastResortSystem.cs * ConfirmableAction * fix 2 * Merge * Update ChangelingLastResortSystem.cs * review * sprite * Update icon.png * fix * NightVision * review * Interaction * review review * misc cleaning - Moved some components around - Lowered price of biodegrade and voice mimic - Updated store locale to make the warning more clear - Unpredicted "Take Over Body" - Made cloning copy over entity descriptions * abstract * fix * stuff * move to API * fix MobLing * review * docs --------- Co-authored-by: ScarKy0 <scarky0@onet.eu>
* Multiply by 1600 * Add admin levels to the shuttle mass variable * Math hard
* Store last player whose mind was in container * Send last player who controlled the entity's session ID along with other quick info * No more spam * Display last player info if there is no active player on entity * Better looking separator * Better looking separator but I didnt forget to ctrl s this time * newline * Address reviews * cleaning * Tiny tweaks --------- Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: Connor Huffine <chuffine@gmail.com>
* Update AdminVerbSystem.Smites.cs * Update GasMinerComponent.cs
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
remove 5 year old unused shitcode Co-authored-by: deltanedas <@deltanedas:goida.zip>
…not deletable (#44558) Fixed character slots over the MaxCharacterSlots cvar being impossible to delete directly. Also added a check that should prevent a deletion attempt being made on a slot that does not exist.
* Content fix for IPlacementManager engine change * Test after removing Requires from PR description
…ine. (#43725) Centrifuge PestKiller Creates Ethanol, Mercury, and Chlorine
Wait for sync before doing runticks.
* modern * unpredict audio * prediction't
* more modular accesibility options * renaming * whopsy! * yeah im nitpicking this too * Apply suggestions from code review Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…555) make sure they have internals
admin playertab role filter
i love hotfixes
removed backpack straps
* cling * eqwewe * resprite 2 * another resprite * Revert "another resprite" This reverts commit fe61cf99835b59620c94720c1ca9e9b16e2e52c6. * cleanup - Made overlay more red - Made action part of the NightVisionComponent - Default UseDelay - Less flavorful store listing (bc its the store) - Removed unintended changes * Update changeling.yml * fix test --------- Co-authored-by: nomdéraisonnablementlong <you@example.com> Co-authored-by: ScarKy0 <scarky0@onet.eu>
filter gases with 0 moles from logs
* draf * slime time * ddsaasdgatagsde * fix that shit --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
…` (#44486) * Fix items deletion on recycling for entities with `ItemSlotsComponent` * Make it to be dependent on `DestructionEvent` instead * Revert testing changes * Actual proto fix * Fix some other recyclable prototypes with ItemSlots
* Rewrite TryFindRandomTileOnStation * separate tile count from list * fix comment * Unindent, remove bug recovery, treat as a failure
* Prediction * Update * Update * Fix * Rename file * Fix * Update * Fix * cleanup * EntityUid? Source * Revert "EntityUid? Source" This reverts commit c169e1f030b1fced6951b8026dda8f4e01571424. * ftl and fix PVS * Update * review * Update --------- Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
* Fix pipe delay increasing * Mention delay unit * Unused using
* pcmasterrace * RMC screech port + i guess it works more * i made a magic commit that mostly duplicates the flash system but different TM * it just works nya * final touchups * Revert "pcmasterrace" This reverts commit b75e9265610924c3a1a30761e5e050cb6ee63bc8. * there, support for more :godo: * Update Content.Shared/Screech/SharedScreechSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * all feedback except the big one * i lied * mfw code * fix * le shader temp * vfx * Revert "le shader temp" This reverts commit 0180a8c1a6ffe82f0ae8d151c07d0794c3eb4984. * Update Content.Client/Effects/ScreechShockWaveSystem.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Shared/Screech/ScreechShockWaveComponent.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Effects/ScreechShockWaveSystem.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * rwrw * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Shared/Screech/ScreechSystem.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * :godo: * Update Content.Client/Overlays/ScreechShockWaveOverlay.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Update Content.Client/Effects/ScreechShockWaveSystem.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Effects * sexy * lang * scub * nya * e * fixed shader * entity effects * FNAF IS THIS WHERE U WANNA BE??????? * Update Resources/Locale/en-US/screech/screech.ftl Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * Update Content.Shared/Screech/NoiseProtection.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * weeeee * scar whyyyyy * Update Content.Shared/Screech/ScreechSystem.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * Update Content.Shared/Screech/ScreechSystem.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * Update Content.Shared/Screech/ScreechSystem.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * e * they've got allen wrenches gerbil feeders toilet seat electric heaters * cleanup * datafield ig * Revert "datafield ig" This reverts commit dd0d9421452f156b0b1ebc527ac9b142d657ae50. * comments --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: nomdéraisonnablementlong <you@example.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: ScarKy0 <scarky0@onet.eu>
* Recyclers: spill without valid solutions * Early return on empty
Improve gib code doc
* Add sharpness graphics option * Percentage display
* boom TODO: - actual organs * silly! silly! silly! silly! * consentual murder * cleaning * how woke * fuck everything * remove organ replacement, do metabolizer instead * oops * thank you, comment i left for myself! * no ammonia immunity * whitespace * Handle a few small things myself Signed-off-by: Connor Huffine <chuffine@gmail.com> * some requested changes * Remove TryGib and Friends Signed-off-by: Connor Huffine <chuffine@gmail.com> * Make changelings indestructible Signed-off-by: Connor Huffine <chuffine@gmail.com> * Recycler Signed-off-by: Connor Huffine <chuffine@gmail.com> * Fix recycler * Add comments * Opps! * Remove metabolizer * Opps metabolizer system and remove systems! * Forgot to add them... * typo Co-authored-by: SnappingOpossum <snappingopossum@outlook.com> * Renamed component, fix various systems * stuff --------- Signed-off-by: Connor Huffine <chuffine@gmail.com> Co-authored-by: Connor Huffine <chuffine@gmail.com> Co-authored-by: beck-thompson <beck314159@hotmail.com> Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
e Co-authored-by: deltanedas <@deltanedas:goida.zip>
… actions (#44680) * Add components to require uncovered mouth and specific mob states for actions * Address reviews * address reviews * added comments --------- Co-authored-by: Velken <8467292+Velken@users.noreply.github.com>
* Manual changelog update 2 * Update * Update * Update * Changelog update * Fix * Remove reverted PR from changelog & update rest * Update * Update * Update * update * updat * update * update
…ching the windoor (#44081) * fix the thing to be good :) * Review changes * The curse of doing review comments in order
* increase afk time limit * Update Content.Shared/CCVar/CCVars.Misc.cs Co-authored-by: Connor Huffine <chuffine@gmail.com> --------- Co-authored-by: Connor Huffine <chuffine@gmail.com>
* Revert "Add Friendly and Hostile Slime Reactions. (#36673)" This reverts commit 1fa46dc. * remove changleogs
tesafdfsafsafasfsa
Contributor
github-actions
Bot
added
Sprites
C#
YML
Mapping
Audio
Shaders
UI
zLevels
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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.
About the PR
Стоило мне только починить падающие тесты