39 Commits

Author	SHA1	Message	Date
projectkepler-RU	24399318eb	Upstream Merge 23/8/2024 (#1996) ... <!-- 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! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game <!-- 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. --> 🆑 add: Added new mechanics or gameplay changes add: Added more things del: Removed old things qol: made something easier to use balance: rebalanced something fix: fixed a few things sound: added/modified/removed audio or sound effects image: added/modified/removed some icons or images spellcheck: fixed a few typos code: changed some code refactor: refactored some code config: changed some config setting admin: messed with admin stuff server: something server ops should know /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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: nikothedude <59709059+nikothedude@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@ gmail.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com> Co-authored-by: Changelogs <action@github.com>	2024-08-23 02:00:17 +00:00
Waterpig	004e466cea	Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406b	2024-06-08 14:33:29 +02:00
SkyratBot	24151d1228	[MIRROR] Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from GLOB to a datasystem (#27561) ... * Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from `GLOB` to a datasystem * Merge branch 'master' of https://github.com/tgstation/tgstation * Moves everything I can think of to the subsystem * Seems to be working fine now * makes it compile --------- Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Waterpig <wtryoutube@seznam.cz>	2024-06-08 09:35:22 +05:30
nevimer	45e52eb774	Merge remote-tracking branch 'skrat/master' into new-bubbermaster ... # Conflicts: # _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm # _maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm # _maps/map_files/Birdshot/birdshot.dmm # _maps/map_files/Deltastation/DeltaStation2.dmm # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/map_files/MetaStation/MetaStation.dmm # _maps/map_files/NorthStar/north_star.dmm # _maps/map_files/VoidRaptor/VoidRaptor.dmm # _maps/map_files/tramstation/tramstation.dmm # _maps/shuttles/pirate_ex_interdyne.dmm # code/__DEFINES/mobs.dm # code/__HELPERS/~skyrat_helpers/is_helpers.dm # code/datums/mood.dm # code/game/objects/effects/spawners/random/random.dm # code/modules/admin/verbs/adminhelp.dm # code/modules/clothing/head/jobs.dm # code/modules/mob/living/brain/brain_say.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png # code/modules/uplink/uplink_items/job.dm # config/lavaruinblacklist.txt # icons/mob/actions/actions_changeling.dmi # icons/mob/clothing/mask.dmi # icons/obj/mining.dmi # modular_skyrat/master_files/code/modules/client/preferences/headshot.dm # modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm # modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm # modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi # modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi # modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/metal_overlays.dmi # modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm # modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm # modular_skyrat/modules/hyposprays/code/hypospray_kits.dm # strings/traumas.json # tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/headshot.tsx	2024-04-20 22:19:03 -04:00
jjpark-kb	b2a97d82de	some primitive changes (#26730) ... Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>	2024-04-18 17:31:46 +02:00
StrangeWeirdKitten	66f787818f	Squashed commit of the following: ... commit d537e88ba23629870d4c1425f6c74193419e0531 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Fri Dec 22 22:08:18 2023 -0700 Update sol_defense.dm commit a6f98b9260baaedbf83ed1f1d2c0606bdaea5d0c Merge: 9aceef22008 ea5eef9e70 Author: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Fri Dec 22 21:52:56 2023 -0700 Merge branch 'master' into upstream-12/19/2023 commit 9aceef22008bcb20d4adb188c535fe8df1a105e1 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> 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. --> 🆑 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 /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> 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 🆑 fix: Name input in character setup should work properly now. fix: Many inputs should feel more responsive. /🆑 * Fixes input boxes [No gbp] --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> [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 🆑 fix: fixes some dropdowns not displaying the right text after selecting something /🆑 * Fixes dropdowns not rendering the selection's displayText post-selection --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> [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 <13398309+vinylspiders@users.noreply.github.com> Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 4dce402e72. 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 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 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 /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> 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 🆑 fix: Name input in character setup should work properly now. fix: Many inputs should feel more responsive. /🆑 * Fixes input boxes [No gbp] --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> [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 🆑 fix: fixes some dropdowns not displaying the right text after selecting something /🆑 * Fixes dropdowns not rendering the selection's displayText post-selection --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> [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 <13398309+vinylspiders@users.noreply.github.com> Revert "Fixes false walls icons using the wrong icon files (#80175)" This reverts commit 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 4dce402e72. 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 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 4dce402e72. 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 ea5eef9e70 Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Dec 22 05:51:27 2023 +0100 Automatic changelog for PR #877 [ci skip] commit 1f2f7ecad1 Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Dec 22 05:51:07 2023 +0100 Automatic changelog for PR #878 [ci skip] commit ea7f9a92c3 Author: ReturnToZender <donwest947@gmail.com> 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. --> 🆑 ReturnToZender fix: job estimation actually works again /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 756f2af7c7 Author: ReturnToZender <donwest947@gmail.com> 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. --> 🆑 ReturnToZender fix: Runtime on obscurity examine prefs when the mob in question lacks a client /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 4189c63872 Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Thu Dec 21 03:51:11 2023 +0100 Automatic changelog for PR #831 [ci skip] commit 739b286578 Author: ReturnToZender <donwest947@gmail.com> 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. --> 🆑 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 /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> commit 250f472b8a Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Wed Dec 20 18:11:22 2023 +0100 Automatic changelog for PR #872 [ci skip] commit 8d86f7e276 Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Wed Dec 20 09:10:54 2023 -0800 Reduces the frequency of miasma notifications/coughing. (#872) commit 4d98032937bc448bc29a0d4ce69b4138f89efaa2 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 22:51:56 2023 -0700 Revert "jsx renames (hopefully shit works)" This reverts commit 4d766404667227ea6efd00be7b7773345009bd55. commit 4d766404667227ea6efd00be7b7773345009bd55 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 21:14:39 2023 -0700 jsx renames (hopefully shit works) commit 308bd0af73fc1e1609cd73fc08fb74d47529ec01 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 20:38:12 2023 -0700 i hate tgui commit deaf6b7a285bfbe7c687028c56bf22d8c38f651f Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 19:09:37 2023 -0700 Revert "tgui memes" This reverts commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505. commit e0e00728d2f21bbf61a5bf7c5d9e32265fa6d505 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> 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 <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 18:51:22 2023 -0700 memes tgui fuck shit commit 44f8f3cea56ad024f85c986837f64661200d80a3 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 18:42:22 2023 -0700 Revert "tgui memes" This reverts commit 26907a086b59455a9ac347da4c268cf9c7f529f8. commit 26907a086b59455a9ac347da4c268cf9c7f529f8 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 18:34:12 2023 -0700 tgui memes Update FishingBubbers.tsx commit a32a682f40d9aa5e01dd277c125a2a7c8ef63612 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 18:10:13 2023 -0700 security medic was murdered commit 27c369d73da847091b81aaf8b7dbef723cebcacd Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 17:29:54 2023 -0700 Removes more synth stuff + rewords defines for borgs commit 154c07704e740a122a13e2b89c8d9bc202b6bff9 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 17:12:44 2023 -0700 Canister + loot removal + synth recharging code removal commit b17764f46c58ceb9818834d426d595e435a19d08 Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 17:03:11 2023 -0700 map fixes for lockers commit d9c129425dc4df90ba938f172474a0b8b1241ecb Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 16:56:44 2023 -0700 Some fixes commit 28a4a6f6e16c2dfe275d5cfdfc21f774d699f35d Author: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue Dec 19 09:25:32 2023 -0700 missed comma	2023-12-23 00:24:15 -07:00
Ephemeralis	9ebb2b1d56	The Bird Is The Word: Avian Traits quirk for tweeting, chirping, and shrieking (#25063) ... * Add Avian Traits perk, allowing characters to sound like birds * Ensure only one racial speech quirk is taken to prevent weirdness * Add racial trait definitions for canine & avians, plus species helper macros * Remove duplicate trait & tidy up defines * Proper overload Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>	2023-11-18 10:39:54 -05:00
SkyratBot	b9f559776e	[MIRROR] Replaces Upgraded Cybernetic Ears with two new variants [MDB IGNORE] (#22854) ... * Replaces Upgraded Cybernetic Ears with two new variants (#75931) ## About The Pull Request Adjusts the placement of basic and upgraded cybernetic ears in the research tree and adds two new variants: Whisper-sensitive Cybernetic Ears, which make it slightly easier to hear whispers from a tile away, at the cost of higher vulnerability to flashbangs and other loud noises; and Wall-penetrating Cybernetic Ears, which allow you to 'hear through walls' so to speak, also at the cost of higher vulnerability to loud noises. Basic cybernetic ears are now in basic medical tech node, meaning that medbay can print them roundstart the same as other basic cybernetics. The upgraded cybernetic ears are now unlocked with the other tier 2 cybernetics. The two new ear variants are unlocked with the other tier 3 cybernetic organs, and the luminiscent and welding shield eyes have also been moved there from the cybernetic implants node for consistency reasons. The whisper ears allow you to clearly hear whispers from up to seven tiles away, the same range where you can hear normal speech. The wall-penetrating ears allow you to hear normal speech within seven tiles even through walls. Due to technical limitations, runechat popups do not show up for people you can't see, but the messages will still show up in chat. ## Why It's Good For The Game Currently, upgraded cybernetic ears are very underwhelming compared to other high-tier cybernetic organs. All other high tier organs provide some sort of benefit; even if the benefit is minor like a built-in flashlight, a slightly higher tolerance to alcohol and toxins, or higher tolerance to disgusting food. This change is intended to grant similarly minor but useful benefits to the cybernetic ears. ## Changelog 🆑 add: Added whisper-sensitive cybernetic ears, which make it much easier for the user to hear whispers at the cost of being more vulnerable to loud noises add: Added wall-penetrating cybernetic ears, which allow you to hear speech through walls balance: Basic cybernetic ears and upgraded cybernetic ears are now unlocked with the other basic/normal cybernetics balance: The welding shield and luminiscent cybernetic eyes are now unlocked with the other upgraded cybernetics /🆑 * Replaces Upgraded Cybernetic Ears with two new variants * Modular adjustments * Linters * Linters --------- Co-authored-by: GPeckman <21979502+GPeckman@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>	2023-08-03 06:51:26 -04:00
SkyratBot	649c250702	[MIRROR] JSON Logging Take Two [MDB IGNORE] (#21329) ... * JSON Logging Take Two * Fixes the conflicts and makes our logs all comply with the new logging framework, hopefully. --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>	2023-05-28 18:10:07 -04:00
SkyratBot	abf148d62b	[MIRROR] World Initialization Refactor [MDB IGNORE] (#20755) ... * World Initialization Refactor * Update .github/CODEOWNERS * Update code/__HELPERS/global_lists.dm * Add logging for manually changing your targeted zone (#72814) See title. Surgery hud is exempt from this. Requested by @Mothblocks Signed-off-by: GitHub <noreply@github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com> * eee * Update tgstation.dme --------- Signed-off-by: GitHub <noreply@github.com> Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>	2023-04-26 22:46:55 +01:00
SkyratBot	15faaa54f5	[MIRROR] Rewrites how action buttons icons are generated, makes them layer nicer. Allows observers to see a mob's action buttons. [MDB IGNORE] (#17907) ... * Rewrites how action buttons icons are generated, makes them layer nicer. Allows observers to see a mob's action buttons. * conflicts * Modular! * update modular * icon icon icon icon icon Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: Funce <funce.973@gmail.com>	2022-12-16 16:01:41 +00:00
Rimi Nosha	c53f28969e	[99% MODULAR] Synth and IPC Unification and Extended Customization! (#16967) ... * What am I looking at? * Okay, now limbs and switching to the three other types of synth! * Hey, it compiles, but *definitely* doesn't work! * Has a slight chance of working now! * Actually compiles properly now! * Nice one, dork * Fuck limb code. * And this is the story behind where the last 8 hours of my life went! * My code will now throw the rattle if you do dumbdumb. * I'M SORRY, MODULARITY * Final code, maybe? * Hmm, yes, today I will leave debug logs in my commits. * Hmmm, maybe not enable that by default. * Oh yea, nice one, dork. * Oh yea, digitigrade exists. Also fixes all known runtimes. Also fixes me forgetting a couple of *very* important things. * I feel special. * Small bit of code cleanup! * Android parts! * Go away Blueshift compile error! * E * More code fixes! * Synthliz fix * Haha, shitcode go brrrr * AAAAAAAAAAAAAAA * Fix screenshot tests! * Listen here you little shit- * idontknowwhythisisbreakingantennasbutyoucankeepthenameiguess * FUCK * Turns out some antennas *do* use more than one colour, ugh. * Nice one, genius. * Address reviews, and also change IPC antennas to tri_bool instead of toggle- woops! * Now that I know roughly how sprite accessories work, let's fix this at long last so I can finally get this merged. * Oh yea, this! * Oops, nice catch, unit tests! * Very cool, PDA update * Yeet! * Apply suggestions! * Oops! * WHY DIDN'T YOU COMMIT * I'm getting tired of fixing these conflicts. * Ugh. * Fix my shitcode, also make erp genitals check less intensive * FUCK * I am still suffering * Fix * e * Fucking LEGS * Fucking GREYSCALE * REMOVE THIS BEFORE MERGE, DUMBASS * Nevermind, this is unironically the best way to do it due to how our really weird prefscode works... pain. * Stupid organic interface code edit	2022-12-14 18:22:55 -05:00
BluBerry016	293628ff0c	[Fixes Broken Mirror: #14965] Greyscales ID Trims (#17774) ... * Gets Rid of a salt comment from years ago first lmao * (Properly) Mirrors #14965 * Update jobs.dm * Shite! Guess we have to include that here too	2022-11-27 07:56:53 -08:00
Tastyfish	e9912f0adc	[MOSTLY MODULAR] Makes cortical borer a basic mob. (#17140) ... Makes cortical borer a basic mob.	2022-10-28 02:55:15 +01:00
Zonespace	c4a2db206c	Replaces some borer progression with an upgrade tree (#16704) ... * borer wormening * time to go * synthetic boring * lc-chest * cleans unneeded logic * warn against only 1 T3+ * _	2022-10-08 19:56:21 -04:00
Tom	b85dd9dc9b	Adds cat helper, makes cat behaviour more consistent (#16078) ... * adds cat helper, makes cat behaviour more consistent * move trait to positive * Update modular_skyrat/master_files/code/datums/traits/good.dm * review * quirk to neutral	2022-09-13 15:55:30 -04:00
candle :)	b6ce35824c	adds newvox modsuits, edits some files for future vox modsuit tails when they're done (#14416) ... * eaeae * ea * vfsfdg	2022-06-21 03:30:07 +01:00
Gandalf	15581123b0	Vox version Beanyvox (#13400) ... * wew * restore * wew * Create vox.dm * yes * weh * updat * Update _basemap.dm * fixed * color options and more fixes * wew * more fixes * Update vox_bodymarkings.dmi * beak and fix * e * Update hands.dmi * fdx * wew * Update hands.dmi * e * fux * feet fixes * Update mask.dmi	2022-06-19 22:06:43 +01:00
Ghom	d1143486fc	[SEMI-MODULAR] Removes redundant genital toggles + splits up "Uses skintones" in mutiple prefs. (#12781) ... * [SEMI-MODULAR] Removes redundant genital toggles + splits up "Uses skintones" in mutiple prefs. * Tested and fixed, then tested again. * linter, thank you. * ops * maintainer review and color prefs accessibility * doc and defines * wait no * trailing newline	2022-04-26 02:03:27 +01:00
Nerevar	ffaabe8360	[Ready] [Semi-Modular] Roundstart Snails (#12800) ... * snailshouse * taste * last hurdle hopefully * small sprite change * shellllll * so called free thinkers when they properly document their skyrat edits * one last job. * Fixing runtimes?? * wew * yes * you should listen to Landlord - Yot Club it's pretty good * holy shit i look like such a clown w/ these commits * WEW * metal gear rising redefined * let's kick shell * we might be onto something * last thing * Fifty years have passed, but I do not age. Time has lost its effect on me. Yet the suffering continues. Aku's grasp chokes the past, present, and future. * wew Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com> Co-authored-by: nevimer <foxmail@protonmail.com>	2022-04-21 15:18:29 +01:00
Gandalf	ba7c15aee2	More fixes (#12702) ... * wew * Update preferences.dm * Update logging.dm * Update preferences.dm * Update preferences.dm	2022-04-19 23:48:56 +01:00
Gandalf	d9ae8b2a88	Black Mesa: Xen (#12308) ... * Update blackmesa.dmm * Black Mesa: Xen * e * e * e * e * e * Update lambda_teleporter.dm * Update lambda_teleporter.dm * Update blackmesa.dmm * e * puzzle * refactors paths * more xen headcrap fixes * headcrap jumping! * Update headcrab.dm * Update headcrab.dm * nearly done * w * e * ready for testing * e * e * fixed to beam * fixes * Update headcrab.dm * e * e * fixes * balancing * Update blackmesa.dmm * vortussy * fxes * Follow component * e * friendly guard * e * Update mob_spawners.dm * fixes * 0 * Update hev_suit.dm	2022-04-02 09:58:35 +01:00
Zonespace	9d366364e6	[MODULAR] Adds a wall-piercing LOOC verb (#11935) ... * sure * Update code/__HELPERS/~skyrat_helpers/unsorted.dm Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> * woo * fix * fix Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>	2022-03-13 23:40:56 -04:00
Tom	da50b21d45	Cleans up and fixes a logging issue. (#11208)	2022-02-05 20:52:04 -05:00
RatFromTheJungle	40fe2de00a	[STILL NOT MODULAR] Adding Hemophages (#9681) ... * Create hemophage.ts * Update scan_gate.dm * Update revenant_abilities.dm * Update species.dm * Update species.dm * Create hemophage.dm * Update SpeciesPage.tsx * Update data.ts * Update DNA.dm * Update is_helpers.dm * Update ScannerGate.js * Update sensor.dm * Update game_options.txt * Update species.dm * Update ScannerGate.js * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update hemophage.dm * Update hemophage.ts * Update hemophage.ts * Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/species/hemophage.ts Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/species/hemophage.ts Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update hemophage.ts * Update hemophage.dm * Update hemophage.dm * Update tgstation.dme * Update hemophage.dm * Update hemophage.dm * dont be angry map merge bot please * Update alcohol_reagents.dm * Update alcohol_reagents.dm * final fix Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>	2021-11-28 14:23:02 -05:00
Seris02	99a6fe31f2	[SEMI-MODULAR?][TESTMERGE FIRST] Glow in the dark markings/bodyparts/eyes (#8960) ... * FUCKIN WOOO * much better * yesssssss * yeetus deletus the merge conflictus dies * fug that was an oops * better * linters are weird * woops I erased tesh tails * better * wingfix Co-authored-by: Gandalf <jzo123@hotmail.com>	2021-11-06 22:41:29 -04:00
NotRanged	143dea00eb	[Semi-modular] Adds Teshari (#8663) ... * Initial commit, first PR added, small sprite tweaks done myself * hardsuit tail sprite and more modifications * Language and stuff, most of second PR * idk what I did here because I slept between commits but probably a lot * Adds many many matrix coloured earsprites fuck me this was a lot of work * Species page, body markings and final cosmetic changes * Small tail tweak * Small clothing sprite tweak * Linter: trailing newline * schechi icon made, code clothing moved to modular/master file * Some suggestions implemented * Comments etc * snake_case * Changes var names, rejects body size modification * again but properly this time * Moves clothing pixel stuff into defines * Quirks can be restricted for some species now * And now it actually works * Move to modular file * removes species quirk stuff * Fixed Schechi * Fixes 0 damage punch, made a husk sprite * improves clothing sprites, fixes offsets of 'certain' bodyparts... :/ * Nevermind, it just doesn't work, no dicks for you Co-authored-by: Ranged <nickvanderkroon@gmail.com>	2021-10-26 17:28:13 +01:00
Seris02	fb70059611	[modular] adds the ability for six character hex colours (draft so maintainers know what to do when this gets merged on TG, if it does) (#8692) ... * hhhhh * yes * yes * yes * yes4 * yeet * yeet number 2 * don't want that conflicting * yep * trailing newline	2021-10-17 22:59:19 +13:00
FlamingLily	308e5a2d3a	Is helpers cleanup and additions (#7844) ... * Delete is_helpers.dm * Update is_helpers.dm * Update is_helpers.dm * Update is_helpers.dm * Yeah I manually edited the .dme, what of it?	2021-08-29 22:59:34 +01:00
BluBerry016	b51a259aa3	[Semi-Modular] Stops Jacob's Ladder From Piercing Space Ruins (#7470) ... * jacobs ladder change * woo * ok	2021-08-15 22:55:02 +01:00
Sza'Thi	d428cd749e	S&T Additional Emotes (#6259) ... * Species & Taurs Initial Launch * Fixes and a quick attempt to update branch * 'A quick fix' * Cleaning up variables, applying crew vote, adding PR to readme * changes 'exclamate' to 'exclaim', removes unused list. * Fixes an overlay oversight, adds sound effects to all turf styles * typo fix * volume fix (also failcheck again) * added suggestion and removed a switch * patch cycle 1 * buff prints * patch 2 Co-authored-by: Gandalf <jzo123@hotmail.com>	2021-06-25 01:47:24 +01:00
Tom	669dda04a7	[TM-FIRST][DNM] Fixes buckshot? (#6172) ... * fix spread * fixes it properly * additional helper * update helper loc	2021-06-11 00:08:38 +01:00
FlamingLily	f2b9d14e80	update out of date species helpers (#6101)	2021-06-03 15:29:03 +12:00
SkyratBot	0a0835b833	[MIRROR] Integrated Circuits (Wiremod) (#5949) ... * Integrated Circuits (Wiremod) * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com>	2021-05-25 19:57:29 +01:00
Funce	e5e448ab62	Ambition logging (#4765) ... * Sets up ambition logging baseline framework * That's one line, how did I write it * Have to rewrite all the logs! * I don't know what I'm doing anymore * I think this is the last thing * Log ambition is now added to config * Ambition flag now correctly checks for the ambition flag * Okay /here/ we go * No more lowercase ckeys in admin chat * Admin actions are now logged too	2021-04-09 16:01:00 +01:00
NotRanged	018f105574	[Modular] Ports Integrated Electronics (custom circuitry) (#3429) ... * initial broken commit * Many progress * More compile error fixes * only 11 errors remain....... * it compiles how horrifying * Materials runtime * Fixes the printer * adds clothing fixes stuff * Clothing + digi * Fixes worn circuits * Trailing newlines * linter must_call_parent * Confusion * Maybe this fixes it * Aaaaa * Solves Merge Conflict * linter * lol * This wasn't a fucking issue before * Use new pathing system * Removes action button from every piece of clothing Co-authored-by: Ranged <nickvanderkroon@gmail.com> Co-authored-by: Gandalf <jzo123@hotmail.com>	2021-03-17 21:55:46 +00:00
uomo	6912895247	Fixes and cleanup for logging. (#1735) ... * Fixes and a little cleanup. * False by default. * Apply suggestions from code review Co-authored-by: Azarak <azarak10@gmail.com> * Modularization and comments. * #include Co-authored-by: Azarak <azarak10@gmail.com>	2020-11-23 20:27:59 +01:00
Azarak	a17abc1830	weh (#1371)	2020-10-19 18:50:02 +01:00
Azarak	544ca60e45	fixes vox breath issues (#1139)	2020-10-03 23:05:32 +01:00