Upstream20241030 #147
Merged
Upstream20241030 #147
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
…ce-wizards#33031) Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
…#32876) * adjusted minimum timers in meteorswarms.yml * Updated timer minimum from 20 to 15 minutes * Reduced minimum timer to 10 minutes as a result of other meteor changes --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
* added vox beacon * changed name to vox break room * added vox box station beacon
* added vox beacon * changed name to vox break room * added vox box station beacon
* added vox beacon * changed name to vox break room * added voxbox station beacon
* added vox beacon * changed name to vox break room * added vox box station beacon
* added vox beacon * changed name to vox break room * added vox box station beacon * fixes messed up diff
* add StartDelay bool to actions * forgot summary
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
Co-authored-by: deltanedas <@deltanedas:kde.org>
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
Set hidden to true
…ap, Brig Timer (space-wizards#32786) * various resprites (encryption keys + signal screens + station map) * brig timer update * fixes n shit
…ate the crusher and glaive icons. (space-wizards#32212) * inhands * better inhands * indent
…zards#32291) * replace tear gas and flashbang with holobarrier and sec radio * holobarrier-belt-fix
three bottle boxes in nanomed plus
…pace-wizards#32720) * a-few-injectors * comment * defib-ops-when
KeldWolf
approved these changes
Oct 31, 2024
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 merge for Oct. 30, 2024