Merged
Conversation
Null gates runtime in camera repository.
Fixes Tajarans turning into albinos when exposed to radiation.
PDAs and cyberbrains should now start enabled.
Improving some aspects of chemsmoke code.
Cleaning up some sprite accessory logic.
Backporting tradeship changes from scav.
Backported Devchord's ministation improvements.
Added a Python script for replicating player saves for all other maps.
Staging update from stable.
Dev update from staging
Tweaks Taj eye icon. Adding organ icon state checking to species validation.
…ing overlays. Moved shine onto wall icon caching. Wall icon gen now caches much more aggressively and replicates a similar layering flow to the old code. Optimizing wall icon caching.
Cups now shatter and spill contents when phyiscally destroyed
Splitting HUD code out of inventory slot rewrite.
Moving internals proc to mob level.
Staging update from stable
Added a basic helper for managed instances.
Dev update from staging.
Fixed wall offests of a few things
…recipes Added missing circuit designs for internet machines
Fix wallmed2 having wrong offset
PsyCommando
force-pushed
the
attempt_merge_upstream
branch
from
fa7c3f0 to
2825264
Compare
PsyCommando
added
the
💦 port/upstream merge
* Updated what I could see was missing. * Removed unused species redefs. * Updated old outreach map. * Ran mapmerge + added level_data old outreach. * Old outreach was missing overmap. This was preventing the overmap marker for the planet from initializing properly.
This hack just doesn't work anymore, gotta get rid of it. It crashes unit testing because it causes hard deletes.
The hack that used to pass the exoplanet's z as arg, would prevent exoplanets from initializing properly for us. It's also been changed in the upcoming planet generation PR. So there's no point keeping that hack around.
PsyCommando
force-pushed
the
attempt_merge_upstream
branch
from
9c575e1 to
e458e74
Compare
NataKilar
approved these changes
Mar 23, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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