Partial Merge Up to 2024-11-17 #402
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 is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
# Description Does what it says on the can, ports over the updates to the Health Analyzer made in Wizden's [#30834](space-wizards/space-station-14#30834), [#31879](space-wizards/space-station-14#31879), and [#32636](space-wizards/space-station-14#32636) because I need them for newmed Credit to [Floof Fansana#169](Fansana#169) too since I yoinked it due to lazyness--- # Changelog 🆑 Mocho - tweak: Ported over Wizden's updated Health Analyzer UI. --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: goet <[email protected]> Co-authored-by: Saphire Lattice <[email protected]>
# Description Familiars were hilariously overpowered. # Changelog :cl: - fix: Familiars can now be Dispelled. - tweak: Nerfed Remilia to have 30 HP. - tweak: Nerfed Base Familiar to have 50 HP.
# Description Port of Lost-Paradise-Project/Lost-Paradise#288 from Lost Paradise. This feature makes it so that the language you are speaking is shown in chat, preventing any confusion for players about what it is being spoken. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Languages are now shown in chat alongside character names. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Remuchi <[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]? --> minor on the maps rad and gax --- # 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 --> --- <!-- 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: - fix: minor fixes on the maps Rad and Gax, fix te uranium crarte to filled --------- Co-authored-by: VMSolidus <[email protected]>
Simple-Station/Parkstation#48 Simple-Station/Parkstation-Friendly-Chainsaw#2 --------- Co-authored-by: VMSolidus <[email protected]>
# Description Traits Version 2 implements a much needed overhaul of the Trait System, changing it so that it no longer uses hardcoded nullable lists of various entries required for the trait functions, and instead accepts a *single* Modular List of Functions, and then iterates through the list like a set of instructions on how to modify the character. This PR also features a few new Functions, such as AddImplant. Anyway, rather than hardcoding a new codepath for every new function, new functions can simply be made separate from the codepath entirely, and will only be called if they are included in the trait itself. # TODO - [x] Remove ALL pre-existing trait functions and move them over to the new system. - [x] Evaluate which System Dependencies are essential for a majority of functions, and make sure that TraitSystem is caching them on behalf of the functions that need them for performance reasons. This system has a fairly high startup cost for frametime to begin with. - [x] Update all pre-existing traits such that they use the new System. # BREAKING CHANGES ALL DOWNSTREAM TRAITS WILL NEED TO BE MODIFIED TO USE THE NEW SYSTEM. # Changelog :cl: - add: Traits can now add Implants directly. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description Me, Death, and many more people have agreed that Shadowkin as they currently are do not meet our quality expectations for a playable species. This PR temporarily disables them, pending further updates to address severe balance, lack of system interactions, and playability issues. I've spoken at length about my many issues with the Species, and have long since regretted merging them in their current state. I'm calling in my "self-merge by proxy token" on this. # Changelog :cl: - remove: Shadowkin have been temporarily disabled pending significant reworks and balance updates.
<!-- 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]? --> Fixes power flickers.
# Description This ports WWhiteDreamProject/wwdpublic#110 from WWDP. This features significantly increases the interactions players have with Blood puddles, but introducing a mechanic whereby if players walk through puddles of blood, or attempt to drag a bloody corpse, they leave behind bloodstains as evidence of their presence or actions. You can avoid leaving marks from dragging corpses by using a rollerbed, and you can avoid leaving bloody footprints by avoiding walking in blood. This creates a great deal of emergent gameplay for all roles, but especially Traitors, Security(DETECTIVES!) and Janitors(Who now have to clean up bloody footprints!). Naturally, you can use syndicate soap to clean up any evidence of your crimes. # TODO - [x] Code Cleanup and Namespaces <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added Bloodstains, Body Dragging Marks, and Bloody Footprints to the game. Characters that walk through puddles of blood will now leave behind bloody footprints. Dragging a corpse leaves a trail of blood wherever the corpse was moved. --------- Co-authored-by: Spatison <[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]? --> No merge this time, quite literally just basic changes. Should solve all issues, as this is how I did it on my fork. Changes carp rifts and nuke arming to use readable locations. --- <!-- 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 nah
# Description Cherry-picks space-wizards/space-station-14#28375 to fix an issue with BUIs closing themselves. Co-authored-by: metalgearsloth <[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]? --> Fixes the call shuttle button.
# Description Maintainer suggested changes broke the AddTrait and ReplaceTrait functionality of the Version 2 Trait Functions. This restores their functionality. # Changelog :cl: - fix: Fixed AddTrait and ReplaceTrait functions giving players an unmodified, completely default component.
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
# Description Added missing environment variable for nix-shell. I don't like everytime write `export DOTNET_ROOT="/path/to/folder"`, so it should be done by post script in `shell.nix`
[From Floof, original PR by cynical24 (missing nyanotrassen stuff, felinids and arachne) Fansana#292
# Description Fixes Butlertron's hitbox. Thanks to WWhiteDreamProject/wwdpublic#105 # Changelog :cl: - fix: Butlertron is no longer as wide as a barn. --------- Co-authored-by: Spatison <[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]? --> This PR updates the Hive map Engineering, adding an SM engine, replacing the singularity --- # 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] Test the map --- <!-- 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: The Hive (map): add an SM engine to the eng, replacing the singularity.
# Description Returned **some** old lobby music, what have been cutted by ([#24480](space-wizards/space-station-14#24480)). --- # Changelog :cl: - add: Return 'Monument' and 'Atomic Amnesia MMX' as a lobby music.
github-actions
bot
added
Changes: UI
|
RSI Diff Bot; head commit 33f8509 merging into 99f6118 Resources/Textures/Objects/Fun/spraycans.rsi
Resources/Textures/Effects/footprints.rsi
|
|
Even though the tests pass (to my surprise), I kindly ask not to merge this until we can make sure this merge doesn't create a ton of new issues. |
|
resomi is a reskin of the human and should weight should be the same |
Is it? Its fixture radius is 0.35m, default is I think 0.45 |
if its inst, fix it please. |
remove the resomi species restriction from lightweight
|
shuttle calling fixes are already in floof I think |
|
You may want to partial merge my disposal fix under the engine update PR. It fixes your issue of when current direction is Direction.Invalid. But it's basically just this. |
|
I just found arachne lack their own male/female jumpsuit displacements and as such look extremely cursed. But other than that, everything that used to work still works. |
…tial-merge-2024-12-04' into floof/feat/partial-merge-2024-12-04
Fansana
approved these changes
Dec 14, 2024
|
Before this is merged i will mostly edit the maps and give them the needed floof changes included in those. |
|
EE got my full slider fix which was fully tested. Revert 8c096b7 and use the full PR. |
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.
Description
This merges a number of upstream changes up to (but not including) the surgery update. This brings a number of important changes, such as:
Minor changes:
Mapping changes:
Changes already merged into floof (ported upstream or otherwise):
In addition, the following changes were performed:
TODO
Media
Basic stuff works:
Changelog
🆑