[нужна помощь] апстрим #171
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
* Give silicons proper lobby/character editor previews No more naked dummies, properly show a borg/AI sprite now. This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined. Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad. * Update Content.Shared/Roles/JobPrototype.cs * Update Content.Client/Lobby/LobbyUIController.cs * Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml --------- Co-authored-by: slarticodefast <[email protected]>
This reverts commit f27fa1e.
These were coded to only listen to InteractHand, which doesn't follow our interaction model properly.
…oor, force detective to have a selected outerclothing like all other sec roles (#33765) fix detective vox spawning with their outer clothing on the floor
* fix gas pipe unanchoring * remove unneeded update * revert popup change
* max duration * comment
* Popup when being pulled * Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs Co-authored-by: MilenVolf <[email protected]> * Update Resources/Locale/en-US/movement/pulling.ftl Co-authored-by: MilenVolf <[email protected]> --------- Co-authored-by: MilenVolf <[email protected]>
* Fix disposals. * Rename properly --------- Co-authored-by: sleepyyapril <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>
…3348) * Adds an introductory message to the user-facing ahelp chat window * Update Resources/Locale/en-US/administration/bwoink.ftl * Update Resources/Locale/en-US/administration/bwoink.ftl --------- Co-authored-by: chromiumboy <[email protected]>
Pettable AI core
* does everything * beer flavor revert and linter fix * Update Resources/Locale/en-US/flavors/flavor-profiles.ftl Co-authored-by: Thomas <[email protected]> * fix misspelling * fix yet another misspelling Co-authored-by: Thomas <[email protected]> * english has weird spellings huh * im starting to feel ashamed of myself * this is shameful --------- Co-authored-by: Thomas <[email protected]>
SMES now has wirepanels visuals
Construction always grants a blank newline even if it not currently constructing.
Added a generic anchor visuals enum
fix greytide virus hitting other maps
Co-authored-by: Velcroboy <[email protected]>
* Content changes for engine toolshed PR * add contains command * more permissive commands
* add tape recorder * add filled tape recorder to trinkets **
upstream merge 21/12
* morty plushie :3 * Morty Plushie fixed real * Update toys.yml Fixed but for realer this time Signed-off-by: juniwoofs <[email protected]> * Update toys.yml Signed-off-by: juniwoofs <[email protected]> * fixedbutforrealipromise * fixedbutforrealrealrealtrustme * jessiepleaseworkjessie * waitwasthisthefix * imhonestlyembarassed --------- Signed-off-by: juniwoofs <[email protected]> Co-authored-by: juniwoofs <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>
…to upstream-ops
|
Important Review skippedMore than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review. 211 files out of 294 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits. You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
Signed-off-by: GeneralGaws <[email protected]>
Signed-off-by: GeneralGaws <[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.
О чем PR
Почему
Технические детали
Медиа