Merge Upstream (UNstable) :-) #31
Merged
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: Winkarst <[email protected]>
* fix starting gear storage * removal of unused --------- Co-authored-by: MetalSage <[email protected]>
* Fix grids and docks being culled from display prematurely * Fix inconsistent disabling of "Undock" buttons * Add a radar icon to indicate where the controlling console is * Tidy up math Remove lots of sketchy transforms-of-transforms, which should have been as single matrix multiply. Assign proper names to matrices. Remove some redundant calculations. * Feedback
* Fix door animations mispredicting if closing is interrupted On master it will flicker states a little bit partially due to it not being predicted. Instead we'll just set it straight back to opening (no animation is ever played anyway). * no log
It won't actually do anything.
ensure wires are always cut
* babyproof arrivals shuttle * always powered lights * uncuttable cables from terminal PR. --------- Co-authored-by: slarticodefast <[email protected]>
It functions identically to how V1 of orientation worked and it's incredibly annoying.
Co-authored-by: PJBot <[email protected]>
* Draw muzzle flash below mobs * Better naming --------- Co-authored-by: Winkarst <[email protected]>
This check conflicts with an attempt to FTL from the planet before expedition ends
Co-authored-by: deltanedas <@deltanedas:kde.org>
* begin * bones + pyrotten + goliath hide inhands * Update Resources/Prototypes/Entities/Objects/Materials/materials.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * pyrottOn --------- Co-authored-by: slarticodefast <[email protected]>
* add headset * Add icons * Meta change * fix * Revert + delete headset from locker
fix door auto close timer
* baby proof the terminal * Make a couple exceptions for items that you might take with you. * alwayspoweredlights * Uncuttable cables since cablecomp is a snowflake construction system * chairs and vendors * rerun heisentests * rerun tests again
* babyproof arrivals shuttle * always powered lights * uncuttable cables from terminal PR. --------- Co-authored-by: slarticodefast <[email protected]>
* fix bug, in ghost command lobby * fix * Fix build
* Makes admins not count towards the playercount cap * Update Content.Shared/CCVar/CCVars.Admin.cs (thx Aeshus Co-authored-by: Thomas <[email protected]> * Actually fixes whitespace on the comments Thanks VScode very good IDE --------- Co-authored-by: Thomas <[email protected]>
* Initial commit * hoili moili * now to add sherlock and doctor who * funny stick * Oops it was meant to be called metaphysical * Attribution * Even BETTER attribution
Added explosion resistance to secbelt
* chemmaster buffer has colors now * I have saved chemists everywhere * implimented panelcontainers instead of labels, slight visual rework * added UI changes to input buffer * fixed some unsightly indentation on brackets and removed redundant minheight specification from verticalstretch elements * Formatting and code cleanup * pills still not rendering correctly * more tinkering, entities finally display correctly * entities display correctly, pill fields default to max now * fixed stripes * fixed excess pillCount bug * removed cache, fixed tab swapping --------- Co-authored-by: Saphire <[email protected]>
* make spaceshroom cookable on grill * remove microwave recipe
* First commit * I'm silly * weh * will this work? * Better design * Fixes! * rider :( * L rider
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: Map
Changes: UI
Changes: Sprites
and removed
Merge Conflict
labels
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…ace-Station into mergeupstream
|
UNRELATED CHECK FAIL MERGE MERGE MERGE!!! |
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.
About the PR
Title