Upstream sync #545
Merged
Upstream sync #545
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
change popentity to popupclient
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Little disk printer sprite tweaks * ill change this aswell
* Delete Resources/Textures/Decals/bricktile.rsi/white_box.png * Readded fixed version one pixel change
fix: LGBT erasure /j
* Moved is canInsert check to before miss check * Update Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Cleaned up YAML issues in animals.yml * Cleaned up TimedSpawnerComponent
Co-authored-by: deltanedas <@deltanedas:kde.org>
Random wire cutting on round start
Fix Mail Unit
Co-authored-by: poeMota <[email protected]>
Co-authored-by: lzk <[email protected]>
* Adds the option for you to toggle your OOC Patron color visibility to yourself and others. * Makes the button magically disappear if you arent a patron
…r (#26708) Fix bug and formatting
Make zombie fix
* Suit sensors now know the 'total health' of an entity * Missed the constructor 😔
fix Co-authored-by: GeneralGaws <[email protected]>
Quick tweak to make ducks on par with chickens at cargo
Update snacks.yml
* StatusIcon: add field to set if icon should be rendered with shading * set/unset shader based on icon field * set new field to true for hud icons * re-shade health bars
Does-The-Fix Co-authored-by: Mephisto72 <[email protected]>
* Make practice weapon damage consistent to 1 * Add book reference to description
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.
No description provided.