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.

Sign up for GitHub

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

Jump to bottom

upstream merge 10/02/2025 #2946

Merged
merged 197 commits into from
Feb 15, 2025
Merged

upstream merge 10/02/2025 #2946

merged 197 commits into from
Feb 15, 2025
+15,168 −3,506

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Feb 10, 2025 •
edited
Loading

i deeply regret not axing secwatch when wanted list cartridge was added

About the PR

  • drozd resprite
  • recipe packs gaming
  • hristov rework
  • disabler and disabler smg buffed a little bit, mostly via doubled capacity
  • (unpowered + unpiped) maints room spawner for mapping

not included:

  • cabinet perspective resprites
  • access breaker
  • new new lecter sprite, the lecter override commit can be reverted to use it
  • new salvage ruin
  • new radio implant code is bad so keeping ours

Media

:trollface:

Changelog
🆑

  • add: Merged last fortnight's changes from upstream, excluding the resprites and access breaker.
  • fix: Fixed not being able to make medical huds in the medical techfab.

@deltanedas deltanedas requested review from a team as code owners February 10, 2025 00:45
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added 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 Changes: Audio Changes any audio files S: Merge Conflict Fix your PR! and removed S: Merge Conflict Fix your PR! size/L 256-1023 lines labels Feb 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@ThataKat
Copy link
Contributor

Direction review real, call it uhh a day or two

@github-actions github-actions bot added the size/L 256-1023 lines label Feb 10, 2025
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 10, 2025
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Feb 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 10, 2025
@github-actions github-actions bot added the size/XL Over 1024 lines label Feb 10, 2025
TemporalOroboros and others added 14 commits February 14, 2025 16:10
@TemporalOroboros
Purges the one remaining use of TransformComponent.WorldPosition in c…
ec76de5 
…ontent. (#34943)
@ArtisticRoomba
remove redundant rainbowcarpplush yaml lines (#35033)
253d607
@TemporalOroboros
Purge the one remaining use of TransformComponent.AttachParent (#34941)
b5c1c80
@metalgearsloth
Tweak viewport nullspace check (#35037)
e9ca563 
* Tweak viewport nullspace check

WorldPos being 0,0 is sussy-a.

* a
update DnaComponent usings
bd6aeaa
remove always push on body part
a31e25c
missing warm light bulbs
735df5a
beans
be644b6
fix autodoc ui
327bef8
bring back rubber ammo sprites
099dd28
edit RE test to use packs
bf07ed7 
move RE test stuff into research test
fix all the recipes
b8f96b9
@BombasterDS2
Fix Alerts Test (DeltaV-Station#1584)
3e701a3 
Alert Test Fix

Co-authored-by: BombasterDS <[email protected]>
use old AM damage values
444c5a2
@github-actions github-actions bot added size/L 256-1023 lines and removed size/XL Over 1024 lines S: Merge Conflict Fix your PR! labels Feb 14, 2025
@deltanedas
Copy link
Member Author

upstream sprites and access breaker were reverted now

@ThataKat
Copy link
Contributor

Noted, thank you!

@ThataKat
Copy link
Contributor

And this is all good to go then, if you were waiting on us

@deltanedas deltanedas merged commit 693fb47 into DeltaV-Station:master Feb 15, 2025
12 checks passed
@deltanedas deltanedas deleted the upstream-ops branch February 15, 2025 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Audio Changes any audio files 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 size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.