Upstream merge 07.02 #74
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
…cmss13-devs#8325) # About the pull request fixes cmss13-devs#6963 # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: You can no longer use telekinesis to grab paper from far away. /:cl: Co-authored-by: InsaneRed <[email protected]>
…#8329) # About the pull request You can now only fill extuingishers with non harmful chemicals # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Extuingishers can no longer be filled by harmful chemicals /:cl: Co-authored-by: InsaneRed <[email protected]>
…etter vars (cmss13-devs#8332) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> # About the pull request fixes cmss13-devs#8326 # Explain why it's good for the game bug fix # Testing Photographs and Procedure <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! --> <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly label your changes in the changelog. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> <!-- If you add a name after the ':cl', that name will be used in the changelog. You must add your CKEY after the CL if your GitHub name doesn't match. Maintainers freely reserve the right to remove and add tags should they deem it appropriate. --> :cl: fix:Synthetic backpack light now properly turns off on death. code: Removes some one letter vars from smartpack code. /:cl: <!-- Both :cl:'s are required for the changelog to work! --> Co-authored-by: InsaneRed <[email protected]>
…#8341) # About the pull request see title # Explain why it's good for the game fix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: fixed cas ammo's icons not updating after ammo transfer /:cl:
# About the pull request fixes cmss13-devs#8266 # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Mutated hive hugger icons work again. /:cl: Co-authored-by: InsaneRed <[email protected]>
# About the pull request Fixes cmss13-devs#8320 # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Dead huggers can no longer be used to hug people /:cl: Co-authored-by: InsaneRed <[email protected]>
# About the pull request <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> uniforms can no longer be removed if you are wearing armor (stripping still works like usual this change only affects your own character) # Explain why it's good for the game Closes cmss13-devs#1182 2022 issue lmao # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Uniforms can no longer be removed if you are wearing a suit on top of it /:cl: --------- Co-authored-by: harry <[email protected]>
# About the pull request see title Closes cmss13-devs#8113 # Explain why it's good for the game directional explosions is an unintentional devastating nerf for explosive ot rockets, this fixes that # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: fixed ot rocket's blast wave only going in one direction /:cl:
…, again (cmss13-devs#8331) # About the pull request Fixes praetorian acid ball using plasma if you cancelled the do_after unlike cmss13-devs#5486 whoever made that sucked # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details>  Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Praetorian's acid ball no longer uses plasma if you cancel / do not use it. /:cl: Co-authored-by: InsaneRed <[email protected]>
# About the pull request Fixes cmss13-devs#7198 # Explain why it's good for the game We are vending the ASO Jacket, not a bloodbag # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog :cl: Mikrel0712 fix: ASO Jacket icon in the vendor now shows up as the actual jacket instead of a bloodbag /:cl:
# About the pull request Adds a bunch of career paths for CO's to choose from. practical revive of cmss13-devs#3999 with HOPEFULLY better code (probably not) # Explain why it's good for the game RP Fluff, requested by senator and cool stuff is always cool. # Testing Photographs and Procedure <details>    </details> # Changelog :cl: add: Adds a bunch of career options for the commanding officer whitelist, currently only used for fluff and RP. /:cl: --------- Co-authored-by: InsaneRed <[email protected]> Co-authored-by: ihatethisengine <[email protected]> Co-authored-by: forest2001 <[email protected]>
fixes cmss13-devs#7702 # Explain why it's good for the game synths having their NVGs bug out and blind them is unintended # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> https://cdn.discordapp.com/attachments/490668342357786645/1335745530692894852/Timeline_24.mov?ex=67a14977&is=679ff7f7&hm=60d04e89b300a0fe6019e4dc288d646c5d7450061a3f9f8996885c73437387ca& </details> # Changelog :cl: fix:Synth NVGs no longer bug out and blind them /:cl:
…mss13-devs#8342) # About the pull request fixes: cmss13-devs#8339 cant buy strains while zooming anymore # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Fixes boiler speed being stuck if you buy a strain while zoomed in /:cl: Co-authored-by: InsaneRed <[email protected]>
# About the pull request <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> QoL good , Bug = bad # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Queen no longer stomps on dead and resting xenomorphs /:cl:
# About the pull request fixes cmss13-devs#8285 replaces the Security Cabinet in the Office with a regular one. # Explain why it's good for the game Colony cabinets magically spawning with USS Almayer information is bad. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: maptweak: Replaced the Security Cabinet in the Security Office on LV624 with a regular Cabinet. Almayer Crew Records should no longer spawn. /:cl:
# About the pull request fixes cmss13-devs#7287 You can now slash airlock assemblies apart # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Airlock assemblies are no longer unslashable. /:cl: --------- Co-authored-by: InsaneRed <[email protected]> Co-authored-by: harry <[email protected]>
# About the pull request fixes cmss13-devs#8319 You can no longer apply the black holocard to people who are still revivable # Explain why it's good for the game bugfix # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: You can no longer apply the black holocard to people who are still revivable /:cl: --------- Co-authored-by: InsaneRed <[email protected]> Co-authored-by: harry <[email protected]>
Reverts cmss13-devs#7334 i actually think it was good and useful that it told players the next steps when they were attempting to press the button again
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> # About the pull request It's possible for lockers to be both opened and locked at the same time, and the code won't let you close or unlock them in this state. I don't know what allows them to be opened and locked in the first place (probably an issue with the automatic stuff that happens when going to and from red alert). In any case we should let people unlock if this happens. # Explain why it's good for the game mitigates bug # Testing Photographs and Procedure <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! --> <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly label your changes in the changelog. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> <!-- If you add a name after the ':cl', that name will be used in the changelog. You must add your CKEY after the CL if your GitHub name doesn't match. Maintainers freely reserve the right to remove and add tags should they deem it appropriate. --> :cl: fix: mitigates bug where you can't close or unlock an opened locked locker /:cl: <!-- Both :cl:'s are required for the changelog to work! -->
# About the pull request Makes the frequent announcements about souto being 5% more expensive or whatever not play sound for anyone. (Also tried to improve the one letter var situation) # Explain why it's good for the game I feel like playing interference.ogg for such a frequent fluff-RP "event" a little annoying and pointless. (If the consensus is that I'm being a grinch then you can reject this PR, no problem.) # Testing Photographs and Procedure I did test it on local and it worked. # Changelog :cl: sounddel: the vendor inflation event no longer plays sound /:cl:
# About the pull request Allows Yautja to source their tracking location from an active falcon drone. # Explain why it's good for the game Can already mark from the drone, difficult to accurately mark remote gear carriers if the location is relative to the original Yautja mob. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: Yautja can now track gear relative to their active falcon drone. add: Yautja can now mark through walls and don't need direct line of sight. /:cl:
# About the pull request closes cmss13-devs#7079 hopefully Makes restocking attackby instead of draging on # Explain why it's good for the game fixes are good # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: fixes being able to infintely dupe weapon attachements /:cl: --------- Co-authored-by: InsaneRed <[email protected]>
# About the pull request cmss13-devs#8349 causes the boatswain sound announcements to get signed by '1' - woops - this aims to fix that # Explain why it's good for the game i hate 1 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: minor signature bug fixed with 'all hands on deck' announcements /:cl:
# About the pull request Adds camera, camera film, tape recorder, clue scanner to SecTech. Changes ads/slogans to be in line with the coding of other vendors (well, with the Eat an EAT vendor anyways, I know that vendor works). # Explain why it's good for the game I feel like these items are all things that lead to HRP behavior, and so I don't think any of these additions would be controversial - am I wrong? Also shoutout to cmss13-devs#8191 for making it so adding photos to security records works! It's very cool, and it's what led me to make this PR. And the ads/slogans thing is a bug, I think these are never broadcasting. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: qol: Adds camera, camera film, tape recorder, clue scanner to SecTech. fix: Code fixed for sectech machine ads/slogans. /:cl:
# About the pull request  Adds engi, medic, and TL to corp dome nightmare insert. Changes some other fluff stuff like factions so they appear in the WY tab and the MD in the insert doesn't ping on goons. Adds flavor uniforms for goon med and engi with different sprites (credit to vandie) # Explain why it's good for the game engis and medics and TLs incentivize people to stick together and cooperate with their fellow man instead of hiding or running off or whatever. facilitates more interesting roleplay. Everything else is minor detailing and fluff like faction tabs and alt uniform sprites. # Testing Photographs and Procedure <details> <summary>In game</summary>  </details> # Changelog :cl: add: Goon Medic imageadd: New alt uniforms for goon techs and medics maptweak: Corporate Dome nightmare insert now has a medic, engi, and TL. /:cl: --------- Co-authored-by: Blundir <[email protected]>
Reviewer's Guide by SourceryThis pull request performs a large upstream merge that integrates a variety of changes including several new features, refactors, and bug fixes. Major updates include a new TGUI interface for managing security records, a complete overhaul of the equipment presets for USCM Commanding Officers (with new career path options), improvements to the chat reliability system with sequence tracking and resend capabilities, and a refactoring of explosive/shrapnel mechanics. In addition, many map areas now correctly specify their power requirements and new unit tests have been added for areas lacking power, along with various bug fixes and style improvements across the codebase. Sequence diagram for chat reliability and resend mechanismsequenceDiagram
participant C as Client
participant TM as TGUI Middleware
participant CC as Chat Controller
participant CG as Chat Payload Generator
participant RS as Resend Service
C->>TM: Sends chat/message payload (JSON with sequence)
TM->>TM: Parse payload, extract sequence number
TM->>CC: Check sequence order against local history
alt Gap in sequence detected
CC->>RS: Request missing sequence(s)
RS-->>CC: Resend missing payload(s)
end
CC->>TM: Process and update sequence list
TM->>C: Render chat message
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
larentoun
force-pushed
the
upstream-merge
branch
2 times, most recently
from
61307a3 to
2607f16
Compare
port rustg from tg linter Revert "port rustg from tg" This reverts commit 4f976f8. ignore our stuff linter fix now it should work move rustg220 to 220 files linter update from tg return it better comment linter oopsie i changed you, didn't I? better order rust utils for tests
larentoun
force-pushed
the
upstream-merge
branch
from
e325e8e to
6271223
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
апстрим мерге
Summary by Sourcery
Update the security computer to use TGUI, add new survivor roles for Weyland-Yutani corporate security, and implement a chat reliability layer.
New Features:
Tests: