Upstream sync #1893
Merged
Upstream sync #1893
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
* saving working code * add checks for deletion
* Make even more items good looking in inventory * holoprojecrots
Large Wood Floors
* predict doors and airlocks * prying, too * ack * eek
Break up Opened/Closed and fill level onto separate lines
* make galoshes obtainable and slowing you * Update specific.yml
* Fix formatting problem with FullOpened * Moved to Shared and networked * Revert "Fix formatting problem with FullOpened" This reverts commit f8353403da830a4402bdd457bcf24a2432a5f566.
* Create ratvar.yml * restore balance to the universe * scale issues mfw nar-sie is smaller * spawner + spawn anim a shitty spawn anim is better than no spawn anim * undenseify no longer as dense as a dying neutron star
Just unlocks new language features like primary constructors.
* Make department / job list sorting consistent. This makes late join, crew manifest and character profile all apply consistent sorting for jobs and departments. We use the already-defined weights for departments (so command, then sec, then station specific, then just sort by prototype ID). Jobs also use weight (so heads are always at the top) then prototype ID, then character name (for manifest). Removed the crewmanifest.ordering CVar as doing it via prototype weight is just easier, and that CVar was already a mess anyways. * Fix jittery job icons in lists. They were set to KeepCentered in TextureRect. This has issues because the allocated space is actually an odd number of pixels, so it tries to position the draw at a half pixel offset. Now, yes, fixing this in TextureRect would make much more sense, but get off my back. (Ok seriously we need better helper functions for doing that in the engine. Don't wanna deal with that right now and I already have this patch made.) Instead I'm just gonna fix the issue by using VerticalAlignment in all these places instead which ends up doing exactly the same thing YIPPEE. Also gave a margin next to the icon on the crew manifest. Margins people!
fuel count
ChunkSize is still 32 so doesn't cut down on heaps of decals atm though we avoid passing many decals to drawing with the coordinates bounds check now.
Update attributions.yml
… anyway (#25496) * God dammit pjb * Smol cleanup
minor locale fix
Update food-component.ftl why was I the only one that noticed it
Co-authored-by: PJBot <[email protected]>
Turns out this is not what serverid was for... i guess you can find server familys with this so im not gonna remove it. Best we get for server name is the admin logs server name.
* Panic bunker fix I admin * tired
* Implemented contents display for dispenser UI * Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs Co-authored-by: Nemanja <[email protected]> * Resolve the netent into a euid first --------- Co-authored-by: Nemanja <[email protected]>
OnPiecePressed
* add * thin spaces * update
* add missing spacepen poster adds missing spacepen poster * Update meta.json --------- Co-authored-by: Ed <[email protected]>
* Update kudzu.yml * Update living_light.yml * files * Update flora.yml * Update kudzu.yml * bul * Update kudzu.yml * Update living_light.yml * bullet immune
Validate that job and antag prototypes can actually be set in character profiles, rather than just checking if the prototype exists. Make preferences system just call existing validation code when loading prototype from database, instead of some hacked-together stuff. Also I made the character profile validation logic take dependencies in via parameter because fuck resolves.
Everything can read (kinda)
* Initial commit * Remove damage from cuffs entirely * Changed from Action uncuffing cooldown to UseDelay cooldown * Minor merge conflict fix * Edit the actual correct line * Submodule fix
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
Injector status UI cached values Co-authored-by: Plykiya <[email protected]>
# Conflicts: # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # SpaceStation14.sln
github-actions
bot
added
Status: 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.
Описание PR
Медиа
Проверки
Изменения