-
Notifications
You must be signed in to change notification settings - Fork 360
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 21/12 #2496
Merged
Merged
upstream merge 21/12 #2496
+15,602
−3,335
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 <161409025+slarticodefast@users.noreply.github.com>
This reverts commit f27fa1ed30920581c6322d08867cb3334f897589.
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 <63782763+MilenVolf@users.noreply.github.com> * Update Resources/Locale/en-US/movement/pulling.ftl Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> --------- Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
* 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 <50505512+chromiumboy@users.noreply.github.com>
Pettable AI core
* does everything * beer flavor revert and linter fix * Update Resources/Locale/en-US/flavors/flavor-profiles.ftl Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * fix misspelling * fix yet another misspelling Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * english has weird spellings huh * im starting to feel ashamed of myself * this is shameful --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
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 <velcroboy333@hotmail.com>
* Update GasTileOverlayState * Update DecalGridState * Update NavMapState * poke * poke2 * poke3 * Implement field deltas for guns * Content done * Update --------- Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
* Content changes for engine toolshed PR * add contains command * more permissive commands
github-actions
bot
added
S: Needs Review
size/XL
Over 1024 lines
Changes: YML
Changes any yml files
Changes: Map
Changes: UI
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Documentation
Changes any xml or md files
Changes: Sprite
Changes any png or json in an rsi
Changes: Shaders
Changes any swsl shaders
Changes: Audio
Changes any audio files
and removed
S: Needs Review
size/XL
Over 1024 lines
labels
Dec 21, 2024
Direction reviewing, 1-2 days |
Lyndomen
approved these changes
Dec 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good, man o war we're gonna keep an eye on but should be fun. Velcro wants us to keep an eye out for any barricades if bariccades are already mapped over a window, i think the only place that might be the case is pebble engi maints
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Audio
Changes any audio files
Changes: C#
Changes any cs files
Changes: Documentation
Changes any xml or md files
Changes: Localization
Changes any ftl files
Changes: Map
Changes: Shaders
Changes any swsl shaders
Changes: Sprite
Changes any png or json in an rsi
Changes: UI
Changes: YML
Changes any yml files
size/XL
Over 1024 lines
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.
Notable changes
christmas things:
Excluded changes
Changelog
🆑 Santa