2024 02 28 loadouts #7
Merged
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
Sec And Sci Loadouts
# Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
Command, civilian and wildcard loadouts
* Add new fire sprite for mice that fits them better * Add the sprite change to rats as well * Moffroach and hamsters now also have more fitting fire sprites * made the meta.json easier to read
…pace-wizards#26763) Allow walking over glass shards and D4 Co-authored-by: Plykiya <[email protected]>
Removed `Moving` anom behavior
Fix watercooler visuals
Co-authored-by: PJBot <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 22d9524 merging into 02cde4c Resources/Textures/Decals/bricktile.rsi
Resources/Textures/Structures/Machines/tech_disk_printer.rsi
Resources/Textures/Mobs/Effects/onfire.rsi
Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi
Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi
|
Dutch-VanDerLinde
merged commit 343b8e0
into
Dutch-VanDerLinde:syndi-satchel
4 checks passed
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.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog