Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit d537e88ba23629870d4c1425f6c74193419e0531 Author: StrangeWeirdKitten <[email protected]> Date: Fri Dec 22 22:08:18 2023 -0700 Update sol_defense.dm commit a6f98b9260baaedbf83ed1f1d2c0606bdaea5d0c Merge: 9aceef22008 ea5eef9e700 Author: The Sharkening <[email protected]> Date: Fri Dec 22 21:52:56 2023 -0700 Merge branch 'master' into upstream-12/19/2023 commit 9aceef22008bcb20d4adb188c535fe8df1a105e1 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 23:30:07 2023 -0700 ^ This is a combination of 14 commits. ^ This is the 1st commit message: Upstream merge edits removes nulls JSX memes Update FishingBubbers.tsx repathing on maps Update tgstation.dme prettier + GOBLIN gas canister color Update secmed_closet.dmi I fixed shadekin, your welcome I fixed this too waddle failed my CI :( Reduces the frequency of miasma notifications/coughing. (#872) Automatic changelog for PR #872 [ci skip] Rebalances Sol-Fed Guns (#831) <!-- 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. --> This rebalances Sol-Fed weapons to be more distinct from each other, as well as more balanced in terms of damage and wounding. Update: Now has basic Sol-Fed sidearms behind weapons permit. This also makes each of the Sol-Fed weapons distinct from each other in purpose, rather than all of them being all-around. All weapons have been tested by hand!    <!-- 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. --> This prevents antagonists from being shut down in 5 seconds (hyperbole) like before, and allows for longer engagements and more opportunities to escape. Which is always better. <!-- 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. --> <!-- 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 it's 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: ReturnToZender, The Sharkening add: Department ordered SolFed guns add: Sol-Fed Firearms now require a weapons permit to order fix: Adjusted Sol weapon balance to be more fair /: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: The Sharkening <[email protected]> Automatic changelog for PR #831 [ci skip] This thing is still busted More shadekin memes Update human.dm Update human.dm I fixed the changelog more changeling oh I inch closer to removing shadekin please.. Ok Kilo Stuff I wasted 4 fucking hours over this one line sure god dammit Reverts icon cutting (for now) [MIRROR] Fixes input boxes [No gbp] [MDB IGNORE] (#25761) * Fixes input boxes [No gbp] (#80490) One of the quirks of react is that we're no longer using onChange the same as Inferno - React's version is a synthetic event. I made the mistake of thinking it would be okay. Many interfaces are using onChange events to send messages to byond (very laggy), others are using it to close the input (closes each keypress). So this was the alternative- I hope to replicate the behavior via onBlur && onEnter. I went through to undo most of the onInput -> onChange replacements of #80340 where it made sense. Other inputs which should safely use onChange (DEFINITELY to send messages) remain as such. Example of an input which used onChange now working with this PR:  Bug fixes Fixes #80486 :cl: fix: Name input in character setup should work properly now. fix: Many inputs should feel more responsive. /:cl: * Fixes input boxes [No gbp] --------- Co-authored-by: Jeremiah <[email protected]> [MIRROR] Fixes dropdowns not rendering the selection's displayText post-selection [MDB IGNORE] (#25755) * Fixes dropdowns not rendering the selection's displayText post-selection (#80464) What it says on the tin. Dropdowns were displaying the `selection` instead of `displayText` after clicking an option. Note: this bug was only _noticeably_ affecting dropdowns whose `selection` differed from `displayText`. In the below example, the dropdown uses numeric indices for `selection` and a string for `displayText`. In those cases the `displayText` should take precedence, not the other way around. <details><summary>From this</summary>  </details> <details><summary>To this</summary>  </details> Fixes a minor bug :cl: fix: fixes some dropdowns not displaying the right text after selecting something /:cl: * Fixes dropdowns not rendering the selection's displayText post-selection --------- Co-authored-by: Bloop <[email protected]> [MIRROR] Fixes some missed tgui files that needed prettier run on them [MDB IGNORE] (#25756) * Fixes some missed tgui files that needed prettier run on them (#80466) that's it. Nothing player facing * Fixes some missed tgui files that needed prettier run on them --------- Co-authored-by: Bloop <[email protected]> Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. I wasted 4 fucking hours over this one line sure god dammit Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee ^ This is the commit message #2: removes nulls ^ This is the commit message #3: JSX memes ^ This is the commit message #4: Update FishingBubbers.tsx ^ This is the commit message #5: repathing on maps ^ This is the commit message #6: Update tgstation.dme ^ This is the commit message #7: prettier + GOBLIN gas canister color ^ This is the commit message #8: Update secmed_closet.dmi ^ This is the commit message #9: I fixed shadekin, your welcome ^ This is the commit message #10: I fixed this too ^ This is the commit message #11: waddle failed my CI :( ^ This is the commit message #12: Reduces the frequency of miasma notifications/coughing. (#872) ^ This is the commit message #13: Automatic changelog for PR #872 [ci skip] ^ This is the commit message #14: Rebalances Sol-Fed Guns (#831) <!-- 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. --> This rebalances Sol-Fed weapons to be more distinct from each other, as well as more balanced in terms of damage and wounding. Update: Now has basic Sol-Fed sidearms behind weapons permit. This also makes each of the Sol-Fed weapons distinct from each other in purpose, rather than all of them being all-around. All weapons have been tested by hand!    <!-- 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. --> This prevents antagonists from being shut down in 5 seconds (hyperbole) like before, and allows for longer engagements and more opportunities to escape. Which is always better. <!-- 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. --> <!-- 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 it's 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: ReturnToZender, The Sharkening add: Department ordered SolFed guns add: Sol-Fed Firearms now require a weapons permit to order fix: Adjusted Sol weapon balance to be more fair /: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: The Sharkening <[email protected]> Automatic changelog for PR #831 [ci skip] This thing is still busted More shadekin memes Update human.dm Update human.dm I fixed the changelog more changeling oh I inch closer to removing shadekin please.. Ok Kilo Stuff I wasted 4 fucking hours over this one line sure god dammit Reverts icon cutting (for now) [MIRROR] Fixes input boxes [No gbp] [MDB IGNORE] (#25761) * Fixes input boxes [No gbp] (#80490) One of the quirks of react is that we're no longer using onChange the same as Inferno - React's version is a synthetic event. I made the mistake of thinking it would be okay. Many interfaces are using onChange events to send messages to byond (very laggy), others are using it to close the input (closes each keypress). So this was the alternative- I hope to replicate the behavior via onBlur && onEnter. I went through to undo most of the onInput -> onChange replacements of #80340 where it made sense. Other inputs which should safely use onChange (DEFINITELY to send messages) remain as such. Example of an input which used onChange now working with this PR:  Bug fixes Fixes #80486 :cl: fix: Name input in character setup should work properly now. fix: Many inputs should feel more responsive. /:cl: * Fixes input boxes [No gbp] --------- Co-authored-by: Jeremiah <[email protected]> [MIRROR] Fixes dropdowns not rendering the selection's displayText post-selection [MDB IGNORE] (#25755) * Fixes dropdowns not rendering the selection's displayText post-selection (#80464) What it says on the tin. Dropdowns were displaying the `selection` instead of `displayText` after clicking an option. Note: this bug was only _noticeably_ affecting dropdowns whose `selection` differed from `displayText`. In the below example, the dropdown uses numeric indices for `selection` and a string for `displayText`. In those cases the `displayText` should take precedence, not the other way around. <details><summary>From this</summary>  </details> <details><summary>To this</summary>  </details> Fixes a minor bug :cl: fix: fixes some dropdowns not displaying the right text after selecting something /:cl: * Fixes dropdowns not rendering the selection's displayText post-selection --------- Co-authored-by: Bloop <[email protected]> [MIRROR] Fixes some missed tgui files that needed prettier run on them [MDB IGNORE] (#25756) * Fixes some missed tgui files that needed prettier run on them (#80466) that's it. Nothing player facing * Fixes some missed tgui files that needed prettier run on them --------- Co-authored-by: Bloop <[email protected]> Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. I wasted 4 fucking hours over this one line sure god dammit Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72d97b462f647422ee4fd31a17c9c1c2. Revert "Reverts icon cutting (for now)" This reverts commit f07448f4fca2d1d47a7a0c49e82289fcbca0f758. lets gooo Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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. --> The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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. --> Less runtimes in the runtime menu. God there's so many. <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> Oops! Broke Job Estimation! (#877) <!-- 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. --> I accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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. --> Job estimation my beloved <!-- 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. --> <!-- 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> Automatic changelog for PR #878 [ci skip] Automatic changelog for PR #877 [ci skip] wee commit ea5eef9e7001d6cae4a5ac2c09e88aeee98267ea Author: Bubberbot <[email protected]> Date: Fri Dec 22 05:51:27 2023 +0100 Automatic changelog for PR #877 [ci skip] commit 1f2f7ecad14ab324c7ee7de7ee8459c533d56ea9 Author: Bubberbot <[email protected]> Date: Fri Dec 22 05:51:07 2023 +0100 Automatic changelog for PR #878 [ci skip] commit ea7f9a92c3b06c3bc8ce31ff0cc0e79703cb7fcd Author: ReturnToZender <[email protected]> Date: Thu Dec 21 22:43:24 2023 -0600 Oops! Broke Job Estimation! (#877) <!-- 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 accidentally removed an ! in the job estimation menu, meaning only people who switched it on actually showed on the menu. Of course, people didn't know this, and didn't turn off their preference. This fixes that.  <!-- 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 Job estimation my beloved <!-- 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. --> ## 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 it's 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: ReturnToZender fix: job estimation actually works again /: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. --> commit 756f2af7c7d45247ded402a79853b62edf461b02 Author: ReturnToZender <[email protected]> Date: Thu Dec 21 22:43:03 2023 -0600 Fixes Obscurity examine prefs runtiming on punpun (#878) <!-- 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 The PR that added this forgot to include a ?, so mobs without a client return null, and runtime, sometimes hundreds of time in a shift. This PR fixes that. <!-- 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 Less runtimes in the runtime menu. God there's so many. <!-- 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. --> ## 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 it's 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: ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /: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. --> commit 4189c63872dd00d19b38d94c018917826430cfc2 Author: Bubberbot <[email protected]> Date: Thu Dec 21 03:51:11 2023 +0100 Automatic changelog for PR #831 [ci skip] commit 739b2865783e57ea3e76fc1b9376f4cd8d361510 Author: ReturnToZender <[email protected]> Date: Wed Dec 20 20:50:02 2023 -0600 Rebalances Sol-Fed Guns (#831) <!-- 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 This rebalances Sol-Fed weapons to be more distinct from each other, as well as more balanced in terms of damage and wounding. Update: Now has basic Sol-Fed sidearms behind weapons permit. This also makes each of the Sol-Fed weapons distinct from each other in purpose, rather than all of them being all-around. All weapons have been tested by hand!    <!-- 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 This prevents antagonists from being shut down in 5 seconds (hyperbole) like before, and allows for longer engagements and more opportunities to escape. Which is always better. <!-- 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. --> ## 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 it's 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: ReturnToZender, The Sharkening add: Department ordered SolFed guns add: Sol-Fed Firearms now require a weapons permit to order fix: Adjusted Sol weapon balance to be more fair /: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: The Sharkening <[email protected]> commit 250f472b8a0be98d06a4efad5bdf333bec64848d Author: Bubberbot <[email protected]> Date: Wed Dec 20 18:11:22 2023 +0100 Automatic changelog for PR #872 [ci skip] commit 8d86f7e276e5e23f207818bf3b7e5f8600dc5131 Author: BurgerLUA <[email protected]> Date: Wed Dec 20 09:10:54 2023 -0800 Reduces the frequency of miasma notifications/coughing. (#872) commit 4d98032937bc448bc29a0d4ce69b4138f89efaa2 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 22:51:56 2023 -0700 Revert "jsx renames (hopefully shit works)" This reverts commit 4d766404667227ea6efd00be7b7773345009bd55. commit 4d766404667227ea6efd00be7b7773345009bd55 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 21:14:39 2023 -0700 jsx renames (hopefully shit works) commit 308bd0af73fc1e1609cd73fc08fb74d47529ec01 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 20:38:12 2023 -0700 i hate tgui commit deaf6b7a285bfbe7c687028c56bf22d8c38f651f Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 19:15:30 2023 -0700 Revert "Merge branch 'upstream-12/19/2023' of https://github.com/StrangeWeirdKitten/Bubberstation into upstream-12/19/2023" This reverts commit 49d8e940ebc5df43b5b6bf0770185fcbaa682b87, reversing changes made to 4bc68a4cb7d02eb74d03a430de934bddb229bcfb. commit 49d8e940ebc5df43b5b6bf0770185fcbaa682b87 Merge: 4bc68a4cb7d 515d34fa683 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 19:09:48 2023 -0700 Merge branch 'upstream-12/19/2023' of https://github.com/StrangeWeirdKitten/Bubberstation into upstream-12/19/2023 commit 4bc68a4cb7d02eb74d03a430de934bddb229bcfb Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 19:09:37 2023 -0700 Revert "tgui memes" This reverts commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505. commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 18:34:12 2023 -0700 tgui memes Update FishingBubbers.tsx Revert "tgui memes" This reverts commit 26907a086b59455a9ac347da4c268cf9c7f529f8. memes tgui fuck shit commit 515d34fa68333dc3d86f69f56c6897b2c70378b4 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 18:51:22 2023 -0700 memes tgui fuck shit commit 44f8f3cea56ad024f85c986837f64661200d80a3 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 18:42:22 2023 -0700 Revert "tgui memes" This reverts commit 26907a086b59455a9ac347da4c268cf9c7f529f8. commit 26907a086b59455a9ac347da4c268cf9c7f529f8 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 18:34:12 2023 -0700 tgui memes Update FishingBubbers.tsx commit a32a682f40d9aa5e01dd277c125a2a7c8ef63612 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 18:10:13 2023 -0700 security medic was murdered commit 27c369d73da847091b81aaf8b7dbef723cebcacd Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 17:29:54 2023 -0700 Removes more synth stuff + rewords defines for borgs commit 154c07704e740a122a13e2b89c8d9bc202b6bff9 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 17:12:44 2023 -0700 Canister + loot removal + synth recharging code removal commit b17764f46c58ceb9818834d426d595e435a19d08 Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 17:03:11 2023 -0700 map fixes for lockers commit d9c129425dc4df90ba938f172474a0b8b1241ecb Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 16:56:44 2023 -0700 Some fixes commit 28a4a6f6e16c2dfe275d5cfdfc21f774d699f35d Author: StrangeWeirdKitten <[email protected]> Date: Tue Dec 19 09:25:32 2023 -0700 missed comma
- Loading branch information
1 parent
5e95011
commit 66f7878