Staging merge from Nebula#483
Merged
PsyCommando merged 760 commits intoPersistentSS13:devfrom Jan 9, 2024
Merged
Conversation
Exoplanets actually respect map planet depth setting now
Fax machines now autopopulate with admin URIs.
Couple small fixes
Fixes to retaliate mobs.
Adds defines for atom's var/fluorescent
This way they won't get picked for volcanic planet strata
Fixes runtimes with secret mode selection.
Adds maximum temp values to rock strata
Psionics tweaks.
Falling now tracks fall distance and multiplies damage accordingly.
Dev update from stable.
…h zero hotloaded levels.
Silicon radio fixes
NataKilar
force-pushed
the
jan-2024-outreach-merge
branch
2 times, most recently
from
69a36a1 to
3548c79
Compare
NataKilar
force-pushed
the
jan-2024-outreach-merge
branch
from
3548c79 to
de9b10b
Compare
PsyCommando
approved these changes
Jan 9, 2024
Collaborator
PsyCommando
left a comment
PsyCommando
left a comment
There was a problem hiding this comment.
I don't see any major problems from looking at it quickly.
PsyCommando
added
the
💦 port/upstream merge
Contributor
|
let's go |
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
10 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.
Description of changes
Brings us up to date with Nebula staging. Includes the fixes found in this PR NebulaSS13/Nebula#3563
Currently, connections between lateral z-levels / looping is not functional post-load. Still need to solve this issue.