Upstreaming #9
Merged
Upstreaming #9
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
…y component menu (#85653) ## About The Pull Request Added rounding to 1 number after point to prevent FPEs and made the scale bar shrink when component menu gets open as to prevent it from getting covered by the menu, which made it impossible to see or increase current scale ## Changelog :cl: fix: Circuit UI scale no longer has weird rounding fix: Circuit UI no longer gets covered by components menu /:cl:
… backpack to drop (#85671) ## About The Pull Request Closes #85669 ## Changelog :cl: fix: Fixed Charlie MOD installer not installing MODsuit unless you have a backpack to drop /:cl:
… backpack to drop
## About The Pull Request Fixes swapped arguments to a do_after, allowing tadpoles to be scooped from puddles ## Why It's Good For The Game bug bad ## Changelog :cl: fix: tadpoles can actually be scooped from ponds /:cl:
[MIRROR] Fix tadpole scooping
[MIRROR] Fixed Charlie MOD installer not installing MODsuits unless you have a backpack to drop
Fixes the milsim bitrun safehouse being a hole
## About The Pull Request I think I may have forgotten to remove it from the final version of the persistent piggy banks PR (museum cafeteria yadda yadda) ## Why It's Good For The Game Unused var. ## Changelog N/A
## About The Pull Request All references to "Waffle Co" and "Waffle Company" have been scrubbed and replaced with appropriate branding. "The Waffle Corporation" may be shortened to "Waffle Corporation", "Waffle Corp" or "Waffle Corp." only. All references to "Donk Corp." and "Donk Corporation" have been scrubbed and replaced with appropriate branding. "Donk Company" may be shortened to "Donk", "Donk Co" or "Donk Co." only. ## Why It's Good For The Game Keeps these names consistant and lore accurate. ## Changelog :cl: spellcheck: fixed many incorrect spellings of Waffle Corp and Donk Co. /:cl: --------- Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@ users.noreply.github.com>
## About The Pull Request Adds the xeno action figure, a mime-only lighter, and some Leary's Delight cigs (for RDS havers) to the loadout. ## Why It's Good For The Game More variety is always good, and these shouldn't break the balance of the game. We already have mindbreaker pills, too. ## Proof Of Testing   ## Changelog :cl: add: Added Leary's Delight cigs, a xeno action figure, and a pale zippo to loadout /:cl: --------- Co-authored-by: Waterpig <[email protected]>
…lk to station abductors (#1926) <!-- 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 as the title says <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game closes #1661 <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Proof Of Testing  <!-- Compile and run your code locally. Make sure it works. This is the place to show off your changes! We are not responsible for testing your features. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: fixed abductors in deathmatch talking to station abductors /: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. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: Waterpig <[email protected]> Co-authored-by: Waterpig <[email protected]>
allows for port tarkon to do ordnance for research now
[MIRROR] Fixes Donk Co. & Waffle Corp Trademark Issues
[MIRROR] Removes an unused var from SSpersistence
[MIRROR] Circuit UI scale no longer suffers from FPEs and doesnt get covered by component menu
Bounty cube export gate
## About The Pull Request It's an ancient uncommented undocumented commit to master that breaks sec PDAs making them not imprint + they have belts in lockers for a reason. Holy shit was this hard to find even though I knew what the issue was. Worst part is nevi obfuscated it by squashing old bubber changes. Ill genuinely have to go through that commit one day. fixes #1940 ## Why It's Good For The Game I will not have sec PDAs fucked by undocumented changes from a year ago ## Proof Of Testing I pray to the high gods (It's compiling) ## Changelog :cl: balance: Sec no longer spawn in with fully loaded belts as it was an old undocumented change that introduced a bug /:cl:
Boring fixes (Fixes the borer infestation event)
[Non-Modular] Fixes ID clock out taking your job items if you clock out an ID that isn't yours
## About The Pull Request fixes #1708 ## Why It's Good For The Game Less confusing for newer people ## Changelog N/A
This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging. Full changelog can be found [here](https://raw.githubusercontent.com/tgstation/tgstation-server/gh-pages/changelog.yml). - Added consumer APIs for overriding HTTP GET implementation. (tgstation/tgstation-server#1853 @ Cyberboss) - Fixed Discord documentation links. (tgstation/tgstation-server#1853 @ Cyberboss) - Use IETF RFC 2119 wording in documentation. (tgstation/tgstation-server#1853 @ Cyberboss) - Populate some documentation comments for previously undocumented public entities. (tgstation/tgstation-server#1853 @ Cyberboss) #tgs-dmapi-release Co-authored-by: tgstation-server-ci[bot] <161980869+tgstation-server-ci[bot]@ users.noreply.github.com>
…cies description and species lore if the player doesn't have a custom one set (#1946) ## About The Pull Request when you don't set a custom species, the tab in the examine panel will grab the description and lore for the species you have set (Human, felinid, lizardperson, etc) Currently the description part is not working, and if the lore part has multiple items in its list, it only displays the first one, this PR fixes both ## Why It's Good For The Game closes #1944 ## Proof Of Testing  ## Changelog :cl: fix: custom species lore properly displays /:cl: --------- Co-authored-by: Waterpig <[email protected]>
## About The Pull Request Absolutely nothing has changed, it just runs faster now ## Why It's Good For The Game It's like 30 less CPU cycles on a thing that happens once a 100 rounds. What is wrong with me ## Proof Of Testing  ## Changelog :cl: code: Makes the empty synth body spawn logic run faster /:cl:
[MIRROR] Automatic TGS DMAPI Update
fixes borg sprites losing their lights when changing z levels or toggling CI
…o upstream-24-08b
## About The Pull Request Adjusts the Dullahan Ninja sprite and adds in a module for clown. ## Why It's Good For The Game Ninja was lazyily done, still is but it's less obnoxious now imo. Clown for missing module type for those weird people. (me). ## Proof Of Testing  ## Changelog :cl: add: Dullahan Clown borg change: Dullahan ninja borg /:cl: Co-authored-by: projectkepler-RU <[email protected]>
…iggering. (#1952) ## About The Pull Request Significantly Boosts the chances of the Wizardly Die of Fate event triggering. The event now has a 20% chance not to announce the existence of a Wizardly Die of Fate The event is now as common as the shuttle getting replaces by a disaster. ## Why It's Good For The Game I've been getting complaints that this event is still extremely rare. This PR should fix that. People want more wizard rounds. This should grant more wizard rounds. The announcement chance tweak should also be more interesting. ## Proof Of Testing Untested. ## Changelog :cl: BurgerBB balance: Significantly Boosts the chances of the Wizardly Die of Fate event triggering. The event now has a 20% chance not to announce the existence of a Wizardly Die of Fate /:cl:
… into upstreaming
Shroopy
pushed a commit
that referenced
this pull request
Dec 7, 2024
# This is the 1st commit message: goofsec hud # This is the commit message #2: the sensible tgui errors # This is the commit message #3: Gets it to compile # This is the commit message #4: Fixes all extra runtimes # This is the commit message #5: TGUI Fixes 1 # This is the commit message #6: Removes open dream check # This is the commit message #7: Ticked file enforcement # This is the commit message #8: A very harsh way to fix potential missing icons # This is the commit message #9: Wipes all the errorneously included files # This is the commit message #10: fixes missing_icons fully # This is the commit message #11: some extra ci fixes before I forget # This is the commit message #12: WHAT THE FUCK # This is the commit message #13: really? # This is the commit message #14: bye waffles # This is the commit message #15: hooray
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.
No description provided.