Upstream 12.12-26.12 #208
Merged
Upstream 12.12-26.12 #208
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
# Description Adds the ability to use guns as melee weapons and throwing weapons. The gun melee attack is a Light Attack done with a right click. The attack rate is slower than average melee weapons. The cooldown on melee attacks after shooting has been removed entirely, so you can right-click immediately after shooting (like in hero shooters 😎). The cooldown on shooting after a melee attack has been set to a constant 0.5 seconds. ## Balance Technically speaking, weaving shooting and pistol-whipping lowers your overall DPS in most cases, because you can't shoot for 0.5 seconds after doing a melee attack. With _skillful_ usage, however, it provides some key tactical advantages: - Preserving ammo by dealing damage without firing a shot. - Deal stamina damage as a natural effect of dealing melee Blunt damage. - Most non-pistol guns have increased blunt stamina damage factors to help with this. - Bypassing Piercing resists of armors with a higher Piercing resist than Blunt resist like plate carriers. - Doing the combo of right-clicking immediately after shooting deals a big burst of damage. Pistol-whipping also helps as a last resort when you run out of ammo. However, it's almost always better to use a proper melee weapon instead of a gun as a pure melee weapon, because you can't power attack with guns and the guns' melee attack rate are slower by design than most melee weapons. Shotguns benefit the most from pistol-whipping, because their ideal range is close-range where a melee attack can be performed, and their low fire rate means they're not affected too much by the 0.5s shooting cooldown. Guns have received throwing damage. You can throw guns at the enemy once you're out of ammo to deal extra damage. I think this makes fights a little more spectacular to watch. Melee damage sorted by group (from least to greatest): 1. Revolver 2. Pistol (+ Energy Pistol) 3. Sniper rifle 4. Rifle (+ Energy Rifle) 5. Sub Machine Gun 6. Shotgun 7. Light Machine Gun (L6 saw) 8. Heavy Machine Gun ## Media **mk 58**  **Kardashev-Mosin (Wielded)**  **Basic Combat** https://github.com/user-attachments/assets/922998d1-0cd0-4fea-8f0b-365bcff3c12b **Particle Decelerator Combo (80 damage)** https://github.com/user-attachments/assets/ce62334a-13dd-46d9-9c0e-453e26bf1261 Combo: Shoot + Power Attack, wait 1.6s then Power Attack + Throw This combo costs 90 stamina which almost depletes 100 stamina leaving you vulnerable, so the Vigor trait can help you pull off this combo. ## Changelog :cl: Skubman - add: Pistol-whipping has been added. You can press right click with a gun to perform a Light Attack. Most guns will deal Blunt damage, apart from the Kardashev-Mosin dealing Piercing/Slash damage with its bayonet. Weaving bullets and melee attacks correctly will give you the upper hand in combat. - add: Guns can now be thrown to deal the same damage as their melee damage. (cherry picked from commit 5899f4ea5a978ded0362bdf46185f8fbb1a2607c)
Finally fixed it. Interact verbs weren't appearing because this is required in BaseMob. (cherry picked from commit 3e3ca59850f1a21f2bb8e249455d655ec6b63d2c)
# Description Fix a bug in `MechGrabberSystem` causing the hydraulic clamps in Ripley to drop items far away. --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/d2c8e951-e391-42d7-b45d-78a275dc8bf2 </p> </details> --- # Changelog :cl: - fix: Hydraulic clamps now drop entities correctly (cherry picked from commit f0e4612612fe18a126cdf47d712b63bc083b5483)
(cherry picked from commit 6dcb367adb769f51bcaf1a647a4ca6c886a10be7)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> i fixed it also added a button "Connect & Go to Lobby" for people testing lobby stuff! Resolves #1131 --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Fixed the bug where switching characters made your width/height change to incorrect values. - fix: Fixed the salvage magnet opening ten times. --------- Signed-off-by: sleepyyapril <[email protected]> (cherry picked from commit c4c3e4283ae077fd0f55e4cce31710f31de046f7)
(cherry picked from commit 8ff70215d9f6e2a73150b55313333b9d5ca87749)
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]> (cherry picked from commit 2a7a4719d39b51ffd232c667b1ca49dbce68dce6)
Bartender Mosin was replacing their duffel bag at roundstart. (cherry picked from commit 3aa430f486dcdf40629468c715092aee0089187c)
# Description This PR adds a few of the "Mentalic" category of psionic abilities to the Traits System, allowing them to be purchased by any character that is also a Latent Psychic. These powers are: - Dispel - Metapsionic Pulse - Xenoglossy (Also requires Natural Telepath) - Psychognomy (Also requires Natural Telepath) These are all quite expensive, so to help address the "Expensive trait proliferation", I've increased the points granted by the Blindness trait to 10. Have fun being a blind wizard. From this point on, we're going to need to start adding more "High point value" negative traits. # Changelog :cl: - add: Dispel, Metapsionic Pulse, Xenoglossy, and Psychognomy can all be purchased during character creation using trait points. - tweak: Blindness now grants 10 trait points instead of 6. (cherry picked from commit acec14d08879ebaf16e5425fccd26d8f066eda55)
(cherry picked from commit adddc1df27184f74e5e48e5220e0cd4eeb57084c)
# Description Like half the art references I have for Harpies have them with elf-like pointed ears, another half have them with their feather tufts. We have pointy ears markings, so this PR makes it so that Harpies can have them. Actually it also gives them to Arachne, for similar reasons(It's an oddly common thing on Arachne/Lamia art depictions). # Changelog :cl: - add: Added a variety of Pointy Ears markings for Harpy and Arachne characters. (cherry picked from commit 59a55c9d6ae6772d4ead0e73d5dab7b24c539e53)
(cherry picked from commit 99d616953af89462d827fd8ca6e50a92e63e8203)
# Description Done after a lengthy discussion with @OldDanceJacket about mapping issues, namely the existence of "Walk-In Closets" on maps that take up an inordinate amount of space that would otherwise be usable for other purposes. Seriously, Saltern has a 4x6 room that contains >200 medical uniforms, and is on a map intended only for 15 people(And maximum of 6 medbay personnel). Every map in rotation is like this. Ostensibly, Loadouts were created to provide a solution to this problem, by making it so that players choose their DRIP before spawning in, so that mappers don't need to put in a whole ass room dedicated to medical uniforms. But Mappers ended up keeping the "Walk-in Closets" even after Loadouts were introduced to serve as a "Sanity check" in case of events such as people not choosing their loadouts, or getting hired during the round by the HoP to work in the medbay, etc. To solve this, me and ODJ agreed upon adopting Cosmatic Drift's solution to this, by making it so that the Arrivals Terminal serves as the "Walk-in Closet Hotel" that every map can just piggyback off of. Nobody needs to make the stupid closet rooms, on ANY map, because every map is fully guaranteed to have every closet the players could ever need in arrivals. # Media <details><summary><h1>Media</h1></summary> <p> Dock  Dorms(Spawn points)  Medbay:  Security  Captain/HOP  Cargo:  Epistemics:  </p> </details> # Changelog :cl: - add: Ported Cosmatic Drift's version of the Arrivals Terminal. Terminal now includes every version of department clothing and material lockers that players could ever need, allowing them to try on their chosen job equipment and drip before departing for the station. (cherry picked from commit 4509a9d030efb7eb45378824559a3f88c4caf4b4)
(cherry picked from commit 9a1cda889a085974f666adb99c753ba4e1392355)
# Description Somehow people weren't getting the memo despite the **HORRIFYING** texts associated with Mindbreaking, that doing so is an almost comically evil act akin to murder. So this PR fixes that. By making it even more obvious. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added a server option for "Scarier Mindbreaking". Mindbreaking now irreversibly converts a player character into a non-sentient NPC. - fix: Mindbreaking now only works on Psychics. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: sleepyyapril <[email protected]> (cherry picked from commit 80f83484e9653f159581ea0dfc82d56256e4947c)
(cherry picked from commit 4d87be6ea66356156cdac6e7e9cd70af36daae24)
# Description This PR adds two additional "High Value" physical negative traits, to help address a growing need for more high point value negatives, since there is also a very large number of high point positive traits. These two traits are fairly simple, the first is Redshirt, which decreases your Dead threshold by 100, and Brittle Bone Disease , which reduces your Crit threshold by 50. Taking both on an ordinary human would give +18 trait points to work with, but would in turn give a healthbar of only 50/100, compared with the standard healthbar of 100/200. # Changelog :cl: - add: Added Redshirt and Brittle Bone Disease traits. These give extremely large negative modifiers to your healthbar, but also grant a large amount of trait points to work with. (cherry picked from commit 88edcd05aef76acb10e3d0924dd874eef22c7f71)
(cherry picked from commit ed0e56aa446ea9ad9ecae1a1a1685438378b1814)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Ports jackboot slowdown mitigation from [space-wizards github](space-wizards/space-station-14#30586). Adds fake version for civilian use. --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added slowdown mitigation to jackboots - add: Added fake jackboots for style outside of sec --------- Co-authored-by: sleepyyapril <[email protected]> (cherry picked from commit f5d45d790d793acbba7d21258cd206568fe79f99)
(cherry picked from commit 03dc85aa7071c70cd9f01392cabf7cb7fb2fa6ac)
These were supposed to be negative traits(They give you points), but I accidentally made them positive traits(They cost points). (cherry picked from commit ec60940fe5eae5d7d3e969bac132e1da2a659272)
# Description this PR extends the list of default advertiser hubs to include every existing hub except for SSMV(Which is mutually exclusive with the others). If there are more hubs I have missed, please let me know. This will allow our servers to appear on as many hubs as possible. (cherry picked from commit 577126f987ff70ba213f2898ea9e5170b0dc5ea6)
# Description I would like to offer my thanks to the Singularity Network Mapping Team for this update, they've done some great work! This PR launches Saltern with a significant rework to everything on it except for arrivals. <details><summary><h1>Media</h1></summary> <p> Sorry, Map Renderer is dead right now.   </p> </details> # Changelog Death do NOT change the name given for the Changelog author, the mappers here have requested that "SiN Mapping Team" be given as the name for this PR. :cl: SiN Mapping Team - add: Saltern has been fully reworked! (cherry picked from commit a06b4661b08abe6f64460655962b98f4ccb9db07)
(cherry picked from commit aab36bfe65d82cff13bb6d8b6a55c2b70a031aa2)
the robust toolbox updater!! https://github.com/space-wizards/RobustToolbox/blob/v237.3.0/RELEASE-NOTES.md (cherry picked from commit bf1b0d03aede161d62aedfc9166589335a5d7c4c)
# Description Small maintenance to do. Bridge needed FixGridAtmos done, and a single light in dorms needed wiring. # Changelog :cl: - fix: Fixed the Saltern bridge being a hard vacuum at roundstart. (cherry picked from commit 3c1ed56ed3122866b32249006496c37be825c82a)
(cherry picked from commit 48413d6a435de700197a4f6ceb1290d61f5130b4)
# Description This PR cuts down significantly on Loadouts bloat by removing all specific color versions of colorable items from the loadouts. I left the original items untouched for compatibility reasons since certain things in the game still need to be able to spawn a "Blue jumpsuit" etc. Additionally, to help aid in clarity for players, I've added localizations for all the generic colorable items so that they have (colorable) in the loadout names, so that players can tell which items have the option without needing to click into the customize button on every item. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added labels to all generic colorable items in loadouts, so that players can see which items have custom colors as customization options. - remove: Removed all 'specific color' variants of colorable items from Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists. (cherry picked from commit 452b9113f61790e8258b95904361de5ed34a034f)
(cherry picked from commit cd5a6f8b5743904dbecbf04e5d70614e4444d149)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Added two new plushies to the game! A harpy plushie and a plushie for the beloved station pet Morty!    --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: two new cuddly friends to the station! (harpy and morty plush) --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: juniwoofs <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> Co-authored-by: sleepyyapril <[email protected]> (cherry picked from commit 6fb12233d48de476c2b06415031fa2e9c9a1d327)
(cherry picked from commit 5293b92007f7ca81375d9806cccf9be38846c8d3)
# Description It turns out that there was no system in place for serverside fact checking of whether or not people have a legal traits list. Last night a bug was reported whereby a player used Cheat Engine to give himself every trait in the game, bypassing the points system entirely. It's not actually possible to reduce a trait selection down to a legal list without creating interesting race conditions, which limits my options on how to deal with it. So I made it a vote on the Einstein Engines discord, and the vote was unanimous. PUNISH THE CHEATERS. <details><summary><h1>Media</h1></summary> <p> https://www.youtube.com/watch?v=X2QMN0a_TrA </p> </details> # Changelog :cl: - add: Implemented Anti-cheat for Traits. Attempting to join a round with an illegal traits list will result in hilarious consequences. (cherry picked from commit 2fc1f25bc0daa29e2017490adbdf41f9db4f4927)
(cherry picked from commit 9d738c8f36c0762e0ba3942fb26ef25735ade327)
# Description Prisoner is consistently the most problematic role in this entire game, being seen as "The Self Antagging Role", which produces endless amounts of administrative burden. This is especially a problem with lowpop servers, or servers that are understaffed with admins. Players just join as Prisoner, *immediately* break out of the permabrig, and then go on a self antagging spree. The solution to this was staring us in the face the whole time. Just give them the same Pacified component that the Thief antag has. Now it's impossible for them to smash the permabrig windows, someone has to intentionally let them out, and even if they do, they will be hard pressed to selfantag when they can't turn on harm intent. # Changelog :cl: - add: Prisoners now spawn with a Pacifier Implant. (cherry picked from commit 7f8d76ea6f63d334c894fc0f7ada6fd1359408f1)
(cherry picked from commit 68cb9ea4888c16056c6cfe9fea17de1a78420374)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Title. Ported from Fansana/floofstation1#393 Resolves #1277 --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Fixed jittering displacing your character when shaken. (cherry picked from commit a13d9640ec77e07b532b729ac540dc95b689c557)
(cherry picked from commit bfb32cf24eda47ff3dbd5d4b15b58e25ae597947)
# Description This PR adds a simple server configuration option for enabling basic "Soft-Crit", and not much else because oh my god this system is horribly complicated. When enabled, characters can crawl around very slowly while in crit, and really not much else. This more or less mirrors how crit affects character movement in SS13, where you can at least crawl to relative safety while bleeding to death. # Changelog :cl: - add: Added server config options for basic "Soft-Crit". When enabled, characters who are critically injured can still slowly crawl, but are otherwise still helpless and dying. (cherry picked from commit dff8c69f2afff6714b893a7c9572a84bd384ff89)
(cherry picked from commit 9430b9046a9a40cc2f96bb3c66251aabbaf9e80a)
This reverts commit c7d0edd.
|
Important Review skippedMore than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review. 33 files out of 118 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits. You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
|
RSI Diff Bot; head commit c5e3059 merging into 2132992 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi
Resources/Textures/Clothing/Head/Bandanas/white.rsi
Resources/Textures/Clothing/Head/Hats/beretwhite.rsi
Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi
Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi
|
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.
Описание PR
Ревертнул один ПР
Изменения
🆑 Spatison