Upstream sync #2504
Merged
Upstream sync #2504
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
Co-authored-by: Velcroboy <[email protected]>
* Add sound for turning on grill * remove view variable
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
* main antag page + minor antags * nuuk operatives (greenland) * "coup d'flop" = "flukies" but for revs * manifest edgelord * traitor tot (potato) * they're coming to get you, barbara * general changes. posters. * tfw last minute commit * traitoration rewritification * created thieves.xml * thieves, wow!!
ert chaplains can now use bibles
Mildly Reshapes The Sec Helmet
* increase material prices * ack
* Convert bookshelves to EntityTables * the fixy --------- Co-authored-by: plykiya <[email protected]>
* new vox customization stuff * tests fix
* Recycler overhaul * remove
clarify what is an important role
…ream-sync # Conflicts: # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Medical/Chemist.xml # Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml # Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/ServerInfo/Guidebook/Survival.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
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 8c43b69 merging into 4069b50 Resources/Textures/Clothing/Head/Helmets/security.rsi
Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi
Resources/Textures/Mobs/Customization/vox_facial_hair.rsi
Resources/Textures/Mobs/Customization/vox_hair.rsi
|
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Aug 23, 2024
lzk228
added a commit
that referenced
this pull request
Aug 27, 2024
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[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.
Описание PR
Медиа
Проверки
Изменения