Downstream Port #1509
Merged
Downstream Port #1509
+410
−27
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 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 --> <!-- 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]? --> Some stuff --- <!-- 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: sleepyyapril, Stop-Signs, Memeji - add: Changed the Warden suit's capabilities. (Original author: Stop-Signs) - add: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout. - add: Red cloak to loadout (Port from Floof PR Simple-Station#390) - add: Witch Robes to loadout (Port from Floof PR Simple-Station#390) - add: Sawed-off PKA (Port from Floof PR Simple-Station#390) - add: More end-round sounds. (Port from Floof PR Simple-Station#390) - add: The ChemMaster now has 20, 75, and 80 unit options available. - tweak: Made the ChemMaster wider. - fix: Ported Frontier fix to mag visuals on specific guns. --------- Signed-off-by: Stop-Signs <[email protected]> Co-authored-by: Stop-Signs <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: Radezolid <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]>
github-actions
bot
added
Changes: C#
|
RSI Diff Bot; head commit c12a521 merging into 90db21a Resources/Textures/Clothing/Head/Hoods/redhood.rsi
Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi
Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi
Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi
|
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
As a temporary solution, heirlooms don't give a negative effect if they go missing, only reset. This is because the mood effect ends very quickly and therefore flickers a negative mood effect for a half second. |
VMSolidus
requested changes
Jan 15, 2025
Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
Outdated
Show resolved
Hide resolved
…awn_pka.yml Co-authored-by: VMSolidus <[email protected]> Signed-off-by: sleepyyapril <[email protected]>
Co-authored-by: VMSolidus <[email protected]> Signed-off-by: sleepyyapril <[email protected]>
VMSolidus
approved these changes
Jan 17, 2025
SimpleStation14
added a commit
that referenced
this pull request
Jan 17, 2025
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.
Changelog
🆑 sleepyyapril, Stop-Signs, Memeji