forked from NebulaSS13/Nebula
-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Neb dev update #78
Merged
Merged
Neb dev update #78
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
… jackhammers and sledgehammers.
Couple of fixes.
Converts remaining AltClick overrides to alt interactions.
Numerous small additions/tweaks from Pyrelight test feedback.
ChemMaster pills do not discard their custom name.
Newscasters set digital for literacy checks.
Cherrypicking graphite smelting logic from dev.
Fix issues with color, rendering, and states
Fixing species actions and simplifying species fall code.
Adding a basic prosthetic type for neo-avians.
…rd_neb_edition Fixes Heart Attacks
…dition Fixes Exosuits Being Tossed Around on Shuttles
Various tweaks from Pyrelight feedback.
…ers-improvements-10-16-24 Port features and improvements from Spacefarers
Reworking monkey cubes and monkey cube boxes.
…ev-fixes-10-16-24 Port missing dev branch fixes from Spacefarers
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.
Description of changes
git fetch nebula; git merge nebula/dev
This was much less painful than the last time so maybe this is the right approach.
Why and what will this PR improve
Bleeding edge
Authorship
See commits
Changelog
Included in the merge commit