[pull] master from shiptest-ss13:master #416
Open
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
pull
bot
added
⤵️ pull
and removed
DME Edit
Sprites
Map Change
Github
Code Change
labels
github-actions
bot
added
DME Edit
Sprites
Map Change
Github
Code Change
tgui
Sound
Dependencies
labels
🆑 balance: medium marine armor now costs 3k at da outpost. /🆑
🆑 balance: frontiersmen turrets kill everything not in their faction /🆑
<!-- 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! --> Fixes #3772 ## 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. --> ## Changelog :cl: fix: 9mm AP boxes now work right /: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: Theos <[email protected]>
<!-- 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 Bandage lifespan is now a flat 1 point = 1 tick of bleed staunching instead of also being reduced by the current bloodloss speed ## Why It's Good For The Game Didn't scale well with higher speeds of bleeding, effectively making them unmanageable since the rate of bleed healing is balanced around casual bloodloss and not ranked and competitive bloodloss ## Changelog :cl: balance: bandages will no longer fall off faster with more bleeding /: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: Theos <[email protected]>
🆑 add: walls on wasteworlds now have a chance to start damaged balance: walls on waste worlds are now universally weaker /🆑
<!-- 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 Touches up saycode related to succumbing just a little bit. Originally was intended to actually solve a problem, but it didn't, and I figured it was fine to add the tweaks I made anyways for the hell of it. Also made the dramatic "last words" screen text a bit more consistent. Yes, I know it was for drama reasons, but this is far better than having to use an entire get_hearers call for it, and I doubt anyone will notice a difference. ## Why It's Good For The Game Succumb code was kind of a mess, so I cleaned it up. Honestly, I don't think this should be in say() at all, but hey, I just work here. ## Changelog :cl: tweak: Whispering (as in, directly using the verb or typing `#` before your message) will now skip the succumb confirmation prompt, while normal talking will still continue to prompt if you want to succumb. /: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: Sun-Soaked <[email protected]>
🆑 balance: plasma cutters r more expensive. balance: angle grinders are cheaper, and come with a bowman headset. /🆑 --------- Signed-off-by: Erika Fox <[email protected]>
…3717) ## About The Pull Request Used to be able to see what someone was wearing underneath their hardsuit ## Why It's Good For The Game Oversight probably. I don't think the NGR / Hardliner / Ramzi hardsuits are supposed to have this var applied to them to begin with ## Changelog :cl: fix: You can no longer see through Marauder hardsuits /:cl:
resolves #3926
<!-- 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 (remade pr due to check fails) Makes the ringneck 8 rounds Makes the commander 12 rounds Adjust the sprites to match ## Why It's Good For The Game Apogee and I decided this would be better ## Changelog :cl: add: Touches up the ringneck and commander magazine sprites balance: Ringneck is now 8 rounds and commander is 12 rounds. /: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: retlaw34 <[email protected]>
## About The Pull Request Adjusts long-ranged rifles to either now have recoil or have reduced recoil. ## Why It's Good For The Game Most snipers either had 0 recoil or had as much recoil as the real screenshakey Taipan. Makes long-ranged shooting not send you to hell. ## Changelog :cl: balanced: Adjusted recoil on Snipers to be lower on average /:cl: --------- Co-authored-by: github-actions <[email protected]>
Alcohol Reagents were previously in a very large file, which annoyed me. I moved them into some mildly smaller files that should annoy me less when I look at them. ## Changelog :cl: del: kong drink /:cl:
## About The Pull Request Reflavors medals to no longer mention things such as "Cargonia" or "Robust Security" and be more faction agnostic. Should make them feel less like slop to use. ## Why It's Good For The Game Decrufting what's otherwise a fun RP feature. ## Changelog :cl: add: New medal descriptions and renames. /: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 It works now ## 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. --> ## Changelog :cl: fix: mech looping repairs loop now. For real. /: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: Theos <[email protected]>
## About The Pull Request ports tgstation/tgstation#51217 tgstation/tgstation#59543  ## Why It's Good For The Game @Imaginos16 asked me to ## Changelog :cl: Ryll/Shaps add: Adds a config option for OOC kindness commendations! When enabled, a small percentage of the crew gets asked if anyone made their round better, and those people will get a little heart next to their name in OOC for 24h! /: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  seems dumb! is now  unless someone is funnier than I am and recommends a better desc. also tomatoes are fruit food type but vegetables when in spaghetti? thats dumb I fixed that <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game replaces dumb description makes food type accurate <!-- 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: spaghetti desc and food type updated /: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: FalloutFalcon <[email protected]>
## About The Pull Request Minorly re-decals the Miskilamo line of ships. Mostly clearing out that sharp white against the grey / black that doesn't look that good. Kept it as consistent as I could throughout the three ships. I also did a few extra, smaller decaling in certain areas like crew quarters or areas with those weird grimy tiles. Combines cryo and crewquarters into one area and combines the bathroom, washing machine room, and central hallway into one area as well for the Mudskipper. Replaced the circular saw (angle grinder) with a plasmacutter. Replaced the decaying armour vests with normal ones on the Kilo and Shetland. Axes the airless turfs on the Kilo, and streamlines the big 2x3 airlocks on the Mudskipper and Shetland.      ## Why It's Good For The Game This pr does very little other than getting rid of those white decals which I felt weird to me. Most everything else was unchanged. Mudskipper area stuff was cut down a bit because the thing chugged as much power as a Riggs at half the size, on one pacman to boot. I don't think a room needs a APC for a washing machine and one lightbulb. It's a salvage ship so its probably fair to have a plasmacutter and angle grinder. The presence of the Shitty armour vests felt like an odd choice. They just sit there eternally, worn by no one. May as well just have normal ones. Not like they're that big of an advantage in the grand scheme of things. ## Changelog :cl: del: Removed the white decaling from Miskilamo ships (Mudskipper, Kilo, Shetland) balance: Mudskipper is now more compact on areas and has a plasmacutter balance: Kilo and Shetland now have normal armour vests fix: Kilo no longer has airless tiles under the prechargers, and airlocks should Work Better /: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 a new ruin to the iceplanet ruin pool - Tesla Lab <details><summary>Screencaps</summary> <p>    </p> </details> ## Why It's Good For The Game This is an very hard ruin filled with nefarious tricks and a decent bit of loot. I want it to challenge people. ## Changelog :cl: add: CLIP has lost contact with a facility in the system. Go find it. Go see what happened. I dare you. /:cl: --------- Co-authored-by: Bjarl <[email protected]>
<!-- 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 a few adjustments to inteq ships:     - all inteq ships received platforms around cargo catwalks - misplaced decals fixed on valor and colossus - gondola replaced with pug on colossus - beds in dorms replaced with bunk beds on all inteq ships - randomized ship numbers on inteq ships - inteq ships have handrails ## Why It's Good For The Game a map maintainer, maintaining maps? stop the goddamn presses ## Changelog :cl: fix: fixed misplaced decals and lack of platforms on inteq ships fix: added handrails to inteq ships del: removed inteq gondola /: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 <!-- 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 <!-- 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: the Derecho's missing APCs have been replaced /: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 Because of how Inteq clothing was pathed, uniforms were failing to get the subtype for skirts meaning they could not be properly selected. Ex. expecting `.../corpsman/skirt` when it was actually `.../skirt/corpsman`. This fixes the paths for skirts and updates them on used maps. <!-- 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 Lets players actually use Inteq skirtlenecks, rather than failing to retrieve the subtype and falling back to a regular turtleneck. <!-- 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: skirt preferences now work for inteq uniforms /: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 says on the tin ## Why It's Good For The Game i forgot in the original pr ## Changelog :cl: fix: SG-8 fits in the holster like all the other energy pistols /:cl: --------- Co-authored-by: github-actions <[email protected]>
## About The Pull Request muddles with a few broken icon states to fix linter failures ## Changelog :cl: fix: you should see the spur sprite a lot less /:cl:
…instead of sheet polycrystals. (#3945) <!-- 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 Currently it takes polycrystals to make chem dispensers, which is jank because you cant turn the ore/refined into the sheet type, while you can turn the sheet into the ore/refined. its weird and dumb. tested on local it works wowie <!-- 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 cant get polycrystals from refinery afaik <!-- 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: chem dispensers take refined bluespace instead of polycrystal /: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. -->
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )