Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upstream merge #1591

Closed
wants to merge 742 commits into from
Closed

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Aug 9, 2024

About the PR

from july 1 to today
meteor stuff excluded

Technical details

  • updated WhitelistRequirement to be less bad
  • moved signature system to shared and predict everything
  • remove some legacy nyano shit that nothing uses
  • ahelp snitching hopefully disabled

Changelog
🆑

  • add: Merged last months changes from upstream, report any issues!
  • add: SCREEEEEEEEEEE!!
  • tweak: Signing paper is now predicted.

PJBot and others added 30 commits August 9, 2024 15:14
* Require Standing to Exit Containers

* whoops, forgot a not

* You can't walk out if cuffed

* GUAH(requested stuff)

* bwomp(tiny cleanup)
* Add more logic gates types for mapping

* i forgor

* me stupid

* nuh
* Localization of the Salvage Expedition Console

* Localization of the Salvage Expedition Console 2
* Another QSI Fix About Things Being in Places they Should not

* cleanup
* Grappling gun ReelRate can be changed

Moves ReelRate constant from SharedGrapplingGunSystem to GrapplingGunComponent, so it's Reel speed can be changed.

* Add coment + remove redudant
Moves it from the atmos module to the temperature module where it is actually used.
Update pistols.yml
Other chemicals like sodium hydroxide are written in full too, why wouldn't ClF3 be.
fix singularity overlay mouse position correction when zooming
* Keep Pinned status through player status changes.

* Fix filtering to be admin optimal.
Nothing fails at least but at some point will let us remove some hacky engine code.
* Redo of code

* Dump IDs on lobby exports
skeletons no longer have fingerprints
* Completion of documentation

Comments have been added to ConditionalSpawnerComponent and RandomSpawnerComponent

* Appear fix

Some fixes with word "appear"
* Add pen clicking sound

* switch to OnUse and reduce distance a little
Update RespiratorSystem.cs

Co-authored-by: plykiya <[email protected]>
eoineoineoin and others added 7 commits August 9, 2024 16:23
* Avoid destroying and recreating record list on every update message

* Add early-out on nullptr input

* Remove sussy null suppress

---------

Co-authored-by: Eoin Mcloughlin <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
* cleanup of AddComponentSpecial

* add RemoveComponentSpecial

* require

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Apparently I need to check if they're holding an item

Co-authored-by: plykiya <[email protected]>
…8719)

* [Fix] CMO's equipped cloak

* [Fix] CMO's equipped cloak

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Map Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi labels Aug 9, 2024
@IamVelcroboy
Copy link
Member

Does this include the new map editor? If so, I have concerns. I absolutely want it but I think we should hold off until it's been thoroughly tested upstream and bugs worked out. Here

@deltanedas
Copy link
Member Author

Does this include the new map editor?

yes but its pretty much disabled right now, it still uses actions not the fancy thing that doesnt work

deltanedas and others added 6 commits August 9, 2024 16:43
* move MinMax to shared

* cleanup MinMax

* move other ticking components to shared just because

* remove unused prototype file

* update everything to use shared components

* test

* test 2

* test 3

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@deltanedas
Copy link
Member Author

i have horrifically fucked up the cherrypicking :trollface:

@deltanedas deltanedas closed this Aug 9, 2024
@deltanedas deltanedas deleted the upstream-ops branch August 9, 2024 16:17
@IamVelcroboy
Copy link
Member

🙈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.