Skip to content

blegh#2

Merged
Bluedino1025 merged 171 commits intoplease-don't-breakfrom
master
Oct 20, 2025
Merged

blegh#2
Bluedino1025 merged 171 commits intoplease-don't-breakfrom
master

Conversation

@Bluedino1025
Copy link
Owner

@Bluedino1025 Bluedino1025 commented Oct 20, 2025

CHECK LIST

  1. If you're adding new code... Make sure it compiles and is tested. Any changes made to /tg/station files should either be modularized out if possible, or otherwise have // NON-MODULE CHANGE appended.
  2. If you're adding sounds or sprites... Including a picture of the new sprites or clips of new sounds is more than appreciated. If you've modified /tg/station DMI icons, either move them to our modules subfolder or accept they will be overridden next update.
  3. If you're mapping... Including screenshots of changes is preferred. Avoid editing /tg/station map files unless you are okay with them being overridden next update.
  4. Make sure that any changes to /tg/station files are appended with // NON-MODULE CHANGE!
  5. If you have any other questions on how to modularize certain aspects, ask. Some things are impossible to split out, like GAGS configs, string files, and TGUI interfaces, so just ensure it's easy to tell modular files apart.
  6. Optionally, providing a unit test with your feature is an excellent way to ensure it is not broken come next merge.

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.

siliconOpossum and others added 30 commits November 3, 2024 13:44
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)
MrMelbert and others added 27 commits September 21, 2025 14:19
* Refactor title screen and music spinner

* Don't need that

* Ah yes
…ess bad (MrMelbert#800)

* GAGS underwear / lizard support

* Update
…rMelbert#810)

* You can't hug people on combat mode and help refactorin

* Ooprs
@Bluedino1025 Bluedino1025 reopened this Oct 20, 2025
@Bluedino1025 Bluedino1025 merged commit 78bdc25 into please-don't-break Oct 20, 2025
57 of 72 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.