Skip to content

Commit 210cb4f

Browse files
committed
Squashed commit of the following:
commit deea52ca2c514ca8d28ed2222b123851afbfcd63 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 15 04:02:05 2026 +0000 Automatic changelog for PR #4851 [ci skip] commit 33f38d120e4041752cab67b9ada5c54b5be0e986 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 15 04:01:56 2026 +0000 Automatic changelog for PR #4835 [ci skip] commit 912c132d222c86032c52ed37b048f21589a4076b Author: Rockslp <[email protected]> Date: Thu Jan 15 05:01:28 2026 +0100 Minor skill changes requested by Ook (#4851) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Clinic apprentice gets farming so they can actually harvest crops in the apothecary garden. Priest gets 3 fistfighting for muscle priest. ## Why It's Good For The Game Makes the clinic apprentice not just ruin all of the plants. Ook wanted muscle priest. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Gives clinic apprentice farming skill balance: Raises priest fist-fighting (NOT THEIR WRESTLING THOUGH!!!!) /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 9c0e4bf978c936d8b4e812882354682df357fd26 Author: Rockslp <[email protected]> Date: Thu Jan 15 05:00:50 2026 +0100 Archivist becomes an advclass picker, and dreamwatcher gets moved from elder to archivist. (#4835) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Moves dreamwatcher to archivist, makes archivist an advanced class picker, old archivist loadout is called Chronicler. Also removes zizo as the archivist patron, they're noc's chosen and this was requested. ## Why It's Good For The Game Lorewise the dreamwatcher is one of noc's beloved, much more fitting in a role such as archivist rather than rotting away with spare use in the town elder's advanced classes. I feel like the king would also like a man who can foretell danger within his keep. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Added dreamwatcher to town elder del: Removed dreamwatcher from town elder del: Removes zizo from archivist options, he's one of noc's closely watched balance: Changes dreamwatcher stats to more alike the other archivist advclass. fix: Fixed archivist dwarves running around with their belly flopping about code: Made Archivist into an advclass /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 67ef5f919b1572397b44b139fb544ae7067f08ad Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 15 03:59:33 2026 +0000 Automatic changelog for PR #4867 [ci skip] commit d1caf49f1adbbd71ee04d70d3d37cb3ca2b9e5e4 Author: Rockslp <[email protected]> Date: Thu Jan 15 04:58:53 2026 +0100 Nerfs spellsword wrestling, armor and stats. (#4867) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request The spellsword was a bit too strong after the general squashing, they didn't receive much changes. Magic has a price. Makes their strength +1 from +2 Weak wrestling instead of average No medium armor prof, they get leather armor instead of iron. ## Why It's Good For The Game They were just a meta-pick, got feedback from the discordians. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: del: Removed medium armor trait from spellmage. balance: Reduce spell mage wrestling and strength /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 73bbe13e91ec570ffa6919007e62d316280bbcf1 Author: VANDERLIN-MONARCH <[email protected]> Date: Thu Jan 15 01:57:41 2026 +0000 Automatic changelog compile [ci skip] commit 7e2992dca75d9c005aa2e081e00bf504010870a3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed Jan 14 23:53:38 2026 +0000 Automatic changelog for PR #4876 [ci skip] commit 7b30f024894adcd022bfc71192beedf1bf32f29f Author: YellowHarlequin <[email protected]> Date: Wed Jan 14 18:53:02 2026 -0500 New Hair Gradient - Streaked (#4876) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Adds a new hair gradient: Streaked. <img width="237" height="226" alt="image" src="https://github.com/user-attachments/assets/f18ccfeb-6da6-4613-848a-361038cd661a" /> <img width="225" height="232" alt="image" src="https://github.com/user-attachments/assets/9d80589b-cee7-45e3-8ee0-6435a54bc271" /> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game More customization is good, and gradients were a bit lacking. <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: image: added streaks to hair_gradients.dmi /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 4e0dcdddc7ddd02d3a42c0dd7d368f51a6d40216 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed Jan 14 19:47:20 2026 +0000 Automatic changelog for PR #4626 [ci skip] commit e9b7292ece2571f9d7307c4600548992569120c1 Author: CheffieGithub <[email protected]> Date: Wed Jan 14 19:46:38 2026 +0000 Fix casting edge cases (#4626) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Closes #4590 <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: fix: Fixed potential issues with spell channelling and death /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 3e74bc6951565cbbc31b68b603da7eb69fc7e9af Author: VANDERLIN-MONARCH <[email protected]> Date: Wed Jan 14 02:02:52 2026 +0000 Automatic changelog compile [ci skip] commit 6840253b6995925a6f725c13baa9c56674301bfa Author: CheffieGithub <[email protected]> Date: Wed Jan 14 00:33:40 2026 +0000 Shuts up voyager CI by disabling it (#4900) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Byond error with no error trace and no useful call stack can't debug <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 24f181e55213d3727beeac4b136d906ff09aeb9e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue Jan 13 17:19:16 2026 +0000 Automatic changelog for PR #4895 [ci skip] commit 5bbae273d8887bc94632a03d0e59b7d2115b648c Author: Kevin <[email protected]> Date: Tue Jan 13 12:16:23 2026 -0500 Runtime fix in MC (#4895) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## 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! --> ssMobs was spitting errors in the stat entry ## 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. --> ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: code: MC Runtime fix /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit c61eb0ac41407957170ccd07459fab7e88a2671d Author: CheffieGithub <[email protected]> Date: Tue Jan 13 16:22:37 2026 +0000 Lore primer code owners (#4893) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit e8f1e2768ea333bc57dc6cbc89dfd919db0cebf6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue Jan 13 16:02:31 2026 +0000 Automatic changelog for PR #4772 [ci skip] commit 0d09b12aa12a7e64419d218dfd8285c37a9bdd23 Author: Somniworld <[email protected]> Date: Tue Jan 13 16:57:36 2026 +0100 Gives Psydonian helmets a 180° FOV but for real this time tee hee (#4772) ## About The Pull Request Makes Psydonian Helmets (the one that are acquired by the psydonian templar and ordinator) give a 180° FOV rather than 45° <img width="1104" height="969" alt="image" src="https://github.com/user-attachments/assets/be1f4d5b-4900-4588-97d0-e540562e7a6e" /> ## Why It's Good For The Game Psydonian helmets are miserable : great protection? Absolutely, but you cannot see a THING! Now you can actually fight as a templar Sacrestant. ## Changelog :cl: balance: Psydonian helmets have a 180° Field Of View /:cl: ## Pre-Merge Checklist - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. commit b3378052db645ab91b33c4d30373fe599f793f2c Author: CheffieGithub <[email protected]> Date: Tue Jan 13 15:28:47 2026 +0000 Additional fix for overlord (#3819) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit b91bb9f0d07a9c38efcbc27abec8c2c29e27fe3e Author: VANDERLIN-MONARCH <[email protected]> Date: Tue Jan 13 01:55:44 2026 +0000 Automatic changelog compile [ci skip] commit 336ff0b9f40d78ac4fe7dd60078c6b5a1cfd66d3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon Jan 12 08:42:07 2026 +0000 Automatic changelog for PR #4824 [ci skip] commit ebaaae118a289d0715cfea94fb936efca00ea08b Author: PotatoTomahto <[email protected]> Date: Mon Jan 12 00:41:30 2026 -0800 Grab and garrote refactor (#4824) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request - fixes an assorted arrangement of bugs - refactors grab and garrote code <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Let me know if there are bugs with grabbing or the garrote. Glorp. <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: refactor: grab and garrote code refactored /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> --------- Co-authored-by: PotatoTomahto <[email protected]> commit fb773b5a84f3e6c11bb9052dc92e15f02be5fb72 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon Jan 12 05:41:36 2026 +0000 Automatic changelog for PR #4487 [ci skip] commit 6a2be84b2c13dc59e3f5d63f9d693ec3e96b25ae Author: Kevin <[email protected]> Date: Mon Jan 12 00:40:59 2026 -0500 Yet another Hidden Door Update (#4487) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## 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! --> Cleans up hidden door code massively. Polishes the system and makes the trait access more modular. Adds hidden door branch for inquisition, and finished the thieves guild one and gave it to the matron/orphanage. ## 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. --> ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Inquisition hidden doors fix: not being able to close hidden doors very easily. map: Inquisition gets their own door set. code: Cleaned up hidden door/levers refactor: Hidden door code /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> --------- Co-authored-by: CheffieGithub <[email protected]> commit 8538277925ddc33d080b05b6800066a74570e987 Author: VANDERLIN-MONARCH <[email protected]> Date: Mon Jan 12 02:03:55 2026 +0000 Automatic changelog compile [ci skip] commit 5fc7f9360b59a18ca512d41a322a8a96e96b1574 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun Jan 11 03:17:25 2026 +0000 Automatic changelog for PR #4815 [ci skip] commit 07c84f70d050801b411f9c42d02cdfee7ec28814 Author: Kevin <[email protected]> Date: Sat Jan 10 22:16:48 2026 -0500 Removes Inquisition Roles from Voyager (#4815) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## 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! --> Title. Map updates expected from maptainer sooner. ## 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. --> They do not belong in such a tight space. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: del: Removed Inquisition roles from Voyager /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit ee2ede8e3234ea2ca5b9b51f7a9f5c3d8ee05164 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun Jan 11 03:14:00 2026 +0000 Automatic changelog for PR #4806 [ci skip] commit 875ba3af310a6e1954d71dbcae6017e60eed0c99 Author: Rockslp <[email protected]> Date: Sun Jan 11 04:13:18 2026 +0100 Inquisition Specieslocks Change (#4806) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Removes Aasimars from Absolver and Sacresancts. Removes Dwarves from Prefekt. ## Why It's Good For The Game LEVIATHAN requested it, quite strange for aasimars to be in the inquisition I agree, and dwarves in a high-up position like Prefekt. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: del: Inquisition no longer allows aasimars within their formal ranks, only aasimar adepts. del: Dwarves no longer get promoted to Prefekts, they will forever stay in hopes of a promotion. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 8d701278ebfbac06d09d17fe4cab3d41a133273c Author: VANDERLIN-MONARCH <[email protected]> Date: Fri Jan 9 01:59:26 2026 +0000 Automatic changelog compile [ci skip] commit 6c6c7b7b02fb3404b2dcc60ebc5d3a5894cb33f8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 23:50:20 2026 +0000 Automatic changelog for PR #4776 [ci skip] commit c6964c07e2785369c6e1e73fb08f5e1a71ea0376 Author: Rockslp <[email protected]> Date: Fri Jan 9 00:49:42 2026 +0100 Job Rebalancing & Axeman (Some Requests from Ook) (#4776) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Massive skill crunch, reducing athletics, weapon skills, wrestling and climbing across the board aswell as switching around some stats. I'll be doing Kevin's skill crunching because he has better things to do. Some parts of this is for example a non-protection giving tattoo for exiled warrior that takes up their armor slot as a nerf. I'll be talking to staff more about this, this is merely a draft. PUTS CERTAIN RARE ADVENTURERS INTO THE FOLK HERO CATEGORY! MAKES THEM MIGRANT ONLY ARRIVAL! THIS ALSO NERFS SKELETONS, ORCS AND ZIZOMBIES TO AVERAGE!!! THIS IS STILL A WORK IN PROGRESS, FEEL FREE TO SEND FEEDBACK! ## Why It's Good For The Game We've had massive skill inflation with certain numbers just not making sense on certain roles, wrestling will be lowered across the board along with weapon skill so that we don't have a ton of experts running around constantly. ## 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Adds the folkheroes migrants, moving certain rare adventurers into here. add: Added the Men-at-arms Axeman, a heavy armor axe role. add: Adds a tribal tattoo with 0 protection for exiled warrior that takes up the armor slot as a nerf. add: Poison resilience for Old Apothecary, huffing poisons builds up a tolerance. add: Padded Gambeson to Hedgemage, currently one of the weakest wretches. add: Leather bracers to abyssal guards. del: Removed miracles from Monk del: Removed Men-at-arms Fencer del: Removed harddismember from enforcer, makes them easier to balance around if they don't have a werewolf trait. balance: Rebalances skills & stats on most classes in the game, aswell as some loadouts. balance: Rebalances most classes that were expert to be skilled users instead, all mercenaries have lost expert weapon skills. balance: Peasants and Serfs get a statline of +3, it was a bit all over the place. Old-party serfs get +4. balance: Changes the tavern brawler Be Special to give lower skill levels. fix: Fixed the double stat+skill input in the Court-Magos file. fix: Stats being listed twice on the anthraxi male job has been fixed. code: Changed a bunch of stat values on a bunch of jobs. refactor: Removed the donator adventurer folder and moved them either into the folkheroes folder or the rare folder. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit b03355a0b599989408df41a9905e2cff637f3092 Author: PotatoTomahto <[email protected]> Date: Thu Jan 8 15:14:08 2026 -0800 oops (#4847) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> Co-authored-by: PotatoTomahto <[email protected]> commit 5462aab6813c6d33535f31defa71a5fd8c9b3533 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 23:00:57 2026 +0000 Automatic changelog for PR #4845 [ci skip] commit 90e9050456a4a0e22c426e2e9922da3355c2a462 Author: Somniworld <[email protected]> Date: Fri Jan 9 00:00:20 2026 +0100 Gives the Werewolf it's combat theme back (#4845) ## About The Pull Request Gives werewolf mobs the "werewolf_combat" theme. This means they once again use "Archetype of the dark star" as their CMode music. ## Why It's Good For The Game Music! Fixes unintended behaviour. ## Changelog :cl: fix: Werewolves got their combat mode track back. /:cl: ## Pre-Merge Checklist - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. commit fbe45231fcb5743eaf3a204537060fad9053a491 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 22:36:54 2026 +0000 Automatic changelog for PR #4830 [ci skip] commit f372eae80ef7e91ee3abf162c254809855cb88ad Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 22:36:33 2026 +0000 Automatic changelog for PR #4759 [ci skip] commit b6bfe01eabd58246c1baf2f99f447fdd1f7319e2 Author: TerraGS <[email protected]> Date: Thu Jan 8 16:36:16 2026 -0600 Fix bloodloss effects while dead (#4830) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Fixes bloodloss effects continuing to be applied while dead. Dead status is checked for in `/mob/living/proc/handle_blood()` but absent in the override `/mob/living/carbon/handle_blood()` which this change corrects. <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: fix: Dead people no longer feel the effects of bloodloss. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 547eeb1f7f2f9e383cc8e0f1879ffd316e555622 Author: Sutures <[email protected]> Date: Thu Jan 8 17:36:02 2026 -0500 Make quadruped simple_limb_hit reuse a helper (#4615) ## About The Pull Request Avoids some code reuse by making a helper and only changing the parts that are different. ## Why It's Good For The Game Code quality improvements. **D**on't **R**epeat **Y**ourself, **DRY**! commit e7fe683b5f202af0b4497f97de64dc47403d3950 Author: Snack-Max <[email protected]> Date: Thu Jan 8 14:35:55 2026 -0800 Very Very Minor change to Gallowglass and Kerns (#4759) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <img width="121" height="119" alt="image" src="https://github.com/user-attachments/assets/281cb015-ff05-4b83-b8a7-67a548fc6c46" /> <img width="68" height="87" alt="image" src="https://github.com/user-attachments/assets/2cc939e4-96be-4eac-b903-25f61320562d" /> <img width="88" height="111" alt="image" src="https://github.com/user-attachments/assets/d205059d-7ffe-411e-b4a3-3a6251491d7b" /> <img width="80" height="79" alt="image" src="https://github.com/user-attachments/assets/a0c9ecfc-67cf-4444-ae0e-e0d9a7533f89" /> ## About The Pull Request Suggested by Terracotta, Gave Gallowglass and a habergeon rather then a hauberk and gave both gallowglass and Kern a brighter blue kilt and sashe, ive also raised a bit of the gallowglass's helmet <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Quality of Life <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Adjusted Gallowglass helmet, gave gallowglass and kerns, Mage blue kilts and sashes /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit 312f6d8c5575ef6cb9a127dfb847a7b37b843324 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 22:31:02 2026 +0000 Automatic changelog for PR #4595 [ci skip] commit 413e8d34dcffcec552d8f17c52a9d121f1ade5dc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 8 22:30:32 2026 +0000 Automatic changelog for PR #4512 [ci skip] commit 82722db00c888f0fa730bbbe3398722c33ea3002 Author: JebHawkins <[email protected]> Date: Thu Jan 8 16:29:43 2026 -0600 Tweaks Graggar Iconoclast. (#4595) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Tweaks Graggar Iconoclast to bring him more in line with the other 3 inhuman iconoclasts. Right now due to his bizarre helmet and weapon he plays more like a backline support fighter rather than something meant to handle being KOS for most of the server. Changes his helmet so it covers everything except the mouth and no longer uses INTEGRITY_POOR, as well as giving him skin face armor and the strong_bite trait to encourage biting in combat. Adjusts the vicious axe as well to use an alt stance which makes it behave more like a bearded axe. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Hopefully puts an end to every Graggarite ditching their helmet as soon as possible. Lets Graggar's top guy actually brawl face to face against multiple enemies instead of running out of stamina and getting decapped through his helmet. Gives him more options without outright buffing his stats or giving him something silly like Rituos. <!-- 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. 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. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: WhataTerribleUserName add: Adds new face armor for Graggar Iconoclast. balance: Changes coverage and integrity of Vicious Helm. balance: Gives Vicious Axe alt intents. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> commit c3d54f5411d46be91d85f7d81044d3f2553278df Author: Somniworld <[email protected]> Date: Thu Jan 8 23:28:47 2026 +0100 Updates the Feldsher's Ring, adds a new ring for the apothecary. (#4512) ## About The Pull Request Changes the Feldsher's ring to use Vanderlin's tint of copper : when I originally made the ring, I used a homebrew set of colours, and the ring ended up being very freaking bright, this fixes that. Adds a new ring for the apothecary : made out of thaumic iron, it proves that they're a skillful alchemist and that they can extract lux legally, akin to the feldsher. ## Why It's Good For The Game Heterogeneous visual identity is good. Stops alchemists from being bullied by folks. ## Pictures ! Remade Feldsher's ring : <img width="385" height="384" alt="image" src="https://github.com/user-attachments/assets/1f1e43f1-4ba0-4d7e-8a3c-2a590950d701" /> New apothecary's ring : <img width="384" height="386" alt="image" src="https://github.com/user-attachments/assets/c37ab223-2c30-4756-a794-6fefe80783f4" /> ## Changelog :cl: add: Adds a new ring for the apothecaries, making it clear they can extract and manipulate lux without repercussions so long as they're not being heretics. image: changed the way the feldsher's ring looks, to make it fit more with our visual identity. /:cl: ## Pre-Merge Checklist - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes.
1 parent 7e9c32a commit 210cb4f

File tree

314 files changed

+24659
-25231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+24659
-25231
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@
1515
# Draggeru
1616

1717
/_maps/* @Draggeru
18+
19+
# Lore
20+
21+
/strings/rt/Lore_Primer.txt @aberrantQuesrist @Draggeru @tired-wired

.github/workflows/ci_suite.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
- name: Compile All Maps
125125
run: |
126126
source $HOME/BYOND/byond/bin/byondsetup
127-
python3 tools/ci/template_dm_generator.py
127+
python3 tools/ci/compile_all_maps.py
128128
DreamMaker -DCIBUILDING -DCITESTING -DALL_MAPS vanderlin.dme
129129
- name: Check client Compatibility
130130
uses: tgstation/byond-client-compatibility-check@v3
@@ -144,10 +144,17 @@ jobs:
144144
- name: Find Maps
145145
id: map_finder
146146
run: |
147-
echo "$(ls -mw0 _maps/*.json)" > maps_output.txt
148-
sed -i -e s+_maps/+\"+g -e s+.json+\"+g maps_output.txt
149-
echo "Maps: $(cat maps_output.txt)"
150-
echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT
147+
> maps_output.txt
148+
for file in _maps/*.json; do
149+
if ! jq -e '.exclude_from_ci == true' "$file" >/dev/null 2>&1; then
150+
echo "\"$(basename "$file" .json)\"" >> maps_output.txt
151+
else
152+
echo "Excluded: $file"
153+
fi
154+
done
155+
map_list=$(paste -sd, maps_output.txt)
156+
echo "Maps: $map_list"
157+
echo "maps={\"paths\":[$map_list]}" >> "$GITHUB_OUTPUT"
151158
- name: Collect byond client version configuration
152159
id: max_required_byond_client
153160
#the regex here does not filter out non-numbers because error messages about no input are less helpful then error messages about bad input (which includes the bad input)

_maps/_basemap.dm

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
#endif
66

77
#ifndef LOWMEMORYMODE
8-
#ifdef ALL_MAPS
9-
#include "map_files\debug\roguetest.dmm"
10-
11-
#ifdef CIBUILDING
12-
#include "templates.dm"
13-
#endif
8+
#if defined(CIBUILDING) && defined(ALL_MAPS)
9+
#include "templates.dm"
1410
#endif
1511
#endif

_maps/kalypso.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
],
1616
"minetype": null,
1717
"space_empty_levels": 0,
18-
"space_ruin_levels": 0
18+
"space_ruin_levels": 0,
19+
"exclude_from_ci": true
1920
}

_maps/kalypso/plum.dmm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/turf/open/floor/grass/red,
99
/area/template_noop)
1010
"e" = (
11-
/obj/item/ash,
11+
/obj/item/fertilizer/ash,
1212
/turf/open/floor/naturalstone,
1313
/area/template_noop)
1414
"f" = (
@@ -55,7 +55,7 @@
5555
/turf/open/floor/grass/red,
5656
/area/template_noop)
5757
"B" = (
58-
/obj/item/ash,
58+
/obj/item/fertilizer/ash,
5959
/turf/open/floor/dirt,
6060
/area/template_noop)
6161
"E" = (
@@ -68,12 +68,12 @@
6868
/turf/open/floor/dirt,
6969
/area/template_noop)
7070
"N" = (
71-
/obj/item/ash,
71+
/obj/item/fertilizer/ash,
7272
/obj/structure/flora/grass,
7373
/turf/open/floor/dirt,
7474
/area/template_noop)
7575
"O" = (
76-
/obj/item/ash,
76+
/obj/item/fertilizer/ash,
7777
/turf/open/floor/grass/red,
7878
/area/template_noop)
7979
"Q" = (

_maps/kalypso/tower.dmm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@
191191
"IA" = (
192192
/obj/structure/closet/crate/crafted_closet,
193193
/obj/item/clothing/shoes/sandals,
194-
/obj/item/clothing/pants/skirt/random,
194+
/obj/item/clothing/pants/skirt/colored/random,
195195
/obj/item/clothing/armor/corset,
196196
/obj/item/clothing/shirt/undershirt/lowcut,
197-
/obj/item/clothing/pants/tights/random,
197+
/obj/item/clothing/pants/tights/colored/random,
198198
/obj/effect/decal/cleanable/dirt/dust,
199199
/turf/open/floor/ruinedwood,
200200
/area/template_noop)
@@ -212,9 +212,9 @@
212212
"LK" = (
213213
/obj/structure/closet/crate/crafted_closet,
214214
/obj/item/clothing/shoes/sandals,
215-
/obj/item/clothing/pants/skirt/random,
215+
/obj/item/clothing/pants/skirt/colored/random,
216216
/obj/item/clothing/shirt/undershirt/lowcut,
217-
/obj/item/clothing/pants/tights/random,
217+
/obj/item/clothing/pants/tights/colored/random,
218218
/obj/effect/decal/cleanable/dirt/dust,
219219
/turf/open/floor/ruinedwood,
220220
/area/template_noop)

0 commit comments

Comments
 (0)