-
Notifications
You must be signed in to change notification settings - Fork 567
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Assault Ops #2539
Closed
CatBackGround
wants to merge
10,000
commits into
space-syndicate:assaultops-gamemode
from
CatBackGround:master
Closed
Assault Ops #2539
CatBackGround
wants to merge
10,000
commits into
space-syndicate:assaultops-gamemode
from
CatBackGround:master
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
Fixs suffocation alerts not appearing
* seed screams now SoundCollectionSpecifier More types of scream sounds * plants scream mutation have 10+ scream types * plant scream reduce scream volume And scream powerness get's from yml instead of hardcode, so from prototypes could be changed pretty much easilly * plants review change
remove obsolete functions from radiation
…lots (#30744) * Fix bluespace * filter all containers
* anonymize salvage wrecks * display wreck size
* Make printing from ore procecssors slightly more bearable * Update sheet.yml
* updated cog and increased popcap to 80 * back to 70 cap
update protos
Either VSCode's integrated shell or dotnet has a default behaviour where it inserts newlines into stdout/stderr to make the lines wrap at the console width. Since msCompile works based on lines this makes it fail to detect build warnings correctly. Depending on where the line break occurs this can result in a truncated error message, a correct error message with a truncated filepath for the error, or the errror just straight up missing. Adding 'ForceNoAlign' to the logging parameters for dotnet build disables this behaviour and gives msCompile actually useful input to sift for errors. End result is all the errors are detected and listed with the correct error messages and filepaths.
* Add croissant recipe * comma * fix description * fix merge error
* small * update
changed all the firelocks to glass firelocks
Emoji eye change
* Adds heat-based recipe for cream * Added aeration --------- Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
Forgot to do this, but how tf do doors work then.
…ream-sync # Conflicts: # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
Upstream sync
github-actions
bot
added
Status: Needs Review
This PR requires new reviews before it can be merged
Merge Conflict
PR have unsolved merge conflicts
labels
Aug 31, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
БЛЯТЬ! Я КРЕТИН! |
github-actions
bot
added
the
Changes: UI
Can be reviewed or fixed by people who are knowledgeable with UI design
label
Aug 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: UI
Can be reviewed or fixed by people who are knowledgeable with UI design
Merge Conflict
PR have unsolved merge conflicts
Status: Needs Review
This PR requires new reviews before it can be merged
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.
Описание PR
Медиа
Проверки
Изменения
🆑