Upstream sync #2885
Merged
Upstream sync #2885
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
* Added evac shuttle and fixed various issues brought up during playtests * Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
* vox guidebook regen update * damage number * skreee
Update DungeonJob.PostGenBiome.cs
…lopers. (#33715) Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: slarticodefast <[email protected]>
* Make unknown shuttle events trigger an announcement * Call base at the end --------- Co-authored-by: Winkarst <[email protected]>
* Predicted gas pumps I wanted to try out atmos and first thing I found. * a * Remove details range
* 圣诞歌曲 * Update Resources/Audio/StationEvents/attributions.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
Added more holiday decorations
* Organize Sandbox Panel * Map Editing -> Editing * Unset ToggleMode on Suicide button. Can hardly un-suicide, no? * Remove 'Link machines' button that has done nothing for 3 years * Remember Sandbox window's position instead of forcing to center * Shows Spawns -> Show Spawns * Remove SandboxSystem.MachineLinking
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
… chapelroid (#34044) Increases Marathon cryosleep size, added meteor shielding to chapelroid Co-authored-by: august-sun <[email protected]>
…r devices (#34046) Adds more air alarms and sensors throughout Oasis Co-authored-by: august-sun <[email protected]>
* loadouts update * Update loadout_groups.yml * darts to candles * Update Resources/Prototypes/Loadouts/dummy_entities.yml --------- Co-authored-by: slarticodefast <[email protected]>
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
github-actions
bot
added
S: Needs Review
S: Untriaged
size/XL
Changes: Sprites
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
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений