Большой апстрим #195
Merged
Большой апстрим #195
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
Co-authored-by: PJBot <[email protected]>
* 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]>
* Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals
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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>
* Major Marathon atmospherics rework * More atmos changes --------- Co-authored-by: dylanstrategie <[email protected]~>
…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]>
add audio label to labeler
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]>
* Fix Meta TEG power issues, give singulo more scaffold, give AI two cams in singulo containment like other stations * remove serialized invalids because it happens to the best of us * properly setup cameras, label substation and atmos APC while I'm here
SMES now has wirepanels visuals
Add myself to CODEOWNERS Basically just added myself where Nik was since I am also doing headmin things.
Co-authored-by: PJBot <[email protected]>
* Allow to paint multiple airlocks * oh right
* Link Core cargo shuttle atmos devices * Remove configurator lines This matches what the DeviceNetworks in core.yml look like now. Hopefully it works?
* bagel update * fixgridatmos * fdsafds
* many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa --------- Co-authored-by: Emisse <[email protected]>
# Conflicts: # .github/CODEOWNERS # .github/labeler.yml # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/Names/arachnid_first.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Datasets/Names/fake_human_first.yml # Resources/Prototypes/Datasets/Names/fake_human_last.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Datasets/Names/vox.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Mobs/Vox.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
…-sync Upstream sync
FireNameFN
requested review from
Vonsant and
Tornado-Technology
as code owners
github-actions
bot
added
S: Needs Review
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.
Смотрим тесты.