This repository has been archived by the owner on Apr 27, 2024. It is now read-only.
Upstream merge 02/03/2024 #11
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
* Add new stairs * Resprite * Resprite again * empty
* Upgrade trash bag size to Normal * let the belt and trash bag box hold the buffed trash bags --------- Co-authored-by: Jessica M <[email protected]>
Change of the hardsuit bundles to be better Co-authored-by: AlexUm <[email protected]>
* add conducting gloves * add conducting gloves to uplink --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* train update * argh * forgor
The Radioisotope Thermoelectric Generator (RTG) isa power source that players may encounter in the game that doesn't have an entry in the guidebook yet. This commit fixes that.
- Not mentioned anywhere ingame. - Stupid.
* trumpet + lily +polypy * trumbet
…wizards#25039) * Blacklist Acidifier from Nukie Uplink and Increase Price to 4tc * Removing Category to just disappear it from uplinks while keeping the item? * Price 4, Nukie Uplink Only * Update uplink_catalog.yml * Added one backspace
* Add option for admins to disable bwoink In a vain attempt to get people to ahelp more, provide the possibility for admins to not play the bwoink sound if they don't want to scare the player. * Add silent indicator to discord relay * Use string interpolation
* Fixed length check, added attempt event, added popups on failure * Fixed file name typo, fixed description * Converted to else-if
Removed Chef counter windoors, added RD dresser, put bedsheets in all head dressers except captain's
…update body state in UI (space-wizards#25109) * fix: cryo pod now uses health-analyzer system to update body state in UI * refactor: use EntityEventRefHandler instead ComponentEventRefHandler in CryoPodComponent subscribe on EntRemovedFromContainerMessage --------- Co-authored-by: pa.pecherskij <[email protected]>
Co-authored-by: Jeff <[email protected]>
* moves muted to shared * fixes usings * Update MutedComponent.cs funny webedit * Update MutedComponent.cs oops using statement webedit
* Fix bwoink sounds Didn't get a chance to test with 2 clients as I'm about to sleep but otherwise I'll check tomorrow. * a
* Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants. * Removes chemdispensible type from DrinkBase entity * Updated drink jug names to differentiate from chem jugs * Add FitsInDispenser type to DrinkGlassBase. Re-allows glasses into beaker slots
* add ActionAttemptEvent * add ConfirmableAction compsys * make suicide actions confirmable * use new trolling techniques * better query and dirty them * death --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Make the round end sound collection a cvar * Fix comment * Clarity
Cryo Access Fix
Expensive coat
Stamp Detective
initial commit
* move space heaters into cargo * AAA!!! the indentation1!!! * remove crate
…pace-wizards#25743) * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. Fixes a paradox where selecting a research server requires a research server to already be selected. This would softlock the research client until it is reconstructed. * style: Discards the discard operator Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]>
…e-wizards#24899) Weight based delay, retuned average, fixed comments
* Alert autoremove v0 * Code cleanup and timing * comment * Tritium, code compression * not resolving manually * reduced lookups, new comp * fix-fix yes * use RemCompDeferred, handle OnUnpaused * missed a todo * entitysystem resolve * remove unnecessary component updates * remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan * Code cleanup * comments * combines AutoRemove input into Clear * minor logic adjustment that does not really change anything but is less ambiguous
This is a trash item for the most part, and should get picked up by the janitor's trash bag
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix a bunch of issues