Skip to content
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

[MIRROR] Converts the slot machine over to TGUI #2176

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1185
Original PR: tgstation/tgstation#81700

About The Pull Request

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.

Fixes #71314

  • Convert slot machine to TGUI
  • Fix slot machine jackpot
  • General code cleanup
2024-02-26.21-42-34.mp4

Why It's Good For The Game

Converts a super old and outdated UI over to TGUI, fixes the jackpot, and includes general code improvements for the slot machine.

Changelog

🆑 Momo8289
fix: Fixes the slot machine's jackpot. It should now give all of the available prize money + 10,000 credits as payout for a jackpot.
refactor: Converts the slot machine's UI over to TGUI
add: The slot machine now has a whole new type of jackpot! This one's a banger!
/:cl:

* Converts the slot machine over to TGUI (#81700)

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.

* Converts the slot machine over to TGUI

---------

Co-authored-by: Nick <[email protected]>
@Iajret Iajret merged commit ebe8e1b into master Feb 28, 2024
24 checks passed
AnywayFarus added a commit that referenced this pull request Feb 28, 2024
@Iajret Iajret deleted the upstream-mirror-1185 branch February 29, 2024 22:13
Iajret pushed a commit that referenced this pull request Apr 25, 2024
* [NO GBP] Critical fixes for cyborg omnitools (#82825)

## About The Pull Request
Fixes several critical fixes for cyborg omnitools, surgical omnitools in
peculiar. Which is:
1. bonesetter omnitool can do compound fracture surgery now
2. omnitool butchering not properly disabled works (why didn't that
runtime. fucking dreammaker)
3. omnitool surgery_initiator not properly disabled
4. cautery in offhand not working

Fixes #82805
Fixes #82868

Honestly I have now regretted for doing this kind of implementation at
the start. with how shoddily coded it is.
Planning to refactor cyborg omnitools, admin omnitool and ayys omnitool
(all have the same base of implementation) to be less snowflakey. but
that's for the future. and will take some time. This is a bandaid fix
for now
## Why It's Good For The Game
this is cbt
## Changelog
:cl:
fix: fixed cyborg bonesetter not working for compound fractures
fix: butchering not disabling in cyborg omnitool
fix: fixes a bug where if you select the omnitool it would be stuck in
surgery initiator mode
fix: cautery in off hand for cyborg omnitools not working
/:cl:

* [NO GBP] Critical fixes for cyborg omnitools

---------

Co-authored-by: Singul0 <[email protected]>
ReezeBL pushed a commit that referenced this pull request Apr 26, 2024
* [NO GBP] Critical fixes for cyborg omnitools (#82825)

## About The Pull Request
Fixes several critical fixes for cyborg omnitools, surgical omnitools in
peculiar. Which is:
1. bonesetter omnitool can do compound fracture surgery now
2. omnitool butchering not properly disabled works (why didn't that
runtime. fucking dreammaker)
3. omnitool surgery_initiator not properly disabled
4. cautery in offhand not working

Fixes #82805
Fixes #82868

Honestly I have now regretted for doing this kind of implementation at
the start. with how shoddily coded it is.
Planning to refactor cyborg omnitools, admin omnitool and ayys omnitool
(all have the same base of implementation) to be less snowflakey. but
that's for the future. and will take some time. This is a bandaid fix
for now
## Why It's Good For The Game
this is cbt
## Changelog
:cl:
fix: fixed cyborg bonesetter not working for compound fractures
fix: butchering not disabling in cyborg omnitool
fix: fixes a bug where if you select the omnitool it would be stuck in
surgery initiator mode
fix: cautery in off hand for cyborg omnitools not working
/:cl:

* [NO GBP] Critical fixes for cyborg omnitools

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Singul0 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants