Upstream 2026-04-04-2239Z#51
Merged
Merged
Conversation
## About The Pull Request Doubles the energy cost of disabler + laser so it has 10 shots on a normal cell 20 shots on an upgraded shell (its base) Also increased the energy cost of its ion so you can only do it twice on a normal four times on an upgraded Also adds it to Holster ## Why It's Good For The Game Gun is too good to map onto roundstart ships ## Changelog :cl: balance: Nerfed energy cost of Yari projectiles fix: Yari can now fit in either belt or shoulder holster /:cl: --------- Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
<!-- 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 Removes the Typhon-class from the game and replaces it with the Cetus-class, a new subshuttle ship for the minutemen. Also adds the attached subshuttle. The Mira-class Pursuit vessel. The naming convention comes from the Mira being the primary star in the Cetus constellation. (PR also contains a small change to the Atlas armory to prevent the CMM ships from all feeling too samey.) Images below: <img width="1147" height="816" alt="image" src="https://github.com/user-attachments/assets/aa0ac3c7-131e-4879-93fa-735ad637a0f6" /> <img width="1144" height="777" alt="image" src="https://github.com/user-attachments/assets/0dcbf874-cd28-4465-9341-58699bb3ec2f" /> <img width="945" height="545" alt="image" src="https://github.com/user-attachments/assets/6466f01e-b2ce-4268-bcc3-c0f679e91aed" /> <img width="1440" height="992" alt="image" src="https://github.com/user-attachments/assets/f10bdab7-8081-4dbe-b527-a7671ca01e38" /> <img width="416" height="224" alt="image" src="https://github.com/user-attachments/assets/1aed6f10-c0f1-43b0-b828-327d2860d8ab" /> <!-- 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 The Typhon needed to be seriously reworked or just go. The minutemen also needed a subhsuttle ship. Kills two birds with one stone. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Adds the Cetus-class Interceptor add: Adds the Mira-class Pursuit Shuttle add: Adds a photocopier and an F4 to the Atlas remove: Removes the Typhon /: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. --> --------- Co-authored-by: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
## Changelog :cl: fix: the leftmost shed on beach bunkers will no longer refuse to close/open when you press the buttons in times of need /:cl:
<!-- 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 Adds the folding brace SGR-9 Beam PDW to the Etherbor lineup and maps it into a ruin/ ship. The PDW deals 20 damage at 10 armor piercing with a capacity for 26 shots in a military cell. Semi-auto and 2 shot burst. Ideal for your rear-line personnel. <details> <summary>Pictures:</summary> <img width="390" height="263" alt="image" src="https://github.com/user-attachments/assets/2ea202a1-3c5b-4754-a6b3-89f7839998dd" /> <img width="87" height="48" alt="image" src="https://github.com/user-attachments/assets/7df009b0-7a4e-4914-a716-5249903bf232" /> <img width="1023" height="256" alt="image" src="https://github.com/user-attachments/assets/3cb1d16f-470c-447c-b444-b8c36cc57309" /> </details> https://github.com/user-attachments/assets/5a9dcfad-9681-4b8c-ba4d-73881200a0da <!-- 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 The Etherbor lineup is small as always and this helps to fill out another niche in a fun way. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Added the SGR-9 PDW /: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. --> --------- Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com>
<!-- 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 CLIP name style no longer includes Greek mythology. Changes the Arke-class → Gliese-class, now descending from the Proteus → Sculptor-class. Sculptor, named after a sculptor's studio contains the red dwarf Gliese 1, only 14ly from Sol. <!-- 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 Consistency with CLIP naming scheme <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: The Arke-class is now retconned as the Gliese-class /: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. -->
<!-- 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 <img width="1037" height="516" alt="image" src="https://github.com/user-attachments/assets/0a4617e8-994d-4744-b5eb-399fd09c9ec6" /> ## Why It's Good For The Game Makes it bigger looking. Its big gun. ## Changelog :cl: add: Invictus sprite touchup /: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. -->
…ns (#6088) ## About The Pull Request Updates the Centcom Z-level to fix door and wallmount orientations. Every single time I saw them it really, really annoyed me even if CC is mostly antiquated. Also changes the walling to modern anywalls (indestructible still). <img width="3008" height="2720" alt="image" src="https://github.com/user-attachments/assets/9b90ebf4-fc15-415d-a06a-7473f544d03d" /> ## Why It's Good For The Game It makes an outdated debug z-level look a little nicer and for anyone watching gives off a better impression. Even if it's later replaced, the misaligned doors and walls REALLY bother me and I doubt i'm the only one. ## Changelog :cl: fix: Orientations of doors and wallmounts on CentCom. fix: Replaces outdated indestructible walls with Anywalls (they're still indestructible.) /:cl:
<!-- 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. --> ## Why It's Good For The Game file in the dmi that wasnt supposed to be there ## Changelog :cl: add: inteq hat 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. -->
## About The Pull Request Used to suddenly become less accurate when you held it in two hands ## Why It's Good For The Game Fixes good ## Changelog :cl: fix: Himehabu is no longer less accurate when wielded /:cl:
<!-- 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 changed nt_generic to warra_generic in dmi, small sharplite pistols have their inhand sprites again <!-- 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 fixes good <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: in hand sprites for challenger, rhino and x11 are back /: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. -->
<!-- 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 Changes the name of the shortwave radio design in the autolathe from Station Bounced Radio to Shortwave Radio <!-- 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 There's no space station in MY space station 13 <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: Shortwave radio is now named shortwave radio in the autolathe /: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. -->
<!-- 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 a couple typos, pronoun issues, and missing periods across a couple of files. <!-- 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 Grammar is good! <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: spellcheck: Fixed some typos across a couple files /: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. -->
## Why It's Good For The Game sprites by @thearbiber ~~It has no sprite but~~ I feel like it should fit on the belt due to not being massive and all one-handed melees fitting on the belt <img width="115" height="102" alt="image" src="https://github.com/user-attachments/assets/773f48b7-bacc-4c53-bd14-3ed3d1bd1b3c" /> ## Changelog :cl: generalthrax, thearbiber balance: Flyssa now fits on the belt add: Flyssa now has a belt sprite /:cl:
…rather than just anything (#6093) <!-- 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 Hugging and handshakes now check if you are pulling the targeted mob rather than just anything <!-- 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 You should hug only the person you are pulling. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: Hugging and handshakes now check if you are pulling the targeted mob rather than just anything /: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. -->
<!-- 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 Resprites utility jumpsuit and jumpskirt, adds rolldown for jumpskirt <details> <summary>The sprites</summary> <img width="1199" height="824" alt="image" src="https://github.com/user-attachments/assets/f9e44b4e-f672-4546-8954-d7cb357c7794" /> </details> ## Why It's Good For The Game More updated sprites, and fixes a bug ## Changelog :cl: add: resprite utility jumpsuit and skirt fix: added rolldown for util jumpskirt /: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. -->
## About The Pull Request Autolathe button to print an 8x50mmR en bloc clip for the Illestren is mislabelled as a "stripper clip" despite an actual stripper clip for a different weapon also being printable, with nearly the same label. This fixes it. <img width="532" height="600" alt="enblocfix" src="https://github.com/user-attachments/assets/5f07d407-b1a3-4151-8aee-7e62992a7470" /> ## Why It's Good For The Game En bloc clips are not stripper clips. Clears up confusion. ## Changelog :cl: fix: illestren en bloc clips in the autolathe are now correctly labelled /:cl:
<!-- 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 New snacks that comply with server lore and add some extra flavor! Now introducing Channeler Meat Candy and Ringer's Carps, as new food to waste your hard-earned blood money credits on purchasing from overpriced snack vendors on Installation Trifuge. A portion of proceeds goes to Caldwell's "Reclaiming Minya" fund. <img width="285" height="226" alt="image" src="https://github.com/user-attachments/assets/6a76d6fd-1998-4a72-a90c-4902fe9accc5" /> ## Why It's Good For The Game Removes a clown reference and replaces it with lore-compliant snacks. Also adds another lore-compliant snack to replace the incredibly aging current one. ## Changelog :cl: Cloudbreak add: Ringer's Carps and Channeler Meat Candy is now being distributed to your local markets! del: Scaredy's Private Reserve Jerky and Cheesie-Honkers. Homemade jerky can still be made and is preserved. /: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. -->
<!-- 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 <img width="521" height="390" alt="image" src="https://github.com/user-attachments/assets/57838d43-5113-49f0-827c-db0272ef996c" /> ## Why It's Good For The Game species compat ## Changelog :cl: add: More species compatability for SRM /: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. -->
## About The Pull Request Adds CM-82 magazines to the game, with sprites done by the wonderful @Imaginos16! <img width="64" height="32" alt="magimage" src="https://github.com/user-attachments/assets/a7e38b38-5f74-499b-b08f-23a1338f46be" /> <img width="64" height="32" alt="casketmagimage" src="https://github.com/user-attachments/assets/b2e167eb-e23a-4818-8af5-bdbebeed77ee" /> Extended with a 45-round capacity, and Casket with a 60-round capacity. Extended is in cargo for 750 credits (with the price of the SKM extended magazine lowered to match, it was a bit much really). ## Why It's Good For The Game They didn't have any special goodies for their assault rifle, leaving them a bit behind in comparison to pretty much everyone else. This helps mitigate that and gives their minutemen some more encouragement on sticking with the standard service rifle. ## Changelog :cl: Cloudbreak, Imaginos16 add: New extended magazines for CLIP! balance: Extended magazine cargo cost reduced to 750 credits from 1250 credits. /:cl:
<!-- 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 <img width="1065" height="409" alt="image" src="https://github.com/user-attachments/assets/45ae4a1c-55e8-4a31-b9f8-342258d00009" /> ## Why It's Good For The Game Species compatability ## Changelog :cl: add: Digi elites /: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. -->
<!-- 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 makes whistles tiny ## Why It's Good For The Game i'm pretty sure a .357 revolver and a trench whistle are different sizes ## Changelog :cl: balance: Whistles are now tiny /: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. --> Signed-off-by: Addust <80979251+Addust@users.noreply.github.com>
<!-- 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 Add two new elzu horns, "curled" and "twisted" <details> <summary>Sprites/Examples styled</summary> <img width="758" height="567" alt="image" src="https://github.com/user-attachments/assets/5772ef1f-4016-42bc-8799-bd6bc8b71425" /> <img width="232" height="744" alt="Screenshot 2026-04-01 010745" src="https://github.com/user-attachments/assets/88d81c3c-0126-4bd4-b43f-674449556a35" /> <img width="235" height="746" alt="Screenshot 2026-04-01 011747" src="https://github.com/user-attachments/assets/9b135a76-358b-4ee7-88de-030d86e870a6" /> </details> ## Why It's Good For The Game More customization options ## Changelog :cl: add: Add two elzuose horns, twisted and curled /: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. -->
<!-- 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 Energy one by imaginos <img width="1209" height="546" alt="image" src="https://github.com/user-attachments/assets/57752966-973c-4382-996a-1716526f1bb2" /> <img width="1141" height="677" alt="image" src="https://github.com/user-attachments/assets/b60fd081-c43a-4901-8561-14b61327f094" /> ## Why It's Good For The Game sprite ## Changelog :cl: Thearbiber, Imaginos add: angle grinder resprite /: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. -->
## Changelog :cl: fix: Teagarden whatever is back to being an example sector, rather than being spawnable. /:cl:
<!-- 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! --> There was a depreciated color in the list and the bag could spawn empty. ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Fixes are good ## Changelog :cl: fix: BM Coalition Spacesuit /: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. -->
<!-- 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 supports digitigrade was on the helmet ## Why It's Good For The Game fix good ## Changelog :cl: add: srm hardsuit digi 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. -->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update from Shiptest on 2026-04-04-2239Z.