Upstream sync #1639
Merged
Upstream sync #1639
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
* fix hypopenbox size bug * fix pen bomb box size bug * fix edagger box size bug.
…idearm, chemistry documents. (#22397) * Pinpointer desc * The game breaking ability to put documents in chem bags * mops bigger * Defib Large * fix monkey cube size bug. * appraisal gun pew pew
* Some instrument sizes and gunpet sidearm * Cello * bagpipe * Crippling balance PR made bananium horn Small not Tiny * plushie and toy sizes. * Scroll bigger * Make bible same size as other books. * size rgb staff to other staffs. * add sprite update json
* Pdas made * ID cards * Role fills * Trim Item heldPrefix overrides. * Sorta funky parenting.
* Add files via upload * removed selling point * rollah bed * hopefully fixes angry test
This adds a crate containing mindshield and tracking implanters, locked by security access. The crate contains 4 items of both implanters. This has been requested by some mappers. The crate is not obtainable through normal means like cargo.
* Rename blood-red medic hardsuit prototype * Update guidebook * Migration
Co-authored-by: Jeff <[email protected]>
I forget if it's actually going to popup or not.
…he ability to toggle Discord RPC) (#22430)
* Fix chat filter button Oh look, the popup code was copy pasted between chat filter and channel selector. Hilarious. Anyways same stuff as 995f506. I pulled it all out into a base class so NO MORE COPY PASTE. Fixes #22360 * Remove all further EnableAllKeybinds buttons. Fixes #22346 Yeah none of these are valid use cases, why is this set...
* Move MaskComponent to shared and add toggle events * Datafield and network IsToggled * Add missing dirty
* smartfridge * leftovers from when it was powered * real
* add * tweak
* add * fix? * a * maybe * aaa
* let cyberpen edit stamped papers * desc * little more desc --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* add * comma * yay * hair
# Conflicts: # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Dec 15, 2023
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
Медиа
Проверки
Изменения