#29 Перенос обновлений с Beta на Alpha сервер #1353
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 Adds the beagle mug, sprited by ryan180602 > from pull: Baystation12/Baystation12#32695  ## Why It's Good For The Game The Atlas was looking very lonely so I gave them a mug to brighten their day. ## Changelog :cl: rye-rice, Jedi Toothpaste add: adds Beagle Mug add: adds Beagle Mug to Atlas Class /:cl: --------- Co-authored-by: rye-rice <[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 <details><summary>screencaps</summary> <p>        </p> </details> Adds some planetary lighting defines and applies them to relevant planets. I had noticed I had an old pr that did this (among other things) so I ripped this out. Values are entirely subject to change I don't remember where I got them from and I'm not a so called 'colour theorist' As a coincidence planetary turf files are cleaned up a little by this. <!-- 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 A little bit of atmosphere fluff. <!-- 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: Some planets now have new lighting values. Please report back on if they are "Pleasant" /: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: Erika Fox <[email protected]> Signed-off-by: FalloutFalcon <[email protected]> Signed-off-by: Erika Fox <[email protected]> Co-authored-by: Bjarl <[email protected]> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-by: rye-rice <[email protected]> Co-authored-by: Sun-Soaked <[email protected]>
…emap Expansion #5 (shiptest-ss13#3627) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request This removes a substantial amount of bullshit from atmospherics, like the 3 made up gases that only served for powergaming purposes. This PR instead replaces them with much more fitting IRL gases seen in irl planets such as: - Argon - Carbon Monoxide - Sulfur Dioxide - Ammonia - Metane - Ozone Argon in particular inherits the fire suppression behavior from noble gas, HOWEVER, the threshold to stop reactions has been increased from 10 mols to 75 mols. this should pose an suffocation hazard The values to atmos fires have been tweaked, some gases that had no entaphy now have it This PR also adds a very basic chemical odor system, to detect certain gases based on smell, in case you don't have an atmos analyzer on you, and also to get you to actually siphon trace amounts of gases because they stink up the place in case of a breach ## Why It's Good For The Game removes cruft, replaces it with actual, fun, non-powergamey stuff that will be used soon:tm: and also has the potential to have a bunch of fun and realistic interactions when someone more familiar with this stuff than me codes it. For example outside of planetary gases, some ideas I had were: - Sparks creating ozone - Ammonia and chlorine mixing creating "snow" (Ammonium chloride) so a leak of both gases would cover the floor with snow, this sounds like a fun reaction to scare the shit out of people - smarter people like @Thera-Pissed would probably know more what to do ## Changelog :cl: add: You can now detect certain gases from smell, most notably plasma add: Adds 6 new gases, all unused at the moment del: 3 gases, Pluox, Nitryl, and Stimming balance: The noble gas suppresssion threshold has been increased from 10 mols to 75 mols balance: Various gases have had their enthalpy (energy released during fires) adjusted, changing the behavior of gas fires slightly. balance: Plasma is a much more potent skin/eye irritant balance: Hydrogen gas is no longer visible fix: Freon's stage one breath effects should work now, before they were tied to nitryl's amount /: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]> Co-authored-by: Erika Fox <[email protected]>
… it (shiptest-ss13#3638) <!-- 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 yeah ## Why It's Good For The Game saves 2 lines ## Changelog :cl: code: empty energy weapons now get emptied slightly differently, no player-facing changes /: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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Adds 357 speed loaders to the indie viper guncase. ## 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. --> Consistency with the syndicate viper guncase as that one got speedloaders included. Having to buy however many 750 credits speedloaders you needed tacked on a lot of extra cost to the indie viper. ## Changelog :cl: add: Indie Viper guncase comes with 2 speedloaders. /: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 Adds the Elated Bolide Class and assorted fluff that I made for it.   The Elated Bolide is named for the excitement that it's crew experiences when hitting a hostile atmosphere, and the way that a particularly hard entry can appear from the ground. In the frontier, the Bolide-Class is used both in exploration and civilization building (imperialism) with the marines being equipped with a surplus of equipment to quickly break down and salvage unwanted structures (enemy fortifications) while building colonial infrastructure, such as concrete roads (bunker complexes). 6 Marines are carried, 4 of which are marine engineers. The traditional assignment is splitting the marines into 2 squads of 3, although in the end it is up to the Captain and Marine LT to decide how the teams are organized. Several fluff papers have been included to try and encourage roleplay aboard the vessel, as well as a degree of paperpushing. The Bolide is well defended from the sides thanks to it's Etherbor Point Defense Systems, with the rear mounts carrying a lighter deterrent turret. The Bolide is also well armed thanks to it's armory, able to stock all 6 marines (assuming that some marines are willing to carry Tools of some flavor instead of a large gun), and contains some specialist gear for sensitive explosives defusal. And explosives planting. TLDR: - High powered turrets near the cargo bay - Surplus of basic engineering equipment - Decently sized armory - Decently sized cargo bay - Lack in medical, advanced engineering equipment. - Lots of demolition tools. <details><summary>Pictures</summary> <p>     </p> </details> <!-- 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 's PGF content. Needs a bit more decor though but I'm at a loss for how right now. Technically completely playable. <!-- 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: A new PGFN vessel has entered the frontier - the Elated Bolide class makes a bright entry into the local system. /: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: Erika Fox <[email protected]> Co-authored-by: meem <[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 Fixes shiptest-ss13#3536 Fixes shiptest-ss13#3547 Ammo stacks added a check to prevent magazine to magazine filling which also prevented directly filling guns with anything that wasnt an ammo stack, which broke stripper clips and speedloaders. Revolvers escaped this since they handle everything related to loading completely differently. This moves the strict ammo stack check down a bit so ammo holders that are able to instantly transfer ammo between eachother can instead of dont ## Changelog :cl: fix: strippers and speedloaders for rifles now work again /: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 Holocalls now tell you they are coming from a location rather than from fruity sarathi woman ## Changelog :cl: add: Holocalls now tell you they are coming from a location /: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. --> Reorganizes ammo into bulk ammo and magazines <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Usability <!-- 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. --> :cl: code: Cargo ammo has been reorganized so it's not godawful /: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: Bjarl <[email protected]>
🆑 code: cauterization now checks for pain feeling traits instead of morphine balance: morphine pills no longer addict and overdose you /🆑
<!-- 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! --> Changes the cost of jetpacks at the outpost to 1000 from 2000. Adds the jetpack harness to the outpost for 1750. Removes the jetpack harness from the black market since that's redundant now. Stock of the hardsuit jetpack upgrade in the black market is now variable from 1 to 3, price min is 1250 from 1750. Improvised jetpacks in the black market are now between 100 and 500. Fullspeed var now determines whether you're affected by damage slowdown while jetpacking instead of giving you a speed boost. Hardsuit jetpack upgrade now moves at fullspeed. ## 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. --> Jetpacks are pretty oppressive in space combat, and most space fights are determined on whether you have one or not due to the mobility and extra speed they provide. Jetpacks are currently costed prohibitively as well, costing as much as a hardsuit itself. The reduced costs are still a decent investment of cash, but won't break the bank now. They're also important for general space exploration, so having them cheaper doesn't hurt in that regard as well. Jetpacks being affected by damage slowdown seemed weird to me, since you're not moving under your own power, but the propulsion of gas from the jetpack. Why would how hurt you are change that? With the movement changes, jetpacks are still suited for hit and run attacks since you're able to easily retreat without fear of damage slowdown, and a lot more reasonable to hit now on the other end since they aren't moving at insane speeds which should help lessen the disparity of having a jetpack or not in space combat. ## Changelog :cl: add: Jetpack harnesses to outpost for 1750 del: Black market jetpack harness balance: Jetpacks cost 1000 from 2000 at the outpost balance: Black market improvised jetpack average cost reduced balance: Black market hardsuit jetpack upgrade min price reduced balance: Jetpack fullspeed var now determines whether you're affected by damage slowdown rather than giving a speedboost. /: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 Addresses a longstanding pet peeve of mine. As originally implemented military balaclavas were just better gas masks. Now they just function as normal breath masks that can hide your identity, providing no passive gas protection nor hailer functionality. Also rewrites the description for the regular balaclava to no longer be a joke. **This PR contains repaths, don't TM it alongside map PRs.** ## Why It's Good For The Game actual gas masks should be useful enough to justify using them instead of balaclavas when gas is about ## Changelog :cl: balance: Balaclavas and half masks are now just breath masks, not gas masks balance: Normal balaclavas can use internals too fix: Balaclavas don't have a joke description anymore iconadd: mask-up sprites for NGR balaclavas and masks /: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 This PR kills a few stragglers in alert descriptions from the Great Unstation that reference areas of "the station" when speaking about low batteries or lockdowns in cyborgs or mechs. Also replaces an Ethereal reference with our other beloved lightbulbs. ## Why It's Good For The Game Robotics? Dormitories? AI satellite? What are you talking about, recruit? It's 505 FSC on the frontier, and we're about to fly head-first into an electrical storm. ## Changelog :cl: tweak: unstations some of the hud alerts. /: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: Geoengi <[email protected]>
…est-ss13#3673) ## About The Pull Request Fixes a few magazines to work again after Fallcon's refactor pr, makes the Saber's stock actually work, and repaths it ## Why It's Good For The Game The Saber should be useable after it has fired 30 shots ## Changelog :cl: fix: Fixed certain guns being unable to accept mags fix: Saber stock works now /: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 As title <!-- 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 they're a junk item once they're empty. Clean is nice. <!-- 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: You can now recycle gun cases and ammo boxes. /: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 She was in sprites but wasn't in game... <!-- 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 CLIPtent <!-- 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: CM357 pistol add: pistol cases for the CM70 and CM357 /: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 misfires can now go off into any bodypart (you'll shoot your eye out) Guns can now have a misfire multiplier assigned to them frontier import guns now misfire more often (I thought this would be funny) <!-- 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 Thought it'd be nice <!-- 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: balance: frontier import guns now misfire more often add: guns can now misfire into your head. /: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: Erika Fox <[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  <!-- 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 :cl: imageadd: Added Kepori sprites for loadout dresses. /: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 title ## Changelog :cl: fix: chat icons work again fix: fishing UI has icons again /: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  Maps all that crap on both NT ships and NT ruins. **Generic stamps are for non-command jobs.** NT logo is temporary until the rename happens, so it sucks. <!-- 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 Faction stuff or whatever. <!-- 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 Nanotrasen, Vigilitas and N+S stamps. /: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 fixes shiptest-ss13#3688 ## Changelog :cl: fix: 2 bolide map fixes. quality control is my passion. /:cl:
## About The Pull Request Adds two new gas masks for Vigilitas and Inteq ships. Kepori variant and touchups by @thgvr.  ## Why It's Good For The Game Both of these factions lack options to protect themselves from hazardous gasses. This rectifies that. ## Changelog :cl: add: Vigilitas gas masks, which are added to the Harrier and Ranger add: Inteq gas masks, which are added to the Colossus, Vaquero, Talos, and Valor /: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. --> Makes SKM hermits use the right ammo (and shoot less) removes the ammo that's not supposed to exist <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Code cleaner, mob balanced. Ship? Sterilized. <!-- 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. --> :cl: add: Hermits now breath weirdly sometimes. balance: SKM hermits have realized they have been using the wrong calibre round for the past 3 years and are now fixing such. /: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: Erika Fox <[email protected]> Co-authored-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 Adds Platforms Sprites by Spooky.  <!-- 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 Good mapping tool/trick. Helps create some of those 3d-ish spaces <!-- 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: Platforms. Please use them in maps. they look cool. imageadd: Spooky: Platform sprites /: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: Erika Fox <[email protected]> Signed-off-by: thgvr <[email protected]> Co-authored-by: thgvr <[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. --> Outpost vendors now cost some money (instead of selling everything for free) also ports tgstation/tgstation#54463 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> The economy is in shambles <!-- 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. --> :cl: balance: Outpost vending machines now cost money. /: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: Erika Fox <[email protected]> Co-authored-by: Erika Fox <[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. --> Removes a few cruftpacks Alters descs on a few other packs Adds like one pack moves fishing into its own category <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Cargo continues to become more usuable <!-- 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. --> :cl: add: Some cargo packs have new descriptions code: cargo is slightly more organized. again /: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: Erika Fox <[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 Removes the ORM from Beluga, Box, Schmiedeberg, Colossus, Skipper and Kansatsu. Aspawn ships, Hyena and Gecko still have it, because: - Hyena is a mining/salvage ship, so it needs it. - Gecko is a salvage ship, so it needs it. - I've been told not to touch aspawn ships. <!-- 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 They have no reason to have an ORM! They are not mining/salvage-centered ships, so they can totally go to the outpost to refine their ore! (it's a Dwayne buff in disguise :3) <!-- 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: del: Beluga-class, Box-class, Schmiedeberg-class, Colossus-class, Skipper-class and Kansatsu-class lost their Ore Redemption Machines. /: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 A port of this pr DaedalusDock/daedalusdock#732 Adds a bar to the bottom of the screen that shows click cooldown https://github.com/user-attachments/assets/8824ba1a-2596-4dcf-ae16-2dafdd380666 <!-- 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 I can tell when i can attack next <!-- 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: FalloutFalcon, Kapu1178 add: New bar above your items to show your attack cooldown /: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]>
<!-- 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 Li Tieg is now more similar to shiptest-ss13#3323 style-wise, with the difference that it's in Biodynamics teal instead of fully in VS red. <details><summary>Screenshots:</summary> <p>    </p> </details> Also tweaks Li Tieg's weaponry: - Trauma team looses one Ringneck, but gains a Rattlesnake. - Rattlesnake is just cool. - Captain looses the Viper. It's replaced by a Himehabu and an edagger. - A Himehabu fits CS caps waaaay better than a Viper. Edagger is also CS special. - Director looses the Ringneck and the Dart Gun. They only get an edagger now. Sorry. - I'd say they really don't need a gun. Edagger is cool though. <!-- 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 stop with the carpets and curtains. I beg you. <!-- 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: tweak: Reflavored Li Tieguai-class to use Cybersun Biodynamics colors. balance: Removed the Viper, the Dart Gun and two Ringnecks from the Li Tieguai. Instead, added a Rattlesnake, a Himehabu and two edaggers. fix: Li Tieguai captain is now an officer. /: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. -->
* 2 новых синергирующих ствола + чистка моего проеба пр 1301+1303 * добавление ин-хенд спрайтов, добавление индикации заряда, изменение механики синергии нт-сл плазма проджекшн девайсов * В честь погибших в подвалах тестеров * чистим теги фракций в том числе скайбрейкеру * В честь погибших при тестах сотрудников НТ * В ЧЕСТЬ ПОГИБШИХ КОВРИКОВ... * +реле ткоммов НТ * точно последний микрофикс * фикс доступов се * ТОЧНО-ТОЧНО последний фикс всяких названий шкафов
* 2 новых синергирующих ствола + чистка моего проеба пр 1301+1303 * добавление ин-хенд спрайтов, добавление индикации заряда, изменение механики синергии нт-сл плазма проджекшн девайсов * В честь погибших в подвалах китайских детей * Фикс бранч ишшуя(надеюсь) * Фикс /// * ещё один фикс бранч ишшуя * Выполняет условие номер 2 смешным способом * Добавляем четыре строчки с комментариями целадон адд * Взлет субшаттлов с планет из состояния "пристыкован к матери" * ВОЗВРАТ КОРОБОК В ПРЕЖНЕЕ СОСТОЯНИЕ * расположение инициализации коробки с донками * последнее изменение порядка инициализации --------- Signed-off-by: XoMkA-BY <[email protected]>
* Обновляем заодно атлас с прическами хуманскими * Включаем рандомизацию носика риолам * Рефакторинг по меткам
* Меняем клон урон от легион коров на токс урон * действительно сомнительный коммит ради модульности * Теперь точно без клонлосса и с нормальной работой
* Мед бафф, реммап Box, сюрджик наборы * бокс теряет 1к * лишний лайт фикстчр * Док порт бокса, камера бба кансатс, док порт рейнджера * мини фикс рейнджера
Signed-off-by: Redwizz777 <[email protected]> Co-authored-by: Redwizz777 <[email protected]>
* No slowdown for syndie duffelbags * Фикс * Revert "Фикс" This reverts commit d2fea0f. * WDwad * Во * Мердж конфликт фикс * фикс
MysticalFaceLesS
requested review from
RalseiDreemuurr,
SillyMoff and
RoyaltyRat
as code owners
MysticalFaceLesS
added
🔱Слияние Бета и Альфы ➰
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.
[Перенос №28] - (#1308)