Upstream sync #559
Merged
Upstream sync #559
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
* Improve access overlay * review changes --------- Co-authored-by: wrexbe <[email protected]>
* add button to menu * networking and component work * try to add access stuff * main functionality done * add access lock? I think? * remove extra line * fix access system * move SkipTime to StationCargoBountyDatabaseComponent * Disable/Enable skip button based on cooldown * remove debugging * add access denied sound * remove DataField tags * dynamic timer
Flippolighter has realy loud sound, no UseDelay and server errors
* Revert "Revert "Game server api (#23129)"" * Review pt.1 * Reviews pt.2 * Reviews pt. 3 * Reviews pt. 4
Revert "Game server api (#24015)" This reverts commit 2978539.
Start botanists with droppers so that they can better dose robust harvest or mutagen.
Clipping a plant in any condition currently causes it and its clippings to be damaged. Make clipping harvestable (already eligible for seed extractor) plants yield seeds at full health.
* dirty after calling SetAccesses * fix door access * D * pro ops * nukeop --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Update ashtray to allow all cigarettes / cigars This also includes joints (as they are technically cigarettes) * ?
* allow usage of network configurator for door electronics * add checks for "allowed" items
It's possible to trigger this by stacking it weirdly with the spawn panel. Just make it bail instead.
* Fixed mixed deconstruction times for tiles and lattice * Lattice and power cables can be deconstructed instantly
* make cryo remove crewmember's station record when going to cryo * Revert "make cryo remove crewmember's station record when going to cryo" This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6. * make cryo remove crewmember from station records when the mind is removed from the body * add stationwide announcement for people cryoing (remember to change pr title and desc) * minor changes * announcement actually shows job now * requested changes * get outta here derivative
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.
No description provided.