Merged
Conversation
…point at items worn by others (MrMelbert#610)
This PR is the long-awaited de-soulification of the slot machine, converting it over to TGUI. It also updates the jackpot, since it appears to have been quite broken. It will now give all of the available prize money plus 10000 credits. I'm fairly sure this is what was supposed to happen, but I honestly could not tell, so if this ends up being a balance change then so be it. Also adds a new funny kind of jackpot when you get 5 bombs in the middle row. Other than that, generally cleans up and updates some of the slot machine code. The styling of the slot machine ui is nothing fancy right now, and I'm open to suggestions about how the ui should look.
… PRs so I can cherry pick Nebula Station (Also removes Birdboat) [MDB IGNORE] [IDB IGNORE] (MrMelbert#623)
With oswalds apparent death, localnode has convinced shrike to allow it to merge with the lavaland orbit fragment (better desc, updated sprites)
* Refactor title screen and music spinner * Don't need that * Ah yes
…jobs (MrMelbert#778) * Crew monitor tweak * Fix
…ess bad (MrMelbert#800) * GAGS underwear / lizard support * Update
…rMelbert#810) * You can't hug people on combat mode and help refactorin * Ooprs
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
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.
CHECK LIST
// NON-MODULE CHANGEappended.// NON-MODULE CHANGE!MODULARITY
It's important to ALWAYS MAKE SURE to modularize your content! If you need to touch the main game files, ALWAYS use "NON-MODULE" in the comment.
Multi line changes should have "NON-MODULE START / END" to denote the multi line changes, if applicable in succession.
Images added to master .dmi files will be rejected and you will be asked to modularize them, even if you need to copy the master file.