UPDATE-SYNC: ОБНОВЛЕНИЕ с АПСТРИМОМ #26#2868
Open
MysticalFaceLesS wants to merge 55 commits into
Open
Conversation
<!-- 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. --> * Adds League Zohilian, and makes it the default language of the Confederated League. * Removes (Explorat) Zohilian from roundstart languages. <img width="194" height="199" alt="image" src="https://github.com/user-attachments/assets/217b2c46-d269-48bb-bcc7-3ede28c07f2a" /> <img width="880" height="26" alt="image" src="https://github.com/user-attachments/assets/545e0c30-6482-40f4-a959-2ce968716776" /> <img width="911" height="41" alt="image" src="https://github.com/user-attachments/assets/cfad9fb8-7c49-4e4b-be4e-9f2cce137419" /> <img width="584" height="50" alt="image" src="https://github.com/user-attachments/assets/3dc99da2-6eca-44a8-bccd-19b647b61355" /> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> lore addition <!-- 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: League Zohilian del: Zohilian is no longer a roundstart language /: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 Zohilan can be selected as a language in character settings once again. ## Why It's Good For The Game Zohil still exists as a place that characters can be from, it didn't make sense to remove the language as an option in the first place. ## Changelog :cl: add: Returns Zohilan as a selectable language spellcheck: Zohilan /: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. -->
`0.3` -> `30` :cl: fix: Fixed Gorlex Hardliners receiving a 0.3% discount on cloaking devices instead of 30% /: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 small tweak to the name/description of pavement for spelling and grammar reasons. Previously it appeared like this in game: <img width="913" height="113" alt="image" src="https://github.com/user-attachments/assets/4dead442-59ce-4644-b1c5-a5d9f9b3a9fa" /> <!-- 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 Just a tiny change for readability. <!-- 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: pavement /: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 some falsewalls in trifuge maint were broken ## Changelog :cl: fix: trifuge falsewalls /: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 Meant to fix the various docking issues ive noticed over the past few uptimes, along with making some player facing docking stuff easier to comprehend. Meant to be a minor PR, you know the old song and dance In no particular order: - Makes docking error messages less fucking vauge and weird. This isn't even because they're player facing, this is because i geniuely couldnt figure out wtf they meant without looking up the code. This means an admin might actually figure out what is causing a particular docking issue - - Some more docking errors for for adjustable docks since those handle docking different from regular docks. - Fixes improperly mapped docking ports on some ships - - Firefly docking port is no longer extremely dangerous due to missing `disable_on_owner_ship_dock` - - June's Docking port now can dock to other ships - Fixes slimegirl that occurs due to ships sometimes stealing the mobile or even transit docking port from other ships. This should in theory make ship to ship docking a lot less fucked up, but also long rounds (>4 hours) should be a lot more stable - - Should make docking ports a lot less prone to random breakages and errors - Adds edgecase handling for a fair bit of ship code - - Makes Very Big ships have less janky transit zones - - Checking if a ship can dock to an adjustable dock doesn't actually said dock anymore, saving perf and making adjust. docking port bugs less common - Quick dock is now Actually Quick. it should search all docking ports on an overmap object (barring outposts, those have their own handling) to find one that you can actually dock to - Uploading shuttle map templates no longer breaks the overmap sprite due to missing faction datum Needs TM During an early round due to it touching pretty vital code. Otherwise, it shouldn't be noticable too much. ## Why It's Good For The Game Working shipcode that works better is good. ## Changelog :cl: add: Quick dock now searches for docking ports your ship can land at, rather than picking the first option and failing. Quicker! add: Makes docking port messages less vauge. add: Adjusts transit vlevel sizes for larger ships add: In case you are unable to dock to something, you should be given more feedback fix: Shuttle errors due to docking ports being stolen fix: Edgecase handling for docking ports, should fix very rare shuttle bugs fix: Kali, Corona, Dwayne, Firefly, Scarab, Venetia, Typhoon, June, and especially the Quasar have either proper docking ports or fixed docking ports fix: Firefly is now not extremely dangerous to dock to fix: Shuttle code should be less prone to breaking in general /: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: rye-rice <58402542+rye-rice@users.noreply.github.com> Co-authored-by: retlaw34 <58402542+retlaw34@users.noreply.github.com> Co-authored-by: Sarah C <93578146+SapphicOverload@users.noreply.github.com>
🆑 fix: Fixed new languages added to the game not showing up in character preferences /🆑
## About The Pull Request Adjusts ingredient diversity in the fridges so you can make like 3 or 4 recipes about Added two oxygen closets along the main hallway in the Cirrus Added bathroom lock to the crew bathroom and made the command bathroom not lock the crew bathroom Removes a duplicate recharger on Nimbus ## Why It's Good For The Game Just some minor quality of life ## Changelog :cl: add: Added more ingredients to Cirrus / Nimbus add: Oxygen closets in Cirrus fix: Cirrus command bathroom no longer locks crew bathroom, lock to crew bathroom fix: Removed duplicate recharger on Nimbus /: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 replaces a missing console on the kiwi <img width="798" height="676" alt="image" src="https://github.com/user-attachments/assets/94361589-a4c6-4aad-8d18-0a20aab6df39" /> ## Why It's Good For The Game replaces a missing console on the kiwi ## Changelog :cl: fix: replaces a missing console on the kiwi /: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. -->
I feel like this is better to be in the hands of your own agency rather than being a gamey quirk you, the player, has no control over :cl: del: Removed phobia trait /: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 Minor changes to the description of the Woeful Cthonian for spelling/grammar. <!-- 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 clarity and ease of reading <!-- 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: cthonian-class description /: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: OnlineGirlfriend <50865623+OnlineGirlfriend@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 outposts now have proper baseturfs minus Trifuge, since that would require actual map changes and i just want to ping someone and have this merged resolves #2526 ## Why It's Good For The Game Any kind of situation where a turf on an outpost gets destroyed for any reasons reveals that every outpost doesn't have a proper baseturf set up ## Changelog :cl: fix: Outposts now have proper baseturfs /: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 <58402542+retlaw34@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 Adds missing directionals for SUNS bedsheet. <!-- 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 This was the only bedsheet that didn't have directionals, now you will be able to enjoy a cozy SUNS bedsheet facing east and south as well <!-- 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: add directionals for SUNS bedsheet /: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 Spellchecks drink_reagents.dm and makes small edits for consistency. <!-- 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 Readability, you love to see it! <!-- 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: drink_reagents.dm /: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: OnlineGirlfriend <50865623+OnlineGirlfriend@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 Spellchecks weapons.dm for black market weapon supply packs. <!-- 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 Spelling, grammar, clarity. <!-- 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: weapons black market supply packs /: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. -->
…13#5915) <!-- 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 baked potato recipe item to only have potato and cheese, like its ingredients imply ## Why It's Good For The Game Food suddenly manifesting random shit in it sucks. You should know what's in a dish before you serve someone and poison them without a clue why
…3#5905) <!-- 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 an incorrect icon/item state that would cause the grey spacesuit reskin to make the suit dissapear. <!-- 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 Bugfix, no more space strippers. (sad I know) <!-- 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: fixed the armored grey spacesuit reskin /: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 HBG-7 Beam Rifle to PGF factional cargo. Increases ammo efficiency on etherbor beam and assault beam variants. DMR mode untouched. <!-- 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 Following some discussion between Cloudbreak, Jay, Thrax, and myself, where we came to notice a certain mismatch in the potential of the available Etherbor armory when compared with it's peers. Finding a way to tactfully remedy this while accounting for the inherent strength of hitscan weapons puts any dropoff or range/damage changes off the table. Instead, increasing the energy efficiency/ammo economy of the laser weapons helps to offset some of their limitations as well as helping to justify the civilian beamguns premium price tags. Likewise, the absence of an "LMG" style etherbor weapon options is a symptom of the difficulty that would go into balancing a hitscan LMG. Instead, the unscoped HBG-7 has been added to factional cargo for purchase at standard LMG price. <!-- 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 HBG-7 (unscoped) to factional cargo balance: adjusted ammo economy on etherbor beam weapons /: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 swaps the type of glove that Derecho Foremen wake up with from the red insulated variant to the yellow variant. Comparison: | Original (Red) | New (Yellow) | |----------------|--------------| |<img width="72" height="67" alt="image" src="https://github.com/user-attachments/assets/719ffb67-73a0-4837-9930-59ad19c58e7c" />|<img width="72" height="68" alt="image" src="https://github.com/user-attachments/assets/a0d105c0-481c-4835-a3eb-31f1e1591c08" />| Special Dependencies: None ## Why It's Good For The Game Super duper minor thing, but I just think that the newer yellow glove sprites look a bit better than the red ones. Ultimately not really even a big deal because the yellow gloves are easily accessible enough to be swapped out in-game. ## Changelog :cl: code: swapped the type of insulated glove that derecho foremen wake up with /: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 1 ## Why It's Good For The Game The gun is just super hollow point. Literally like 5 bullet will massively reduce the damage. It don't need boomslang recoil ## Changelog :cl: balance: Model H now has 1 instead of 2 recoil /:cl:
## Why It's Good For The Game Feel like these are more supposed to be an ambush mob rather than a runs-you-down-in-the-open mob. Not sure why brown bears would be much faster than Polar bears anyways ## Changelog :cl: balance: Brown bears are now the same speed as polar bears /:cl:
## About The Pull Request A handful of small changes to the Shrike, primarily being inclusion of 2 windows and windowed airlock to allow the captain to interact with the crew easier whilst piloting. Outside of that, the singular missing fuel pipe was fixed, handrails were added to the gear room with additional in the bridge, an oven for the kitchen (Forgot to add it after newfood machines), and a premium coffee machine. Code-wise I added 2 new subtypes of the Negotiator (Buckshot and empty), with the empty variant being present on the Shrike. <details> <summary>Shrike Changes</summary> <img width="330" height="334" alt="image" src="https://github.com/user-attachments/assets/67b0bf87-484f-4018-befa-e1e4cfc51668" /> <img width="292" height="353" alt="image" src="https://github.com/user-attachments/assets/c6ed73c8-7363-4ce3-8663-1e318793ca92" /> </details> ## Why It's Good For The Game A few small changes to the Shrike to fix a few small problems (Unable to cook specific items without an oven, singular fuel pipe missing, cuckbridge) ## Changelog :cl: add: Added 2 Negotiator Subtypes (Empty, buckshot) add: Shrike bridge layout changed, along with additional machines in the kitchen fix: Shrike no longer has a missing plasma pipe /:cl: --------- Co-authored-by: thearbiber <135081923+thearbiber@users.noreply.github.com>
## About The Pull Request removes deepthroat ## Why It's Good For The Game its back again ## Changelog :cl: del: removes deepthroat /: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. -->
…5853) ## About The Pull Request directional attacks will no longer select your own mob as a valid target ## Changelog :cl: fix: you can no longer randomly melee yourself with directional melee /:cl:
Refactors ipc chassis prosthetic selection into being a subtype of a generic bodytype, opening up potential to use the system for other limbs :cl: code: Refactors ipc chassis prosthetic selection into being a subtype of a generic bodytype, opening up potential to use the system for other limbs /:cl:
This adds several new wound types applicable to robotic limbs, and ports some wound refactoring from /tg/ to do so. I've also made some additional code changes to allow rolling for and applying multiple wound types at once, and applying slash/pierce wounds with burn damage weapons that have the correct sharpness. New wound types: - Buckling - The limb is dented, buckled inward, or sheared, making movement more difficult. Caused by brute damage, more commonly by blunt weaponry. - Heat Warping - The limb has been warped by thermal stress, reducing the limb's maximum integrity. Caused by burn damage. - Electrical - The limb's internal electronics have been damaged, causing loss of limb function and damaging internal components. Caused by all damage but especially bullets and lasers. <details> <summary>Treatments:</summary> BUCKLING: - Dented Plating (Moderate Buckling) - Apply a crowbar to bend the plating back into place. - Buckled Chassis (Severe Buckling) - 1) Cut off the external plating with a welding tool, angle grinder, or plasma cutter. 2) Add new titanium, plasteel, or plastitanium plating. 3) Weld the new plating on with a welding tool. - Sheared Frame (Critical Buckling) - 1) Cut off the external plating. 2) Disconnect the internal frame with a wrench. 3) Add new rods to replace the damaged frame. 4) Secure the new frame with a wrench. 5) Add the new plating. 6) Weld the new plating on. HEAT-WARPING: - Surface Oxidization (Moderate Heat-Warping) - Apply a welding tool or similarly hot object to burn off the oxidized layer. - Warped Plating (Severe Heat-Warping) - Apply a welding tool or other source of high heat to re-heat the plating, then bend it back into shape with a crowbar. - Deformed Chassis (Critical Heat-Warping) - 1) Cut off the external plating. 2) Disconnect the internal frame with a wrench. 3) Add new rods to replace the damaged frame. 4) Secure the new frame with a wrench. 5) Add the new plating. 6) Weld the new plating on. ELECTRICAL: - Damaged Electronics (Severe Electrical) - 1) Unscrew the part's shell. 2) Open the hatch. 3) Replace the internal wiring. 4) Re-heat the solder with a welding tool, or apply liquid solder. 5) Close the hatch. 6) Screw the shell back together. - Short Circuit (Critical Electrical) - 1) Unscrew the part's shell. 2) Open the hatch. 3) Prepare the electronics with a multitool. 4) Replace the capacitor in the electronics. 5) Replace the internal wiring. 6) Re-heat the solder with a welding tool, or apply liquid solder. 7) Close the hatch. 8) Screw the shell back together. </details> TODO: - [x] More backend refactoring - [x] Document repairs for each wound - [x] Improve in-game descriptions - [ ] Test on live Robotic limbs ignoring the wounds system puts them in a very strange position balance-wise, while also making them a lot less interesting. This corrects both. :cl: add: Added several new wound types for robotic limbs. balance: Fire stacks now apply wounds normally instead of instantly applying the highest one possible. code: Multiple wound types can be rolled for and applied simultaneously. code: Burn damage weapons can now apply slash/pierce wounds with the correct sharpness. fix: Fixed IPCs taking far more damage in crit than intended. /:cl:
Being shot or stabbed in the eyes without wearing eye protection now has a small chance to cause an eye injury, impairing vision. Scarring on both eyes causes total blindness. <img width="148" height="146" alt="akesi_moment" src="https://github.com/user-attachments/assets/8dd3f32f-8905-49aa-bc81-878ac7eee422" /> <img width="460" height="460" alt="image" src="https://github.com/user-attachments/assets/69f6c47f-91b4-440a-9212-81fb7a7b7eb6" /> This also adds a new quirk that applies a scar on one eye or both. Largely ported from tgstation/tgstation#87209 by SmArtKar From the original PR: > Its a neat lil' feature that makes the game more immersive, and unlocks more roleplay opportunities for players. New quirk gives access to this feature for players who want to make it a part of their character's backstory (or maybe as a part of permanent scar roleplaying). :cl: smartkar, sapphicoverload add: Added eye injuries, remember your safety goggles! fix: Fixed eye damage overlay not being cleared when removing/replacing damaged eyes. /: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. --> Adds in exactly 47 greebles for jungleworlds. Majority of them were made by Sun-Soaked in like 2023, and were updated by me. The rest I made myself. <details><summary>Every Single Greeble</summary> <p> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/ea41bc59-7ce4-479f-96b0-fdb613136d4d" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/792cb1b3-4bcd-407e-b884-6fc7cf9c7122" /> <img width="256" height="288" alt="image" src="https://github.com/user-attachments/assets/d17525cb-b133-49bc-aca4-a090fad39f4d" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/d39b2984-768d-4ba0-a33b-d1117a696dc4" /> <img width="192" height="192" alt="image" src="https://github.com/user-attachments/assets/ad778e3b-0149-4ab0-923b-559904fb4140" /> <img width="192" height="192" alt="image" src="https://github.com/user-attachments/assets/1b0e077b-b00e-414e-9f71-251b6f5e1798" /> <img width="192" height="192" alt="image" src="https://github.com/user-attachments/assets/5f93e302-4101-4e6f-be30-3f055816ff56" /> <img width="256" height="160" alt="image" src="https://github.com/user-attachments/assets/206d9dd5-e6c9-4bff-a8da-b21a23cae45c" /> <img width="288" height="288" alt="image" src="https://github.com/user-attachments/assets/28ee5b43-4f73-4d4b-b242-8712e95e0ed3" /> <img width="352" height="384" alt="image" src="https://github.com/user-attachments/assets/f083d5c1-eeba-41e5-b0ba-4acf53acdd14" /> <img width="96" height="160" alt="image" src="https://github.com/user-attachments/assets/ebffe9d3-11a4-4086-a513-78be55206130" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/eae52dc5-df03-476b-8caa-0d33edb718f4" /> <img width="384" height="288" alt="image" src="https://github.com/user-attachments/assets/d30c9d93-e646-4b80-9249-b83df1a24249" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/fe910cc6-be82-45bc-9b12-1e00809bdc43" /> <img width="288" height="256" alt="image" src="https://github.com/user-attachments/assets/54a57967-3bad-4736-bbc7-87da3edd4c34" /> <img width="288" height="288" alt="image" src="https://github.com/user-attachments/assets/f16e2777-b588-4672-97d6-deeaf4919ed9" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/485f47a2-a209-428b-8fcb-1579c4e6465a" /> <img width="288" height="288" alt="image" src="https://github.com/user-attachments/assets/71bc58f3-46fc-4267-a98f-85d61e523352" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/eb13bef7-0fce-4bcc-98d0-cc5314fdb38c" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/2cea9ba1-a548-40f7-a63b-54f6151ea7b6" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/4f2a9aaf-d605-4c2d-8988-6255f6bae21e" /> <img width="352" height="256" alt="image" src="https://github.com/user-attachments/assets/2b3e7a33-996f-426d-a300-bbd240fefd9a" /> <img width="256" height="288" alt="image" src="https://github.com/user-attachments/assets/83b34ca2-9b85-47dd-bbec-ec177f6fa3d0" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/36fcd073-a424-4bfa-935c-237b66dd3a46" /> <img width="192" height="224" alt="image" src="https://github.com/user-attachments/assets/ce1998cd-d04d-4faf-9acf-05eb5f667829" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/aacc2c39-9f6f-48b4-b61c-88958968a834" /> <img width="160" height="160" alt="image" src="https://github.com/user-attachments/assets/629b208e-283b-47ab-bde4-36a42d37d1cd" /> <img width="224" height="160" alt="image" src="https://github.com/user-attachments/assets/a3c5d7e9-0be2-4cd4-b965-577de40c069a" /> <img width="288" height="320" alt="image" src="https://github.com/user-attachments/assets/69f30f6f-2fd8-437e-9cba-b3d2b36441fc" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/e7dff920-bb18-4d28-b8ec-689c5a469079" /> <img width="160" height="160" alt="image" src="https://github.com/user-attachments/assets/2ae8830f-9b2d-449c-ad03-26e95757d736" /> <img width="224" height="224" alt="image" src="https://github.com/user-attachments/assets/f9a2ecf8-013d-491e-9c6c-ad06bfe2b08d" /> <img width="256" height="320" alt="image" src="https://github.com/user-attachments/assets/3e33adf0-e81d-4e10-b3b7-4948f0287878" /> <img width="256" height="224" alt="image" src="https://github.com/user-attachments/assets/3357b8e9-f92f-4686-b1c1-eb1bbbbfba93" /> <img width="256" height="288" alt="image" src="https://github.com/user-attachments/assets/1c52875e-d2fd-41aa-8a2f-b6f798bb0e19" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/c300d005-41a3-45e5-91f9-59a880669d92" /> <img width="256" height="288" alt="image" src="https://github.com/user-attachments/assets/e7aae85d-a4a9-4e79-ba04-7a7b5efe44ba" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/bb9fff57-cb01-4302-ad9a-1d4cee522800" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/b7072c8b-8053-4a4a-8c59-5fedfbf4182e" /> <img width="224" height="192" alt="image" src="https://github.com/user-attachments/assets/0e446d33-3bc6-40d8-bec0-593c7349d986" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/be0d76e7-9251-42e6-a089-d549509d04a2" /> <img width="160" height="160" alt="image" src="https://github.com/user-attachments/assets/531c20c0-3333-4b7b-b411-2f616e5cca5e" /> <img width="576" height="384" alt="image" src="https://github.com/user-attachments/assets/075297bd-0209-4bcf-b41c-cfb5004996d6" /> <img width="224" height="288" alt="image" src="https://github.com/user-attachments/assets/43868bfb-321b-4b4f-8101-fff0bdb6c76c" /> <img width="544" height="448" alt="image" src="https://github.com/user-attachments/assets/b57fa409-be8c-4b3a-8549-f10bc2df5f62" /> <img width="416" height="320" alt="image" src="https://github.com/user-attachments/assets/c4e617c0-de94-4f51-8b80-d5d0053ca93b" /> <img width="576" height="480" alt="image" src="https://github.com/user-attachments/assets/efc14792-8acd-4d9c-996e-014339a05cdb" /> </p> </details> :cl: Erikafox, Sun-Soaked add: new effect for static anomalies add: evil green glow to heartbeat anomalies add: blood turf add: Greebles to jungle-worlds. /:cl: --------- Co-authored-by: thearbiber <135081923+thearbiber@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 Adjusts the docking ports (with help from @rye-rice) of all existing Inteq ships to enable docking compatibility with each other and potentially other ships. ## Screenshots <details> <summary>Apso Docking</summary> <img width="1828" height="781" alt="apsos docking" src="https://github.com/user-attachments/assets/94238932-3f54-44a9-b6c3-0769de8aae6f" /> <img width="1890" height="879" alt="apso to vaquero" src="https://github.com/user-attachments/assets/43ff8d29-97b4-4e9c-a20f-03596d099b22" /> <img width="1608" height="1862" alt="apso to colossus" src="https://github.com/user-attachments/assets/c2cf3f34-11d6-4b52-833d-a645a94a7251" /> </details> <details> <summary>Vaquero Docking</summary> <img width="2004" height="787" alt="vaqueros docking" src="https://github.com/user-attachments/assets/618f5947-04a1-4c93-9799-9c769e810142" /> <img width="2034" height="962" alt="vaquero to apso" src="https://github.com/user-attachments/assets/3fff0d43-4157-4671-8344-21ca7f4708ad" /> <img width="1423" height="1933" alt="vaquero to colossus" src="https://github.com/user-attachments/assets/6edcc6be-76d9-42e5-8883-dea58771350d" /> </details> <details> <summary>Colossus Docking</summary> <img width="1775" height="1820" alt="colossi docking" src="https://github.com/user-attachments/assets/eea4e82d-bc32-4e33-888a-0ec8339bcc7e" /> <img width="1825" height="1431" alt="colossus to apso" src="https://github.com/user-attachments/assets/199a89b4-0ddb-4b36-b022-a10eb5b20a18" /> <img width="1946" height="1430" alt="colossus to vaquero" src="https://github.com/user-attachments/assets/0cfdea71-7ef6-484c-860c-492466db8439" /> </details> ## Why It's Good For The Game Ship docking greatly improves the quality and expediency of ship-to-ship interactions from anything between boarding, trading, or meeting. Improves the entire faction's capability to cooperate with other ships without having to do the Outpost Elevator Shuffle, Not Enough Spacesuits Trade, or Comms Relay Run. ## Changelog :cl:moffball, ryerice add: The IRMG has updated their fleet's docking port mechanisms. /: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="872" height="56" alt="image" src="https://github.com/user-attachments/assets/c901d4da-5248-4f82-b48c-f781f65ca4e6" /> * Adds an icon for Gezenan (by rye-rice) <!-- 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 looks 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: MeeM, Rye imageadd: Adds an icon (by rye-rice) for Gezenan /: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. -->
Hardliners have been bestowed... Vox sprites. <img width="83" height="123" alt="image" src="https://github.com/user-attachments/assets/3f12573b-e005-4782-a405-10b92cf4142c" /> <img width="109" height="153" alt="image" src="https://github.com/user-attachments/assets/3674e5ab-cc2a-4d84-93c6-108c8e0c3db8" /> <img width="112" height="119" alt="image" src="https://github.com/user-attachments/assets/c603ed04-c828-40ff-8bc0-267615ec7ed8" /> <img width="160" height="150" alt="image" src="https://github.com/user-attachments/assets/18e5b27f-ad95-43f7-946f-e9a52d6e1b05" /> <img width="127" height="134" alt="image" src="https://github.com/user-attachments/assets/16f97f31-05c4-46f4-ba3f-ebca17068da8" /> <img width="205" height="207" alt="image" src="https://github.com/user-attachments/assets/21e34ac3-a38b-418c-9986-b488ebb0a145" /> <img width="212" height="118" alt="image" src="https://github.com/user-attachments/assets/8e14d35d-6446-41fd-8935-34d9c54541b7" /> <img width="191" height="163" alt="image" src="https://github.com/user-attachments/assets/88508046-7d07-4dd4-8eaf-dc4c8ce082f4" /> :cl: add: Brand new sprites for Vox - a good majority of the most commonly used Hardliner faction items now have sprites! /: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. --> Adds a couple new recolourable clothing items in form of overcoats, long gloves, and a generic brimmed hat. Adds these items to the loadout as well as the clothesmate vendor. <details> <summary>Bonus Screenshots</summary> <img width="258" height="194" alt="examples 1" src="https://github.com/user-attachments/assets/28a90c73-ed3a-4fee-b92d-a8ad10e329f7" /> <br> <img width="194" height="192" alt="detectivegrey" src="https://github.com/user-attachments/assets/c7126a1c-d353-4569-bdd4-c2e1e0fe1c98" /> <br> <img width="258" height="258" alt="brimmed hat colour wheel" src="https://github.com/user-attachments/assets/8e1b0d7d-c799-4937-9fa4-cbc251098500" /> <br> <img width="258" height="258" alt="overcoat colour wheel" src="https://github.com/user-attachments/assets/094ba3c9-2ed7-4fef-a64e-c92c03eac498" /> </details> <img width="1756" height="793" alt="coats main" src="https://github.com/user-attachments/assets/8fcfc9c7-dbd5-49b9-a92c-efd8a67cc072" /> fashion for all :cl: add: overcoats, brimmed hats, and long gloves have been added to the loadout menu and clothesmate /: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. --> Adds imagino's updated cybersun sprites and cleans up cybersun related outfit code <img width="705" height="433" alt="image" src="https://github.com/user-attachments/assets/6c006b71-f94a-4c40-beee-9a8dd91fad64" /> 's cool :cl: Imaginos, Erika add: new sprites for cybersun add: cybersun themed armor /:cl:
…3#5950) Forgor I moved this variable to pregen data :cl: fix: Fixed muscle wounds being applied to the chest and 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. -->
The type here should correspond to the associated value, not the key :cl: fix: Fixed a compile warning /: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! --> Title ## 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. --> They're kinda crufty, and we already removed most player accessible vehicles due to movespeed concerns. ## Changelog :cl: del: Serene Hunts lawnmower /: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 Literal 2 pixel change to make it so the eye is fully visible on the left (uncovered) side. <!-- 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 One dot eyes bad, we have sclera for a reason!!! <!-- 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: PositiveEntropy fix: Messy Chop properly shows the full eye. /: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 Reverts undocumented armor changes to the Neutron Star hardsuit in shiptest-ss13#5937. I'm fairly certain these were pushed on accident as we have an unmerged balance PR that touches these numbers right now. ## Why It's Good For The Game Reverts most likely accidental undocumented balance changes to the neutron star hardsuit. ## Changelog :cl: balance: Reverted undocumented changes to the Neutron Star hardsuit. /: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 the Himehabu tiny how it was before. ## Why It's Good For The Game I've been thinking about it alot, while people really liked to show off themselves stashing like 120 himehabus in a bag back then... this rarely if ever happened during actual rounds. While I understood the change when it happened a few years ago, the landscape has changed a lot more. 22lr is worse by how much better and more common every other weapon has gotten. This thing's meant to be an ultracompact spy pistol... it may as well be able to be stored in very concealable places as a gimmick. ## Changelog :cl: add: Himehabu is now tiny sized. /: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 <58402542+retlaw34@users.noreply.github.com>
## About The Pull Request Buffs the Neutron Hardsuit's laser protection above the elites, because well, thats the entire point of the hardsuit, and also slightly increases its bullet and melee resistance so it can hold up in space engagements against other factions ## Why It's Good For The Game Cybersun's only hardsuit should actually be the best in its own gimmick, and still able to not instantly die to bullets, they need this ## Changelog :cl: balance: Buffed the Cybersun Neutron Star Hardsuit alittle /:cl:
## Changelog :cl: fix: venetia double dock /: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 Makes cybersun bulletproof armor actually accessible by correcting typos in cargo orders. Also fixes Neutron-star hardsuit icons for inventory and floor state <!-- 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: fixed both bulletproof armor supply packs for cybersun fix: neutron-star hardsuit now uses proper icons spellcheck: fixed name for trauma team x11 helmet /: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: t4 drill readout displays correct percentage /:cl:
## About The Pull Request Planet names can only be picked once in a round. This reduces the chances of 7 planets named Durandal. ## Changelog :cl: fix: Each unique planet name can only be used once per round. /: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 coffee cup reagent fill state ## Why It's Good For The Game Fixes another bug with coffee machines. ## Changelog :cl: fix: Coffee cups show stuff in them now. /: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 Replaces buggy E-50 attachment inside the Abandoned Crate with an E-10, also allowing that number to actually give you an item if you roll it. ## Why It's Good For The Game If you gamble you should probably get at least pennies for your time. ## Changelog :cl: Cloudbreak balance: 1% Chance for an E-10 in abandoned crates /: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. -->
MysticalFaceLesS
added
the
☠Слияние с ОФАМИ☠
Celadon-Bot
added
🗺 Маппинг 🗺
`series_collection` was empty due to incorrect arguments passed to `typecacheof`, so `cause_wound_of_type_and_severity` could not apply any wounds. :cl: fix: Fixed neck slice not working as intended /: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
17 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.
Описание / Что этот PR делает
Мержим обновления с оффов с
20.02.2026по10.03.2026Вернул коммиты, что были пропущены ранее:
refactor prosthetic limbs - shiptest-ss13#5641
Robot Wounds - shiptest-ss13#5676
Caution
Найден пропущенный коммит, не возвращал, но будем иметь в виду:
Die Woke 2: Die Woker (Adds pronouns as something seperate from gender)
shiptest-ss13#5523
Причина создания ПР / Почему это хорошо для игры
Жизненная необходимость для нашего билда.
Ченжлог
drink_reagents.dm.icon/item state, из-за которого рескин серого бронированного скафандра делал костюм невидимым и персонаж выглядел «голым».deepthroat. Это удаление старой механики/элемента без дополнительной функциональности.bodytype. Это подготавливает основу для использования такого подхода и у других конечностей/протезов./syndicateи обновляет конфиги карт под новую структуру.typecacheofколлекция была пустой, иcause_wound_of_type_and_severityне могла применить нужные раны. Это и ломало neck slice.Список изменений