Upstream sync #1949
Merged
Upstream sync #1949
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
* fix * Remove stripes * empty
made a new nukie song lel.
* Remove unecessary prototypes * Put unecessary prototypes in migration.yml
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons
…en bounds are exceeded (#25939)
* Remove unnecessary datafield names, syringes with stuff in them start in inject mode * No trash tag * Remove ViewVariables since DataField has them implicitly * Revert "No trash tag" This reverts commit 2c42172653d2cc70d58bd5bedf61a880b939bf20. * Get rid of tags entirely for PrefilledSyringes --------- Co-authored-by: Plykiya <[email protected]>
* Add a toggle for progress bar colors * yeah this thing * PJB review * optimization
added winddown to drug effect
* Small obsolete Logger cleanup * Fixed three EntitySystem logs that weren't doing it right.
Thinks there's obstacles when there isn't.
* Fix game.role_timers not effecting the antag menu * Yeah i guess i should
* Prevents FloorOcclusion from breaking rendering * Minor change
Update SharpSystem.cs
The EmergencyAccess bool on the AirlockComponent would not get synced to the client
* Fix shield absorbing asphyxiation damage Shields will no longer reduce damage on their user that they themselves can't absorb. * Update Content.Shared/Blocking/BlockingSystem.User.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Add files via upload * Update rubber_stamp.yml
Co-authored-by: PJBot <[email protected]>
- HideLabel just means it won't have its name / button drawn whereas Hide will block it completely.
* guidebook pages defined * species info button in character profile editor * if current species has no guidebook page then open the parent page * skrek * destroying evidence of secret vox plot * icon size adjustment, no icon if guidebook page for species does not exist * finished pages * additional info * weh
* Security hud shows icon based on criminal record status * Criminal status now linked to name instead of identity * parole loc * Test fix * review changes * Check station records instead of storing names on criminal record consoles. * cleanup * more cleanup * review changes * change outdated comments * rename * review changes * remove event subscription * replaced event with trycomp * default value
buff hydroponics crate Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts: # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit f5e8409 merging into f60a0a2 Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Objects/Misc/stamps.rsi
Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi
Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi
Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi
Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi
Resources/Textures/Interface/Misc/security_icons.rsi
|
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
Медиа
Проверки
Изменения