upstream merge 24/10 #2036
Merged
upstream merge 24/10 #2036
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
* Fix cryo locale again * yeep
Update curtains.yml
…32683) changed punctuation for jobs, added proper capitalization and comma usa
Replace D10 with a D20
* swap omega and delta particle colours * remove upgrade doafter * explicit syndicate chip description * Syndicate CHIMP stealth * fast projectile speed * 10 to 12 shots * buff heat dmg * upgrade chip mentions omega particle * Revert "remove upgrade doafter" This reverts commit 8a321980b7a384daca06215656494e0c116e7333. * Revert "explicit syndicate chip description" This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9. * Revert "Syndicate CHIMP stealth" This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6. * Revert "10 to 12 shots" This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a. * Revert "swap omega and delta particle colours" This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5. * Revert "buff heat dmg" This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
* first commit * Licence fix * rosysyntax licence change (permission granted!) * simplify * Better wording
* initial commit * Delta review
* First commit * increase price by one tc
* Job title localization * Correcting fields
* First commit * I forgot silly me * Actually added comments * spellin * fixes * more blacklists * Minor fixes * Speech Verb also changes now * Simple name stuff * Other fixes * remove one line of whitespace --------- Co-authored-by: slarticodefast <[email protected]>
…32723) * Fix error log when recycling something with small material counts. MaterialStorageSystem.SpawnMultipleFromMaterial now doesn't call StackSystem.SpawnMultiple if it tries to spawn zero. This happens because the recycler calls SpawnMultipleFromMaterial for everything recycled, even if the amount it has stored is < the amount for one sheet. * Update Content.Server/Materials/MaterialStorageSystem.cs Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
* Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * minor cleanup * remove createdTime datafield * now actually using the event replacement I made for role time tracking * weh
* Make NameIdentifier Ids get refreshed after round restarts Before this commit the existing values would just get shuffled. This means that eventually the server would run out of ids to give to new entities for different groups. As a result everything would get id 0 * Comply with what seemingly is the convention for sawmills * Make it impossible to insert a bounty with a duplicate id * Reduce duplication * Remove unused sawmill * Fix rustbrain and skill issue * Aaaa * Apply suggestions from code review --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
* Fix Centcom cloning scanner * Fix uid conflict
It's simple. We kill the heisentest
* Make APC UI work correctly with multiple users * Check access only on client, when constructing UI * Do TODO (Thanks, Robust 236.1) --------- Co-authored-by: Eoin Mcloughlin <[email protected]>
github-actions
bot
added
Status: Needs Review
Changes: YML
|
Ima be real I dont like the ghost detector should probably get rid of that lmao |
MilonPL
reviewed
Oct 24, 2024
Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
Outdated
Show resolved
Hide resolved
MilonPL
reviewed
Oct 24, 2024
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
Outdated
Show resolved
Hide resolved
|
ok stupid centcomm map left, i sent what's causing it in #mapping |
* Fix bug? * Fix :) * aaaa * AAAA!!! * comment * Nicer code * What's a pull requestWhat's a pull request?
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.
Notable additions
ftldiskcommand for admin abuseNotable exclusions
Changelog
🆑