mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-20 14:45:05 +00:00
9102c49c27
commit 2abf1c919f05b34cfee752677431a864bc22f12e Merge: c9636f2bea7b1c9f9a3527Author: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Sun Mar 10 20:44:55 2024 +0100 Merge branch 'master' into upstream-2024-3 commit1c9f9a3527Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun Mar 10 15:53:58 2024 +0100 Automatic changelog for PR #1238 [ci skip] commitd13b12a0faAuthor: pixelkitty286 <78038207+pixelkitty286@users.noreply.github.com> Date: Sun Mar 10 09:53:33 2024 -0500 Cat cyborg sprite changes (#1238) <!-- 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 Refreshes the Engineer cat borg sprite Adds 2 sprites one Peacekeeper and one Spider clan sprite. Reverts the Syndicat borg back to their proper security type Reverts the Security cat borg back to their combat usage for the Syndicate <!-- 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. --> Some of the Cat Borg sprites don't match their types or didn't have types and I decided to fix that. Also fixes the custom open panel overlay from not showing up on Cat Borgs ## 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 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. --> 🆑 add: +Peacekeeper cat borg sprites, Spider clan cat borg sprites, Engineer cat borg refreshed sprites fix: Cat cyborg panels not working image: +Peacekeeper cat borg sprites, Spider clan cat borg sprites, Engineer cat borg refreshed sprites code: -Duplicate code /🆑 <!-- 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. --> commitc6b2f531dcAuthor: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Sat Mar 9 12:58:23 2024 +0700 some loadout item mishab (#1252) <!-- 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 Item were not in the correct category ## 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. --> N/A <!-- 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 c9636f2bea7bb8d4b20a72c9c2c7f660ff798dad Merge: fdec76aa07c0 edd12dd29060 Author: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 14:14:33 2024 +0100 Merge branch 'upstream-2024-3' of https://github.com/Majkl-J/Bubberstation into upstream-2024-3 commit fdec76aa07c09827c2eb57006498d8fe826334ca Author: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 14:14:23 2024 +0100 Yet again fixes TG's shitty mapvotes commit edd12dd290606fa94e7d311eed47ad12b1853690 Merge: 314437533a1f1b8b7e7904Author: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Fri Mar 8 12:43:11 2024 +0100 Merge branch 'master' into upstream-2024-3 commit1b8b7e7904Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 12:32:29 2024 +0100 Automatic changelog for PR #1248 [ci skip] commitc157dd8102Author: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Fri Mar 8 18:12:19 2024 +0700 Fix idma clothing again (#1248) <!-- 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 fixes the icon add back mishanok to the item whitelist <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## 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:EspeciallyStrange fix: IDMA donor clothing being improperly offsetted and not correctly /🆑 <!-- 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 314437533a1f691935c067f9294a76965931d695 Author: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 12:09:58 2024 +0100 Fix zender's map again commit ebe666293312b41b49d6e74947809182589a876a Merge: ebad5cf24025 a7c86eb5e619 Author: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 12:02:51 2024 +0100 Merge branch 'upstream-2024-3' of https://github.com/Majkl-J/Bubberstation into upstream-2024-3 commit ebad5cf240253a18c5131725c5e8e25d6fe05fe6 Author: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 11:53:12 2024 +0100 This should fix burger's reactor commit a7c86eb5e6190853db804763c82dbe7a5cb1f70c Author: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Fri Mar 8 17:47:44 2024 +0700 Update reactor.dm commit 3abe64a4fab5a851d977d45a191ced47ddc70a38 Merge: 5578e5cea48461ed57d83bAuthor: Waterpig <wtryoutube@seznam.cz> Date: Fri Mar 8 11:00:23 2024 +0100 Merge remote-tracking branch 'upstream' into upstream-2024-3 commit61ed57d83bAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu Mar 7 20:33:57 2024 -0500 bubber always message staffchat ahelps (#935) internal change test, we might get sick of it --------- Co-authored-by: iero-builder-kobold <kobold> commitc7a406b3f7Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:28:22 2024 +0100 Automatic changelog for PR #1226 [ci skip] commitc5397e0281Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:27:42 2024 +0100 Automatic changelog for PR #1229 [ci skip] commit6a0af094ffAuthor: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:26:30 2024 +0100 Automatic changelog for PR #1246 [ci skip] commit8f32718eb7Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:25:38 2024 +0100 Automatic changelog for PR #1245 [ci skip] commitc3d5392270Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:24:48 2024 +0100 Automatic changelog for PR #625 [ci skip] commit7584b19392Author: Return <donwest947@gmail.com> Date: Thu Mar 7 19:17:46 2024 -0600 Updates NTC offices slightly because Gavla did it better (#1226) <!-- 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 PR swaps out nearly every NTC's office's carpet with green carpet, which is much less flashy and looks a lot better. Additionally, it expands the windows in each office, and changes their privacy shutters to pod ones, that look better. <!-- 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 Green carpet looks good, more windows means people can see what is going on inside. <!-- 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 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 add: NTC offices have had their carpet changed out to something less over-the-top. The windows have been expanded as well. /🆑 <!-- 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. --> commit39e807e6ddAuthor: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Thu Mar 7 17:15:49 2024 -0800 Fixes traitor announcer double-sanitizing. (#1229) ## About The Pull Request Fixes traitor announcer double-sanitizing. ## Why It's Good For The Game Fixes traitor announcer double-sanitizing. ## Proof Of Testing  ## Changelog 🆑 BurgerBB fix: Fixes traitor announcer double-sanitizing. /🆑 <!-- 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. --> commitded2033415Author: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Fri Mar 8 01:15:11 2024 +0000 Moonstation tram sprites/fixes (#1246) ## About The Pull Request Adds Moonstation variants of the required tram components, resolving various graphical issues with the signs and controls ## Proof Of Testing  ## Changelog 🆑 LT3 image: Added Moonstation specific tram sprites fix: Fixed Moonstation references to Tramstation's tram /🆑 commit4a0c68191cAuthor: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Thu Mar 7 17:14:52 2024 -0800 Fixes missing telecomms wire in Moonstation (#1245) <!-- 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 Fixes missing telecomms wire in Moonstation ## Why It's Good For The Game Fixes missing telecomms wire in Moonstation ## Proof Of Testing Fixes missing telecomms wire in Moonstation ## Changelog 🆑 BurgerBB fix: Fixes missing telecomms wire in Moonstation /🆑 <!-- 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. --> commit2c7d148856Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu Mar 7 20:14:26 2024 -0500 Contractor and Ninja Modsuits have a deployable microbomb (Enable the DNA lock and hit Lock on the modsuit to arm) (#625) <!-- 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 Alternatives to blowing up. You can drain the cells with EMP, you and acid them off... but you gotta work for it. <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game They're not supposed to be loot bags. ## 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. --> 🆑 balance: contractor and ninja modsuits have DNA locked microbombs /🆑 <!-- 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. --> --------- Co-authored-by: iero-srv <> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> commitb2b825f19aAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu Mar 7 20:11:52 2024 -0500 force atmos hack (#1108) Forces the atmos MC to run in two different ways. Very bad, but the MC doesn't work and this is a byond native fallback to keep rounds at least going. commitf9e71b80b7Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:09:23 2024 +0100 Automatic changelog for PR #1225 [ci skip] commite8d92666e2Author: Return <donwest947@gmail.com> Date: Thu Mar 7 19:07:26 2024 -0600 Restores Smol42's donator item to its whitelist (#1225) <!-- 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! --> On request, this PR makes the graceful trenchcoat cloak no longer available to all donators :( sad <!-- 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. --> It's not, other than to be polite ## 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 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 del: Donors' graceful trenchcoat /🆑 <!-- 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> commitfe8bc28650Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri Mar 8 02:04:46 2024 +0100 Automatic changelog for PR #1061 [ci skip] commitd0a4544e96Author: Arturlang <24881678+Arturlang@users.noreply.github.com> Date: Fri Mar 8 03:04:23 2024 +0200 [DONE] A bunch of bloodsucker changes (#1061) <!-- 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 adds a bunch of things as a addition to my original bloodsucker PR, there's still one PR in the plans to refactor bloodsucker abilities. #What this adds: - Bloodsuckers loosing the heart or brain is lethal, before you could simply walk around without a heart. Does not however cause a final death - bloodsucker vampire bats will no longer /list you when attacking, and are also just as fast as human runspeed - Blood cost for vassalizing was almost completely removed, now only taking tiny amounts of blood to do so. - Dullahans can't be bloodsuckers since... their head isn't attached. - ....buuuut bloodsuckers now kinda become helpless dullahans just with no body if they get decapicated! Funny talking head go! - Level up cost is now 15% of max blood, down from 20% - The stat bar will show you the threshold for exiting frenzy now too when you are frenzying. - Maximum blood volume is shown in the stat menu as well - Hopefully fixes some torpor loops related to frenzy - Tremere now also get informed of how much blood they need to pay for level ups. - Fortitude now gives you burn resistance, just 20% less than brute resistance - Bloodsucker abilities now will show their level when you hover over them. Trust me, this was really neccessary. - Hopefully fixes cryoing or deleted bloodsuckers not removing vassals. - Can longer use veil while unconcious or dead - Caps humanity lost to 50, this means a maximum of 500 blood to enter frenzy/ 10 fully drained people with clients, at this point you also loose the masquerade ability. - Admins can now ban bloodsuckers and vassals. - Bloodsuckers can now mesmerize mimes - Fat bloodsuckers are no longer unable to enter coffins. Now they resize their lair's coffin. Very obviously. - Lizards are no longer fucked if they are on fire, they are no longer forever too hot to survive - Going into torpor in a coffin will extinguish and set your temperature to normal - bloodsuckers will no longer accrue toxin damage from not having a liver or having a failing one, even though they had the toxin immune trait - synths will now heal their prosthetic limbs - torpor start now checks for oxygen and toxin damage, and heals both completely on it's end - Haste will remove stuns at level 3, and do a non-stunning dash - Tremere dominate vassalizing now actually works! - Fixes ventrue objectives not succeeding properly - Refactors the heart thief objective and improves it by requiring it to be non-monkey hearts and letting bloodsuckers examine hearts to see if they are valid, even uses the same logic, too! - Ventrue favorite vassal batform now has night vision, and it's spawned bats despawn once the cooldown refreshes, and halves it's cooldown to 1 minute - Traits added to vassals get removed once they loose their antag datum, ie favorite vassal traits, or the ones gained in the process of ventrue sire-ing. - Favorite vassals now clean up propertly when the antag datum is removed, tremere, and malkavian clean up their related additions. - Refactors how the blood display updates, instead it now updates every time your blood level is changed, making it update far faster and only when it's needed. - Stakes now have different properties, the normal stake is fast to stick in someone, but can fall out on it's own, the burnt one takes longer to be put in, but doesn't fall out, the silver stake is the slowest to be stuffed in someone's heart, and is the only stake to be able to cause a Final Death to a sleeping or dead bloodsucker <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> closes #1180, closes #1208 <!-- 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 The way I develop is always run a local server and test the changes that I do, takes awhile but won't have as many bugs as a result <!-- 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 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. --> 🆑 add: Decapacitated bloodsuckers can now talk! add: The stat bar will show you the threshold for exiting frenzy now too when you are frenzying. add: Bloodsucker abilities now will show their level when you hover over them. Trust me, this was really neccessary. add: Tremere now also get informed of how much blood they need to pay for level ups. add: At level 3, haste will now remove stuns and do a non-stunning dash add: Bloodsucker blood display now always updates when a bloodsucker's blood level is changed add: Bloodsuckers can now examine hearts to see if they are valid for the heart thief objective add: Bloodsucker vassals now clean up any traits gained from their tenure as a vampire's minion. add: Favorite vassals now properly clean up their effects once the antag datum is lost. add: Bloodsucker synths will be able to heal their prosthetic limbs, but normal bloodsuckers still cannot. add: When you exiit torpor as a bloodsucker, you will completely heal any toxin and oxygen damage, as you should already be immune to it. This is a safety feature. add: Entering a coffin will normalize your temperature and extinguish you if you're on fire, if you are a bloodsucker. fix: bloodsucker vampire bats will no longer /list you when attacking fix: Hopefully fixes some torpor loops related to frenzy fix: Hopefully fixes bloodsuckers cryoing not removing vassal datums fix: Bloodsuckers can no longer use veil of many faces while unconcious fix: lizard bloodsuckers will no longer suffer from heat for a long time fix: The ventrue objective now properly succeeds if you have sired a vampire fix: Livers are no longer required for bloodsuckers to live, as it caused them toxin damage which overrode the trait that made them immune to toxins. fix: Entering torpor now accounts for all damage types, even when you should be immune to them. This is to ensure you enter torpor to heal those damage types in the case of odd behaviour. balance: coffins should now set your temperature to normal and extinguish you. balance: bloodsucker level up cost is now 15% of max blood, down from 20% balance: Caps humantiy loss at 50 humanity/500 blood to frenzy, and makes it remove your masquerade ability. balance: Bloodsucker bats now have human runspeed balance: Blood cost for vassalizing was almost completely removed, now only taking tiny amounts of blood to do so. balance: Fortitude now gives you burn resistance, just 20% less than brute resistance balance: Can no longer gut bloodsuckers balance: Bloodsuckers loosing their heart will make the vampire unable to use their abilities or even regenerateor revive via torpor, you can however regain your heart if you sleep in a coffin with a heart. balance: Stakes now have different properties, the normal stake is fast to stick in someone, but can fall out on it's own, the burnt one takes longer to be put in, but doesn't fall out, the silver stake is the slowest to be stuffed in someone's heart, and is the only stake to be able to cause a Final Death to a sleeping or dead bloodsucker del: Dullahans can't be bloodsuckers since... their head isn't attached admin: Bloodsuckers and vassals can now be banned like other antags. /🆑 <!-- 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: Waterpig <49160555+Majkl-J@users.noreply.github.com> commit 5578e5cea484f8147e195c6db60be46b4213d966 Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 12:21:08 2024 +0100 Update screenshot ci commit db15206076abea9afb7829f5d93e8b29bd4dc237 Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 11:39:25 2024 +0100 oh yea the ntrep commit aef32982b9c927ad88527f75088f8ed517a58ffd Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 11:37:37 2024 +0100 krill me commit b2b50d591103125fc56893f137b8f42f3d86fa97 Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 11:22:18 2024 +0100 New skill unlocked commit 9fe9c8cfd0bf95c01d76b76f6e9685cf5d2d77df Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 11:12:41 2024 +0100 Okay skyrat maps just decided to conflict commit 0a093b3092bb95fbe345489b7adbe5f58a01ad79 Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 11:10:47 2024 +0100 I had to do these manually commit e559e7b4268ce83263205da007ce7b9413fbe21a Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 10:58:59 2024 +0100 I chose the wrong map version it seems commit 028c79ab3a07812777f0160de99b3490915e1907 Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 08:47:33 2024 +0100 these commit 2de5dd3359f7413b2caaf875202612e045dc165b Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 08:46:51 2024 +0100 Hopefully didnt break anything commit 00f5c0acd6a75d74f8e90f8fb04a90fd868f34f9 Merge: 1e7d317fc7de0a5740f577Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 08:28:23 2024 +0100 Merge remote-tracking branch 'upstream' into upstream-2024-3 commit 1e7d317fc7de139b85e490fb76599ede24aea28a Author: Waterpig <wtryoutube@seznam.cz> Date: Wed Mar 6 08:18:53 2024 +0100 Oh my fucking god commit0a5740f577Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon Mar 4 21:18:04 2024 +0100 Automatic changelog for PR #1224 [ci skip] commitcb09b2de3bAuthor: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Mon Mar 4 12:17:41 2024 -0800 Adds Ashwalkers to Moonstation (#1224) ## About The Pull Request Adds Ashwalkers to Moonstation. Also adds a funny temple right next to the ashwalker nest so they can traverse z-levels and ~~raid~~ hunt around the station. ## Why It's Good For The Game People wanted it. ## Proof Of Testing Trust it me it works bro I forgot to take screenshots trust me bro. ## 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. --> 🆑 BurgerBB add: Adds Ashwalkers to Moonstation /🆑 <!-- 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: Waterpig <49160555+Majkl-J@users.noreply.github.com> commit a658dd6cc99e23562c1147179f9fe29c653058a0 Author: Waterpig <wtryoutube@seznam.cz> Date: Mon Mar 4 17:08:33 2024 +0100 These were added upstream commit f4b02265ac9a4bbccf445bf5acce87ed731ad8d1 Author: Waterpig <wtryoutube@seznam.cz> Date: Mon Mar 4 11:25:47 2024 +0100 aaaaaaaa commit dad21ec088baff50a54dda601fa01b2fd7c217bd Author: Waterpig <wtryoutube@seznam.cz> Date: Mon Mar 4 11:10:46 2024 +0100 Another check fixed commit 6afb158ca5a4e0cdca8b89f9e511754d512753c9 Author: Waterpig <wtryoutube@seznam.cz> Date: Mon Mar 4 10:34:11 2024 +0100 Waddlefix commit a155568d1138ce379fb3c6df79111ad5f3310b74 Author: Waterpig <wtryoutube@seznam.cz> Date: Mon Mar 4 08:45:19 2024 +0100 Makes it compile - Stuff to check: Arcade code commita4afaa6d19Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon Mar 4 04:05:56 2024 +0100 Automatic changelog for PR #1116 [ci skip] commit439e521f3cAuthor: Swift <jackwars4@gmail.com> Date: Sun Mar 3 20:54:28 2024 -0600 Stop spamming logs when engineers lovingly feed the supermatter pipes by the hundreds. (#1116) <!-- 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 Title Also the method I went about this adds a flag to the game, which means in the future if people find another way to spew even more items into the supermatter that spam the log, we can just add the flag to those items. ## Why It's Good For The Game I got bwoinked this one time because I was spamming the admin log and I told them I'd look for a solution. This might not be _the_ solution but it is **a** solution. ## Proof Of Testing this is what my IC chat tab looked like  This is what my logs tab looked like  It still logs pipes for initial startup so we good there. I also verified that other items still set off the log function as expected. ## Changelog 🆑 admin: Will no longer receive supermatter ate a pipe spam in the log. /🆑 <!-- 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: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> commit739bfe1433Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun Mar 3 22:43:02 2024 +0100 Automatic changelog for PR #1217 [ci skip] commit5beacd224eAuthor: Return <donwest947@gmail.com> Date: Sun Mar 3 15:42:41 2024 -0600 Makes F-list's image host provide headshots (#1217) <!-- 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! --> Currently, only two websites are accepted by the headshot regex. This fixes a problem that is occurring with Discord right now, where images have started being deleted after a certain amount of time. <!-- 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. --> Gyazo sucks as an image host, so while it does technically serve its purpose, we want to expand our pool of potential options. F-list properly verifies that what it receives is an image (furries winning yet again) and so it should fit our criteria for new headshots. ## 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 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 (code) add: F-list headshots are now accepted /🆑 <!-- 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: Esixdotnet <156951974+Esixdotnet@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Co-authored-by: thegrb93 <grbrown93@sbcglobal.net> Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> commit e6b48cbe7fa87c0dd052245be5f2a829a00d10e8 Author: Waterpig <wtryoutube@seznam.cz> Date: Sun Mar 3 20:01:46 2024 +0100 resolve-4 commit cc2b53503137fe3d95224ccd19d480dde05eff62 Author: Waterpig <wtryoutube@seznam.cz> Date: Sun Mar 3 19:58:41 2024 +0100 resolve-3 commit 7930a8b5c932313bec7a8614e4bc0b5f3b8065d6 Merge: 93635c534d8e2aa4805942Author: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Sun Mar 3 19:06:44 2024 +0100 Merge branch 'master' into upstream-2024-3 commit2aa4805942Author: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun Mar 3 18:45:53 2024 +0100 Automatic changelog for PR #1078 [ci skip] commit 93635c534d8ed3eca796778eee67675eb4948b4c Merge: ec27c845532f47aa5c2d31Author: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Sun Mar 3 18:45:50 2024 +0100 Merge branch 'master' into upstream-2024-3 commit47aa5c2d31Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sun Mar 3 09:45:30 2024 -0800 Nerfs Lichdom because someone messaged me on discord about it once (#1078) ## About The Pull Request After 3 Lichdom resurrections, announcements will be made about your general phylactery location (the area) when you die. Phylactery binding now requires the object to be at least bulky in size, and it cannot be fireproof, lava proof, or indestructible. ## Why It's Good For The Game Lichdom is insanely strong, even with the drawbacks that make you generally weaker. Items can be hidden away in space (skeletons are immune to space!) and can be small or hard to see objects such as pens or cigarette butts. Some items can be fireproof and acid proof as well, requiring usage of mechanics that delete objects entirely (very limited and easy to sabotage, maybe the supermatter is reliable but that can be sabotaged too). Regardless this PR should make lichdom less crazy. ## Proof Of Testing Untested and in a draft because feedback is needed. ## Changelog 🆑 BurgerBB balance: After 3 Lichdom resurrections, announcements will be made about your general phylactery location (the area) when you die. Phylactery binding now requires the object to be at least bulky in size, and it cannot be fireproof, lava proof, or indestructible. /🆑 --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> commit3bc08a656cAuthor: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun Mar 3 18:11:45 2024 +0100 Automatic changelog for PR #1188 [ci skip] commit603f714998Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sun Mar 3 09:11:21 2024 -0800 Fixes some Moon Station bugs, such as the funny engineering bridge access bug and a lack of cigarette/coffee vendors. (#1188) ## About The Pull Request Fixes some Moon Station bugs, such as the funny engineering bridge access bug and a lack of cigarette/coffee vendors. ## Why It's Good For The Game Bugfixes good. ## Proof Of Testing If it compiles, it werks. ## Changelog 🆑 BurgerBB fix: Fixes some Moon Station bugs, such as the funny engineering bridge access bug and a lack of cigarette/coffee vendors. /🆑 <!-- 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: Waterpig <49160555+Majkl-J@users.noreply.github.com> commit757796bc5eAuthor: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun Mar 3 17:38:34 2024 +0100 Automatic changelog for PR #1219 [ci skip] commitcd0af8e862Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sun Mar 3 08:38:13 2024 -0800 Limits Powersinks + Crab-17 purchases to once each per traitor per round. (#1219) ## About The Pull Request Limits Powersinks and Crab-17 purchases to once each per traitor per round. ## Why It's Good For The Game Powersink and Crab spam is pretty awful. A lot of people recently have been spamming these two objectives and then doing nothing of substance with them. Traitors should be using their TC to further the round and create meaningful conflict instead of what can basically be described as being in a constant state of soft grief. ## Proof Of Testing If it compiles, it werks. ## Changelog 🆑 BurgerBB del: Limits Powersinks + Crab-17 purchases to once each per traitor per round. /🆑 Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> commit ec27c845532fc6deeab200d7107842dc4a59f603 Author: Waterpig <wtryoutube@seznam.cz> Date: Sun Mar 3 16:14:28 2024 +0100 resolve-2 commit ff457077fadcd08040a15b90aef5a8226f67630b Author: Waterpig <wtryoutube@seznam.cz> Date: Sun Mar 3 16:09:01 2024 +0100 Resolve 1
4 lines
113 B
Plaintext
4 lines
113 B
Plaintext
/datum/action
|
|
/// Extended description of the action, usually shown in an antag UI.
|
|
var/power_explanation = ""
|