[UPSTREAM UPDATE] 25.1.2025 #105
Merged
Conversation
This file contains 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
## About The Pull Request alternative to #88776 Makes the repair droid unable to be stacked and reduces armor slots to 1 on station mechs except the phazon. ## Why It's Good For The Game You can get to some pretty heavy duty values on certain mechs, especially the durand, with a very intense rate of healing. This makes those items unstackable.  ## Changelog :cl: balance: Reduces armor slots to 1 for all station built mechs except the phazon. balance: melee mech armor has been increased to 20 from 15. balance: mech bullet and laser armor has both been increased to 15 from 10. balance: You can no longer stack the repair droid on mechs. /:cl:
## About The Pull Request Makes it so the DNR trait makes a bit more sense. Blocking borer revive, and not working with lings or vampires who self revive ## Why It's Good For The Game These antags have self revive mechanics, if you take the DNR trait it will leave the soulless body alive in your stead - this makes it so if you have that trait then roll the antag, you don't still only have one life. If we want to make it so you do then we can, this is just the solution that came to me first ## Proof Of Testing  borer one works, source: dude trust me <details> <summary>Screenshots/Videos</summary> </details> ## Changelog :cl: fix: Lings/vampires will no longer revive as soulless bodies with DNR fix: Borers can no longer revive hosts with DNR /:cl:
…ation#2952) ## About The Pull Request This PR makes it so that the description text for each storyteller compares it to other Storytellers, for added clarity. ## Why It's Good For The Game Helps you understand the difference between given Storytellers! ## Proof Of Testing Compiles <details> <summary>Screenshots/Videos</summary> </details> ## Changelog :cl: ReturnToZender add: Updated descriptions to individual storytellers to compare them to each other. /:cl: --------- Co-authored-by: LT3 <[email protected]> Co-authored-by: Waterpig <[email protected]>
## About The Pull Request Added missing Mining borg varient, fixed some of my other PR code and moved it to zubbers instead if skyrat ## Why It's Good For The Game Borg sprite and bug fixes ## Proof Of Testing Complies and works on localhost   ## Changelog :cl: fix: fixed older code and moved to zubber image: Added New Mining Borg Varient /:cl:
## About The Pull Request Title. Now if you see the link, you know itll give you something. ## Why It's Good For The Game bugs bad ## Proof Of Testing <details> <summary>Screenshots/Videos</summary>  </details> ## Changelog :cl: fix: Record links now only appear if there are records to view /:cl:
This reverts commit f127192.
## About The Pull Request Yeah the xeno rework nova did, all but removed player xenos and uhh that's lame so this just resprites the basic xenos, and lets them spawn as other variants. The variants are just visual, and slight health changes, but no damage increases. ## Why It's Good For The Game A tide of black, ugly xenos, while lore accurate, is boring and bland, and a waste of these sick sprites. ## Proof Of Testing <details> <summary>Screenshots/Videos</summary>   </details> ## Changelog :cl: image: basic mob xenos now look fly as hell, like our real xenos. /:cl: --------- Co-authored-by: Waterpig <[email protected]>
…moves around decal code (Bubberstation#3000) ## About The Pull Request See name ## Why It's Good For The Game It's also failing CI and I'm not wiping flavor cobwebs from a map ## Changelog :cl: fix: Cobwebs no longer scream from appearing in space as long as they're nearstationed /:cl:
… over xenobio (#88935) ## About The Pull Request Basically if there's too many slimes on a single turf, the slime will not split. The define I set is 2 (which can change) so you can still reasonably spam a few monkeys inside a 3x3 cell and expect the slimes to split. Overcrowding isn't really meant to stop people from doing xenobio like this, it's to stop instances where people add way too many monkeys and in 30 minutes everyone's clients turn into a powerpoint when entering xenobiology. Basically to prevent this from happening. ``` ADMIN LOG: '(thesharkenning)'/(white wolf) deleted all instances of type or subtype of /mob/living/basic/slime (979 instances deleted) ADMIN LOG: '(thesharkenning)'/(white wolf) deleted all instances of type or subtype of /mob/living/basic/slime (641 instances deleted) ADMIN LOG: '(thesharkenning)'/(white wolf) deleted all instances of type or subtype of /mob/living/basic/slime (962 instances deleted) ``` ## Why It's Good For The Game I'm sure it's hell on the server too, but it's definitely something that makes byond cry. You don't need a whole lot of time: just a lot of monkeys and a single slime. ## Changelog :cl: fix: Fixes uncapped xenobio slime multiplication which can easily result in hundreds of slimes. /:cl:
## About The Pull Request Resolves [this issue](Bubberstation#2991). It should be noted that this fix should be mirrored to any other species with such unique organs, but I can not think of another. ## Changelog :cl: fix: Shadekins with the fluffy ears had the fluff trimmed, allowing them to hear the hive mind again /: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 Fixes the blue security battledress which previously had a bugged sprite by adding the tag female_sprite_flag to remove the akward invisible pixel it had (thanks waterpig for finding this) Additionally this PR adds two new variants of the Battledress! + RedSec Battledress, available in the multisec vendor! + HoS Battledress, available in the command vendor and the HoS Garment bag! <!-- 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 Fixes a silly bug with the battledress and adds more variety! <!-- 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. --> <details> <summary>Screenshots/Videos</summary>     </details> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: Fixed Security Battledress sprite add: Added Red Security Battledress and Head of Security Battledress /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: Waterpig <[email protected]>
MosleyTheMalO
requested review from
Majkl-J and
projectkepler-ru
as code owners
## About The Pull Request Turns out the infiltrator MOD never had a digi sprite to begin with so i fixed it! Interdyne MOD someone in the past did START but was very sloppy with it and only did like half of it and never finished it so i did. Thanks to Wolf751 for helping with the helmet sprite on the infil MOD This PR also includes a small fix for the mining borg i made as my dumbass forgot to add the lighting/eyes sprites for the mining borg when they are standing....thanks skyrat... ## Why It's Good For The Game Fixes the issue of people with digigraded legs being naked on chest/leg area with said MODs and a bug fix overall which is always nice ## Proof Of Testing Compiles and works on localhost Infil MOD   Interdyne MOD   ## Changelog :cl: image: Adds Digi Sprites for infiltrator and Interdyne MOD fix: Also fixed the missing lights/eyes on the miner borg i made, whoops. /:cl:
## About The Pull Request Title. ## Why It's Good For The Game very funny when it happens but it probably shouldnt ## Proof Of Testing none ## Changelog :cl: fix: Silver slimes can no longer produce fucking contagious changeling zombie virus /:cl: --------- Co-authored-by: Waterpig <[email protected]>
Let it be known that maybe one should test with the actual ruin instead of relying on CI tripping on it Also shark merged my PR without checking CI point and laugh
…tion#3006) <!-- 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 Two new hair styles: Short hair bob and Long hair Smoothy Both pictured here!:   Additionally tweaks Twintails Berly to be compatible with snout sprites Also tweaks the Synthetic Joint Separation markings to have Hand variants so it no longer breaks with the hands and displays properly! <!-- 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 More customization and fixing some small errors with my previous sprites <!-- 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 Both new hair styles and the fixes display properly! <!-- 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. --> <details> <summary>Screenshots/Videos</summary>     </details> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Short (Bob) Hair add: Long Smoothy Hair fix: Tweaked Ponytails (Berly) to work with snouts fix: Tweaks Synthetic Joints to display properly /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: Waterpig <[email protected]>
…#3007) ## About The Pull Request Adds a new hairstyle to the game: "tentahair", which looks like a bunch of tentacles coming out of a character's head/back. ## Why It's Good For The Game More character options! (why have I not seen any anthro goliaths yet.) ## Proof Of Testing <details> <summary>Screenshots/Videos</summary>     </details> ## Changelog :cl: add: Added a new hairstyle based off of goliath tentacles /:cl: --------- Co-authored-by: Waterpig <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About The Pull Request
Upstream update 25.1.2025