August Upstream Merge #223
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
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> Co-authored-by: metalgearsloth <[email protected]>
I already nerfed its damage from before (at least non-structural) but this nerfs it slightly more.
Me when I don't run tests on the final commit.
Co-authored-by: LightVillet <dev@null>
* borg tweaks * wahoo
* Buff nutriment on plants * Super composting buff * 1984 pt. 2 * Use standard function
* secret door * oops
* Fix stuns on vehicles * Unicycle 1984 * Fix sleeping and driving * Discard that too
* fixe * updatery
* Light laser * Migration
* bloodred jetboots * fix actionbar
* Holoclown (clown only) syndicate uplink item. * added clumsy to holoclown * holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting. * gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
* Laser naming * More laser changes
…ock security upgrades (#18983) * Adds guidebook entries for the access configurator and installing airlock security upgrades * Moved the guidebook entry on airlock security to be under engineering
* Update pyrotechnic.yml * Update chemicals.yml * Update cleaning.yml bleach * bleach makes you SCREAM * decrease phlogiston poison damage to 1
* Update medfab recipes add jug * Update chemical-containers.yml * Update chemical-containers.yml again what if it was 25 * Update medical.yml yet again reduce cost * Update chemical-containers.yml again * Update medical.yml remove name for recipe since it seems redundant as its ID is jug anyways
* Origin blorbo * Blorb * the entire duffel bag instead of centcom dress * AA med door in sec * hotfix * Filled locker was open * This is definitely not a webedit
* update rules for borgs * add recent changes
This completes PilgrimViis' (now closed) PR 16398. It addresses issue 10896, by allowing materials to be ejected from most lathes (except the ore processor and sheet-meister 2000) * - Refinements to the material ejection UI - Made the lathe UI default to a slightly larger size - Fixed an offset issue with the label of the item currently being printed in the build queue UI * Allow the materiel reclamation UI to pop if there is material left in the lathe, but not enough to print any sheets --------- Co-authored-by: Kevin Zheng <[email protected]>
* Fix emote chirps * named args time
|
thank you for not including the nuke sprite |
…m_merge # Conflicts: # Resources/Changelog/Changelog.yml # Resources/ServerInfo/Rules.txt
|
all tests pass including my own so why not |
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.
About the PR
Lots of changes from upstream, including borgs, mass media, senior roles, etc. We have migrated to upstream's moths, and hopefully we will have no conflicts. Our stats will match upstream with one noticable difference: Our moths cannot eat cloth, but they can eat pills. Also, generators are all updated on all ships to take plasma.
This will remain draft until I can also test that (besides finishing up squashing a few yml hiccups)Fuel rate is as follows: 100% efficiency = 1 stack/hour is the goal. 6 hour shift, 6 stacks of plasma per gen at optimum power. Upgrading the gens, underpowering them, etc, will obviously extend this.
🆑