[PORT-ISH] Removes (almost) all of the goon folder, refactor gym code #9864
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
added 7 commits
September 14, 2023 19:32
oh and overhaul to the gym equipement
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
code/__DEFINES/layers.dm
Outdated
| @@ -19,6 +19,7 @@ | |||
| #define ZMIMIC_MAX_DEPTH 10 | |||
|
|
|||
| #define FLOOR_PLANE -7 | |||
| #define GAME_PLANE_UPPER -6 | |||
There was a problem hiding this comment.
What's this for? Seems like a left-over.
added 2 commits
October 30, 2023 07:55
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
PowerfulBacon
approved these changes
Dec 18, 2023
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.
About The Pull Request
Partially ports:
- tgstation/tgstation#75389 (only the code and sounds, icons recreated inspired on their machines)
This PR aims to remove (almost) entireley the goon folder, mainly by replacing the icons and sounds that where under their license. It also refactor the now gone
code\modules\mining\lavaland\ruins\gym.dm, by putting it into it's own dedicated folder and, also splitting it between punching bag and weight machine.A preview of the icons replaced are going to be under "Testing Photographs and Procedure"
Why It's Good For The Game
Removes the grand majority of the Goon folder, Less issues with licensing as soon the goon folder is fully removed.
Testing Photographs and Procedure
Screenshots&Videos
dreamseeker_rI22JQLLLW.mp4
dreamseeker_fFhLnWMB7n.mp4
Changelog
🆑 PestoVerde322, JohnFulpWillard
del: Removed the grand majority of the Goon icon
soundadd: Replaced some sounds with non-goon variants
imageadd: added new icons for the marijuana, gym equipement, dish driver and vault terminal
refactor: Gym equipment was reworked. You now buckle yourself to weight machines to use them, rather than clicking on it and getting stunned for a few seconds. It also means it works like a chair now.
tweak: Gym equipment no longer breaks a sweat in no gravity.
/:cl: