Upstreams #296
Merged
Upstreams #296
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
…eam-sync # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln
…eam-sync # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json # Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json # Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json # Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
* fix randomfill logic * Revert "fix randomfill logic" This reverts commit 7cd73c0e61cbe5eda58f9451d15e583b76b62640. * change strange pill weights * proposed balance changes
First commit
* add inheritance to lathe recipes and make result an override * add GetResult method to lathe system * make other parts of the code use GetResult * clean up the stock parts yml * remove unused apu boards from dynamic recipes * make inverse dictionary public so test doesnt have to copy paste * revert result override stuff --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* cog update * woopsie, fixed that
fix energy shield visuals
* Fixed Minor Mistake * Fixed the NEW sprite and added Jumpskirt Fix
…eam-sync # Conflicts: # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
* Makes meteor swarms spawn meteorite walls with 1/10 health of an asteroid wall. * Changed MeteorRock prototype base - Rebased MeteorRock to AsteroidRock from Basewall - MeteorRock now only changes the Destructible damage value * Tried to fix comments
fix revenant being blocked by walls
* Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * stuff --------- Co-authored-by: metalgearsloth <[email protected]>
* weh * Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * weher * WHY --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Make suicide logs include the username, as well as the character(where possible)
Co-authored-by: PJBot <[email protected]>
This is the content analogue of space-wizards/RobustToolbox#5412 Made Content.Tests run tests parallelized, which doesn't really seem to matter much. I tried to make Content.IntegrationTest more aggressively parallelized but ran into dotnet/runtime#107197 so we need to shelve that. Added a comment explaining as such.
* Update StackSystem and add SpawnMultiple targeting EntityUid * Update Content.Server/Stack/StackSystem.cs * Update Content.Server/Stack/StackSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: lzk <[email protected]>
* Remove FormattedMessage obsolete methods * Oops
This reverts commit 96bce4b.
Upstream sync
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 84c8ed2 merging into dc6f76b Resources/Textures/Structures/Wallmounts/barsign.rsi
Resources/Textures/Structures/Machines/station_anchor.rsi
|
Измененные карты:
|
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.
upstream