'25 February upstream merge #2897
Open
+327,414
−204,434
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
* Test entered tree fix * Use Opened override * Fix keyboard focus on window open for DialogWindow This affects Phone, Pray, Rename, and multiple other admin verbs. * Clean up
fix minibomb implant not exploding
* cleanup not needed locale string * Update Resources/Prototypes/Actions/types.yml --------- Co-authored-by: slarticodefast <[email protected]>
* Remove custom character description after using DNA scrambler * Mark grammar as dirty when updating identity * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <[email protected]>
fixed control button - a single line of code
* Buff the Combat Bakery Kit uplink item * whitespace
fixed
Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap
…095) * add LatheRecipePackPrototype * change Lathe and EmagLathe to use packs * add AddRecipesFromPacks helper to SharedLatheSystem * update lathe logic to work with packs and clean up some stuff * migrate individual recipes to recipe packs * update client * remove node/artifact scanner from techs ** fix test and make it include emag recipes * add test that every dynamic recipe must be researched * pro * fix * fix * fix all tests, genuinely good test i wonder who made it * add unused uranium and incendiary drozd mags to tech and lathe * add recipes * add incendiary prototype * undo some changes * troll *
Update plasma.yml Co-authored-by: jbox1 <[email protected]>
* Add paper door sound * Update attributions yml * Update material_doors.yml * Update attributions.yml
* wooden grip on antique laser, changes description to match. * darker grip * update meta.json * redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other * fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit * I DID IT AGAIN * red kammerer bottom text * killed the cap laser things (hopefully) --------- Co-authored-by: gaussiarson-admin <[email protected]>
The flammable effect does it but we don't do it here for reasons. Sometimes this heisentests.
FIREBALL MOTHERF-
…836) SyndieRefugeeRoleTypeFix
* Added back warden's enforcer, added spare mk58 magazines to blue armory. * Various QOL.
* Updated armory fills, fixed a few connection errors, and removed the original sin * Added a box of .35 magazines, corrected the starting state of the switches
* allow paper labels on seeds * added the components required by PaperLabel to the SeedBase * localize insert/eject for PaperLabel * visualize the paper label on seeds * new paper layer for seeds * eject the seed label on use * different looking paper label * forgot to turn on a layer
whatston3
added
S: Needs Review
|
DB migration tested and working well with Postgres 17 and Sqlite. Lathe packs should probably get a review, but for now, the set of recipes included everything that was previously printable, though Frontier-specific lathes generally have one pack with all the recipes rather than sharing packs where appropriate. Changelog should be appropriate, and the demag should be more useful than ever. Think this is alright to proceed. |
…-station-14 into 2025-02-10-february-upstream-merge
github-actions
bot
added
the
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…-station-14 into 2025-02-10-february-upstream-merge
github-actions
bot
removed
the
S: Merge Conflict
github-actions
bot
added
the
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…-station-14 into 2025-02-10-february-upstream-merge
github-actions
bot
removed
the
S: Merge Conflict
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 PR
Merges vs upstream's 'stable' branch at
11e5d59171739c11c8b1fe2271b3aceca8ff03ed.At the time of writing, I've only (poorly) resolved merge conflicts to get this to a draftable state. Will require work and testing.
Items of note:
Why / Balance
It is time.
How to test
Very carefully. Points of interest:
Cargo bounty console has history - do we care about the pirate console?Not right now.Is the emote menu fine? For harpies?Yup.Are criminal records functional?Yes.What is “GhostRoleRadioMessage”? Is it working?Think so.Crew monitoring window should be in world coords. Test it works.Seems to.EyeCursorOffset is new. Should we add it to the SVT/Mosin?Maybe later, fine for now.ShipyardRCD: menu works?yesContraband test: should we extend this?No need.GuidebookDataAttribute: does this need to be extended to our gas pipe changes?Eventually.Test the demag on everything. Most things that are emaggable are demaggable.Generally goodBuckleSystem changed, are vehicles/chairs/etc. busted?Not obviously.Did the toilet teleport bug get fixed?Yes.LoadoutWindow: named loadouts are here - pirates have pseudonyms, borgs should show up and have a selectable name.Done.The window with only the selectable name is a bit small.Fixed.Multiple storage windows open: how do we enable this (if we can)Not currently. Soon™Air alarm logging for the bidirectional gas pressure pump stuff?Not right now.Virtual item changes: map onto the borg hand placeholder?Not currently needed, works fine.Are research servers functioning as usual?Seems like it.Unrevivable now has a reason. Should unclonable work the same way?Done.The publish-testing workflow was disabled. Do we need it?Not currently.Check seed labels for Frontier sprites (bee jar, coffee, spesos, pear)Paper seems alright, jar's a little weird.Tactical maid light is functional? Does the action sprite look alright?They're fine.Do all of the ammo boxes work? Any missing sprites?Think we're good.Media
Requirements
Breaking changes
Changelog
🆑