Upstream sync #1580
Merged
Upstream sync #1580
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
* Allow mid-round borgs to emote * a * rerun tests
* Update improvised.yml added CottonWovenCloth * added cotton.yml constructionGraph * it's spelled cotton, not cotten
* add signal router sprite * DisposalSignalRouter logic * add disposal signal router * add disposal signal router * how did it work without this * death --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* system naming conventions * remove obsolete warnings * use EntityQueries * tube comp clean up * damage on turns * remove OnRelayMovement because it didn't work * reduce volume * reduce damage to 1.0
* Gateway generation * Gateway stuff * gatewehs * mercenaries * play area * Range fixes and tweaks * weh * Gateway UI polish * Lots of fixes * Knock some items off * Fix dungeon spawning Realistically we should probably be using a salvage job. * wahwah * wehvs * expression * weh * eee * a * a * WEH * frfr * Gatwey * Fix gateway windows * Fix gateway windows * a * a * Better layer masking * a * a * Noise fixes * a * Fix fractal calculations * a * More fixes * Fixes * Add layers back in * Fixes * namespaces and ftl * Other TODO * Fix distance * Cleanup * Fix test
* woop * weh * aaaaaaaaaaaaaaaaaaaa
…o unbuckle yourself while incapacitated (#21556) * a * review * reviews???? * another fix! * goofy * Fix my own fuckup
* burger king * fixe * nightmare blunt rotation
* Fix cyborg locking * Revert "Fix cyborg locking" This reverts commit bd5bbbb8b46edb720a9d479772f7931f5f497907. * create generic component * update submodules * Revert "update submodules" This reverts commit 303200f298f1c56660955d13caa8218b02e306ad.
# Conflicts: # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Structures/Piping/disposal.rsi/meta.json # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/steel.png
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 61fb7f4 merging into 18551d3 Resources/Textures/Mobs/Pets/corgi.rsi
Resources/Textures/Mobs/Pets/cat.rsi
|
* Cat cake. A small update. * up1 * up2
…t state through UpdateMobStateEvent (#21741)
Co-authored-by: DrSmugleaf <[email protected]>
# Conflicts: # SpaceStation14.sln
Morb0
added a commit
that referenced
this pull request
Nov 26, 2023
Co-authored-by: Morb <[email protected]> Co-authored-by: lapatison <[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
Медиа
Проверки
Изменения