-
Notifications
You must be signed in to change notification settings - Fork 1
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
Make Starfly Build Again #71
Merged
Merged
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
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request SDMM: ![StrongDMM-2024-04-21 04 36 46](https://github.com/shiptest-ss13/Shiptest/assets/95449138/79f98fe2-47ab-4c5a-a063-c5ef42902c15) ![StrongDMM-2024-04-21 04 36 49](https://github.com/shiptest-ss13/Shiptest/assets/95449138/fec77936-0dd1-485f-8c5e-fa68b9ec5b91) Ingame: ![image](https://github.com/shiptest-ss13/Shiptest/assets/95449138/f217f1cf-70da-4c3b-b3a9-8914989e7ea6) Adds a new ruin for rockplanet. Its an abandoned shipping dock previously used by traders and smugglers in the sector. It has since fallen into disrepair, forgotten by its owners. Malicious scavengers or other groups have since filled the place with devious traps, hoping to catch their competition (You) off guard. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game more ruins that arent free rnd or gamer loot are good please map more ruins <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: rockplanet_shippingdock.dmm and associated code /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: spockye <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request # You cannot tell me these fucking things are blocking the vacuum of space. ![Baggage-Claim-Strip-Curtain-Kit-Shop-All-StripCurtaincom_500__00450](https://github.com/shiptest-ss13/Shiptest/assets/95449138/e9397556-db2f-4fac-aa05-5c4fa490ec93) (Makes plastic flaps no longer block atmos and changes the name and desc to match.) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Players should not be able to construct a budget-tinyfan for 5 plastic with only the caveat of having to crawl under it. Using these to cover bay doors has been frowned upon for a while and it should have been fixed when tinyfans were phased out. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: del: Plastic flaps no longer block atmos /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request replaces all ruin and ship comms consoles with frames <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Ships should not have access to some of these global things ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/38354c7b-c902-441a-b814-d86eb1e6630a) <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: del: Removed comms consoles from ruins and ships /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Does what it says on the tin! ![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/90a7deb1-bfb6-4f39-8b9e-eb5dc76dff6f) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game It looks real pretty :) <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: PositiveEntropy imageadd: Computers now look sleeker! /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request I love my cargo pack typepaths :) ## Changelog :cl: fix: mech laser cargo crate is no longer unbuyable /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Signed-off-by: Theos <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Adds generic ammo boxes, printable in the autolathe. They can be set to hold any ammo type by using a bullet on it, and the capacity changes depending on the bullet type. Also makes ammo cans autolathe printable. Replaces a few instances of update_appearence with update_ammo_count in ammo box code so the materials properly update. Thanks to FalloutFalcon for the idea ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Basically a redo of my other PR, #2868 intentwise. This PR aims to make ammo storage more practical by adding these generic ammo boxes to prevent having loose rounds everywhere if you don't have a compatible ammo box with space. Ammo cans are basically just themed toolboxes, so they're just nice to have thematically as well. Also some bug fixes I guess, that's good. ## Changelog :cl: add: Generic Ammo Boxes, printable in the autolathe add: Ammo cans are printable in the autolathe fix: Ammo boxes sometimes not properly updating their materials /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Ports some mojave code (originally written on Daedalus by Spyroshark) hat allows you to fling ingame objects with a simple, bouncing physics quality. This is currently implemented on bullet casings. Technical issues currently: - [x] Makes the bouncing less dramatic - [x] Physics must have a "low grav" version for tiles without gravity, since mojave didn't think gravity was real - [x] The code handling the angle physics objects travel at is fucky and needs to be fixed up <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game the hit feature from 2003, coming to a shiptest near you <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Spyroshark, Sun-Soaked add: A movable physics subsystem, deployed using a component. add: Bullet casings now drop using movable physics code: ports NO_PIXEL_RANDOM_DROP from TG. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: Sun-Soaked <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Implements new defines set in power.dm for nearly all machines using idle/active_power_usage Kills auto_use_power() in favor of useStaticPower() procs Standardizes power draws for most things using said defines Decreases power used for lighting by half Generally increases power used by machinery, especially those that are only active for short periods. SSUs now consume power when decontaminating, ORMs and vending machines now take idle power. ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/071f8fa8-0639-4fb5-9c3c-5b4b4ad254e4) If you have any feedback, feel free to share it! Most of these numbers are based on their original values, so definitely could be changed. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game This PR standardizes the draw of most machinery, while making it easier to change power use across the board. Additionally, lighting takes less power, while actual machines have been tweaked to fill this gap. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: tweak: SSUs draw power to decontaminate balance: lights no longer take 60% of a ships power, machines use more to account for this. code: added standardized defines for power usage /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: HelmCrab <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
Loading rockets and rifle ammo into the revolver is prohibited <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: Fix revolver ammo check /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: Sun-Soaked <[email protected]>
## About The Pull Request default whitesands hermits now pull from the "survivor" loot variant rather than no loot variant hunters spawning now actually delete the old hermit mob, rather than committing mitosis hermit loot has been compactified, defaults are now declared in the object rather than initialize, and variant-specific loot now uses a switch statement fixes a bug where non-gunslinger hermits had their pockets overwritten with default equipment, they will now sometimes have goliath steaks, cash (for melee hermits) or .300 BLK strippers (hunters) in their pockets reduces the cash bundle melee hermits can drop from a medium random (500-3000) to small random (100-500) bundle since they are quite common. This can be reduced further if deemed necessary. ## Why It's Good For The Game babe it's 3:00 PM time for your code scrunching ## Changelog :cl: fix: melee hermits now pull from the "survivor" loot variant rather than no loot variant fix: hermits can no longer commit mitosis tweak: hermit loot has been compactified, defaults are now declared in the object rather than initialize, and variant-specific loot now uses a switch statement fix: all hermits now have pocket loot randomized as intended tweak: reduces the cash bundle melee hermits can drop from a medium random (500-3000) to small random (100-500) bundle since they are quite common /:cl: Signed-off-by: Theos <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Portable generators all have different burn times. This unifies them. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game The superpacman was actually inferior, and considerably so, to the regular pacman in total energy generated. A pacman had a time_per_sheet of 260, while a superpacman was only 85 for only double the power! This made it inferior in every way, because uranium is also quite rare. While there are no obtainable mrspacmans as far as I am aware, I find no reason to have any of these generators set with different burn times. This simplifies it by unifying all of them into the same base time_per_sheet of 260. I am aware this is going to mess with balance a little bit, but I believe that simplifying the amount of variables in play will help make balancing easier in the long run, because it isn't immediately obvious that there were different sheet burn times. Balance should be affected by changing power generated, uranium spawn rate, number of sheets and generators at round start... etc, not some property that you can't see unless you stand there comparing generators side by side. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: tweak: All pacman and its variants now have the same sheet burn times. Superpacmans are no longer the vastly inferior generator. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Co-authored-by: FalloutFalcon <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Resolves shiptest-ss13/Shiptest#2802 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Bugs bad, yeah? <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: fbp and rilena hoodies now work as intended /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request currently it uhhhhhhhhh stacks with itself :3 ## Why It's Good For The Game fix ## Changelog :cl: fix: prismwine's burn resistance can no longer end up stacking /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Signed-off-by: Theos <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Double beds have been craftable for a while, HOWEVER double bedsheets have been largely rare. That ends NOW. ## Why It's Good For The Game lets blorbos be comfy ## Changelog :cl: add: Double bedsheets, fit for double beds, are now craftable via cloth. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code change
Watch something violently break.
Config
Watch us shake head admins violently until this gets merged.
Dependencies
DME Edit
Do Not Merge
You probably made someone angry, or you're stopping people from getting angry.
GitHub
Our very own Babylon.
Map Change
Tile placing is hard. Thank you for your service.
Sound
USSR Anthem 2.66 MB file.
Sprites
A bikeshed full of soulless bikes.
TGUI
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
There were some PR commits that broke the build. This PR is intended to fix up the build.
Why It's Good For The Game
It's good to be able to build the game.