Update for 6/3/2024 #17
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
This reverts commit 0597405.
Co-authored-by: Danger Revolution! <[email protected]>
…/Einstein-Engines into Psionic-Power-Refactor
…uses to roundstart casters
…n-Engines" This reverts commit 872b301, reversing changes made to 15fc457.
# Description Changed the Canisters Sprites to a better updated one, no more ugly 2D Flat Canisters! Also update the TG Sprite from Tank Canisters now shiny! --- <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog :cl: - tweak: Resprited gas canisters - tweak: Resprited gas tanks --------- Co-authored-by: VMSolidus <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Further expanded Assistant gang colors and added them to loadouts VM is bad at helping so image is in comments --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added five new coats - add: Added loadouts - fix: Fixed the coat handhole --------- Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
This is apparently a more desirable behavior for global.json, as it allows servers running any version of Dotnet 8.0.1xx to automatically switch to a newer version than the base. This update was apparently required for DS14, NS14, and Syndicate Station to work properly, since Linux servers can't actually run 8.0.100, and the earliest they can use is 8.0.105(which is still a viable version).
Nix devShell user only change, this doesn't affect normal building.
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
|
RSI Diff Bot; head commit 8798196 merging into 494c08e Resources/Textures/Clothing/Ears/Headsets/base.rsi
Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi
Resources/Textures/Clothing/Ears/Headsets/cargo.rsi
Resources/Textures/Clothing/Ears/Headsets/centcom.rsi
Resources/Textures/Clothing/Ears/Headsets/command.rsi
Resources/Textures/Clothing/Ears/Headsets/engineering.rsi
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi
Resources/Textures/Clothing/Ears/Headsets/medical.rsi
Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi
Resources/Textures/Clothing/Ears/Headsets/mining.rsi
Resources/Textures/Clothing/Ears/Headsets/robotics.rsi
Resources/Textures/Clothing/Ears/Headsets/science.rsi
Resources/Textures/Clothing/Ears/Headsets/security.rsi
Resources/Textures/Clothing/Ears/Headsets/service.rsi
Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi
Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
Resources/Textures/Decals/bricktile.rsi
Resources/Textures/Decals/minitile.rsi
Resources/Textures/Clothing/Mask/neckgaiterred.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
|
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Edit/Resprite most of the floors in-game because in all honest TG Floors... currently... are extremly flat and old... even TG already has upgraded their floors... This also changed some minor edits to decals to fit, This PR is recomended paired with #402 and others updated looks PRs This bring new floors sprites from baystation, paradise station. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Import Sprites - [x] @VMSolidus Edits --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>      </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - tweak: Floors Looks Updated/Resprited. --------- Co-authored-by: VMSolidus <[email protected]>
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
This pushes several new updates to Supermatter, Psionics, and Loadouts, which will later be upstreamed too. I'm also taking the time to do an upstream merge to get some EE updates too.