Upstream sync#460
Merged
Merged
Conversation
Update MindSystem.cs
change increments
do powered layers for our friend the station map (wall edition)
* Add coverage examination verb based on contraband * Sprites for coverage examination * Early return on invalid IdentityBlockerCoverage enum * Remove now unused `human-head` icon * Update text for identity block coverage * Rename conflicting translation keys * Revert "Rename conflicting translation keys" This reverts commit 3e89df4009e8d238c446fb6f9cbff2e4c8653d82. * cleanup --------- Co-authored-by: beck-thompson <beck314159@hotmail.com>
Make changelog button color positive instead of negative
* IoC source gen compatibility Can be merged before or after space-wizards/RobustToolbox#6549 doesn't really matter. * Missed a spot
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* VULPKANIN TYPING INDICATOR CHANGES * add offsets * fixed newline error in .run file * fixed vulpkanin3 sprite (scar said so) * scar told me to fix other png * Update Resources/Textures/Effects/speech.rsi/meta.json Co-authored-by: Connor Huffine <chuffine@gmail.com> --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: Connor Huffine <chuffine@gmail.com>
Correctly scope button pseudoclass generation I was fighting in RT for a while trying to figure out why random controls with new PseudoClasses would turn into black, but it turns out THESE RULES broke it all...
* remove u from the game * Loc strings * by * meow * delaystart my beloved * optional * i dont webedit --------- Co-authored-by: beck-thompson <beck314159@hotmail.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* fix up moneky * review
…ip menu (#43658) * Admins can now see what items are contraband and chameleon in the strip menu * Fix the color, the default is now red * better admin view comment * Simplify logic, make new simple slot overlay to combine logic * Make isadmin logic a little clearer * Minor cleanup / spelling mistakes * change button shape * change to res path * opps * Add option to change default behavior * Fix spacing * Remove unused * Rename to default * Take away the soul of the overlay * Add tooltip * Fix error
…… (#43914) move handheldgrindersystem from component folder to proper entity system folder
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* simple fix * Revert "simple fix" This reverts commit ba39fd62bde7ecffb9e5eb64288e011ffe85bfc2. * simple solution
Fix Gorlox and Borg Hypospray having no delays
* Expand epsilon * Increase epsilon slightly more * Add more comment
* dasfd * ghost role test finished * erm? heisentest? * shorter test name actually * actually even better * cleanup * better assertions * typo * linqless * burger * should work * oop * quadruple check for nullspace * bruh * grrr * try this??? * reduce tolerance so long as it's close enough * better descriptionpush * A * hammed burger * uuh does that fix it? * try that? * review --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add [ForbidLiteral] to GameTicker GameRule methods * Cleanup violations in tests * Fix for NukeopsRuleSystem with TODO * This one wasn't a violation, but should still be fixed.
thefuckmybrain
force-pushed
the
upstream-sync
branch
8 times, most recently
from
June 5, 2026 07:27
d7989f6 to
bee0444
Compare
thefuckmybrain
force-pushed
the
upstream-sync
branch
3 times, most recently
from
June 5, 2026 08:11
6895fbb to
e6b0acb
Compare
thefuckmybrain
force-pushed
the
upstream-sync
branch
from
June 5, 2026 08:20
e6b0acb to
b8187df
Compare
thefuckmybrain
force-pushed
the
upstream-sync
branch
from
June 5, 2026 08:46
50f09c2 to
e53ad68
Compare
added 2 commits
June 5, 2026 12:03
thefuckmybrain
force-pushed
the
upstream-sync
branch
from
June 5, 2026 12:27
7843ae8 to
3804c09
Compare
thefuckmybrain
force-pushed
the
upstream-sync
branch
from
June 5, 2026 12:40
3804c09 to
4503c89
Compare
thefuckmybrain
force-pushed
the
upstream-sync
branch
from
June 5, 2026 13:14
0f6fbe0 to
fcaebf8
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
апстримчик спустя 3 месяца