'25 February upstream merge #2897

whatston3 · 2025-02-10T21:41:44Z

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:

emag change (what will the state of the demag be?)
weapon component changes?
latejoin/humanoid profile edits?
syndie radio implant
guidebook entries for engineering (station repair)

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.
There’s a new build fork ID and version CVAR. Ideally we set these.
~~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?~~ yes
~~Contraband test: should we extend this?~~ No need.
~~GuidebookDataAttribute: does this need to be extended to our gas pipe changes?~~ Eventually.
Silicon laws - emag disabled for now.
~~Test the demag on everything. Most things that are emaggable are demaggable.~~ Generally good
~~BuckleSystem 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

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

add: Pirates can now set pseudonyms in character config, cyborgs can set their names.
tweak: The advanced captain's laser has been moved from a printable item to expedition loot.
fix: Goblins should no longer teleport back into toilets.
tweak: Random clothes with pants and skirts are available in loadouts and the Clothesmate.
fix: Bluespace crystal stacks should all be tiny.
tweak: The tactical maid hardsuit now reduces movement speed by 25% instead of 55%.
remove: Silicons can no longer be emagged.
tweak: All contraband items with visible status now have their class stated.
fix: Wooden barrels no longer show an error with a paper label placed on them.

* 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

@deltanedas

…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 *

* true Co-authored-by: pathetic meowmeow <[email protected]> * shitmed real Co-authored-by: pathetic meowmeow <[email protected]> * update funny test *

*

--------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: pathetic meowmeow <[email protected]>

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

* Full resprite of lecter and associated magazine * Minor fixes * More fixes * fixed meta.json indentation * More meta.json fixes * Attribution fixes * Update Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json --------- Co-authored-by: august-sun <[email protected]> Co-authored-by: slarticodefast <[email protected]>

github-actions · 2025-02-26T18:46:30Z

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 · 2025-02-26T22:50:17Z

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

…-station-14 into 2025-02-10-february-upstream-merge

dvir001

Good to go

slarticodefast and others added 30 commits February 6, 2025 16:35

Merge stable into master (#34924)

3940d22

cleanup not needed locale string (#34922)

64ebcb5

* cleanup not needed locale string * Update Resources/Prototypes/Actions/types.yml --------- Co-authored-by: slarticodefast <[email protected]>

DNA scrambler examine fixes (#34920)

b6ccbef

* 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]>

Automatic changelog update

d204480

Guide Control Button Now Redirects Properly (#34914)

8ff90a6

fixed control button - a single line of code

Automatic changelog update

727935c

Buff the Combat Bakery Kit uplink item (#34927)

ed01ad7

* Buff the Combat Bakery Kit uplink item * whitespace

Automatic changelog update

c5d1aba

Convex fixes (#34934)

14d96e0

fixed

Purge uses of TransformComponent.AttachToGridOrMap (#34940)

f37d5c9

Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap

Plasma fixes 2 (#34962)

d7d77ff

Update plasma.yml Co-authored-by: jbox1 <[email protected]>

Round up playtime minutes (#34961)

524a218

Automatic changelog update

80bd01b

Revert engine reverties (#34968)

e971d6e

Paper door (#34857)

1caea8a

* Add paper door sound * Update attributions yml * Update material_doors.yml * Update attributions.yml

Automatic changelog update

6465413

Make Ignite tryget flammablecomp (#34970)

d7e9782

The flammable effect does it but we don't do it here for reasons. Sometimes this heisentests.

Wizard shuttle preperation (#34932)

f6c0e6d

FIREBALL MOTHERF-

Fix: The SyndicateVisitor now has Free Agent mind role. (#34827) (#34…

bc3de0f

…836) SyndieRefugeeRoleTypeFix

Automatic changelog update

1ef6e0b

Wizard Item Recall Spell (#34411)

bf6fd4d

Meta tweaks (#34957)

3d34b8e

* Added back warden's enforcer, added spare mk58 magazines to blue armory. * Various QOL.

Bagel Armory Restock (V2) (#34917)

9ed7fab

* 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

add straight ally pin (#34977)

50ba607

Automatic changelog update

5e3d744

Automatic changelog update

1077d2d

rubber bullets in the security techfab packs

c17bf9a

github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Feb 26, 2025

Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

e4ac61b

…-station-14 into 2025-02-10-february-upstream-merge

github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Feb 26, 2025

whatston3 added 2 commits February 26, 2025 15:56

fix NFSD techfab merge conflict

8817df5

rubber SMG mag recipe

c2e0de9

github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Feb 26, 2025

Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

39bd43c

…-station-14 into 2025-02-10-february-upstream-merge

github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Feb 27, 2025

whatston3 added 4 commits February 26, 2025 19:30

fix rubber SMG mag costs

3957bb8

an actual smg rubber mag entry in the nfsd techfab

ec1eb0e

fix the shuttle records sprites' side faces

fb3c358

nfsd techfab: mags to mags, boxes to boxes

7f1c531

whatston3 mentioned this pull request Feb 27, 2025

lineedit (hand labeler & others) text entry focus issues #2989

Closed

Swap dungeon Chefvend with the new Biogenerator

09b4466

github-actions bot added the Map-Dungeon Map - Dungeon label Mar 1, 2025

dvir001 requested review from GreaseMonk, dvir001, ErhardSteinhauer, Cheackraze and MagnusCrowe March 1, 2025 01:46

dvir001 approved these changes Mar 1, 2025

View reviewed changes

Merge branch 'master' into 2025-02-10-february-upstream-merge

d0f93f9

dvir001 added S: Approved and removed S: Needs Review This PR is awaiting reviews labels Mar 1, 2025

GreaseMonk approved these changes Mar 1, 2025

View reviewed changes

GreaseMonk merged commit 1fa46ac into new-frontiers-14:master Mar 1, 2025
13 checks passed

FrontierATC added a commit that referenced this pull request Mar 1, 2025

Automatic Changelog (#2897)

889947e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

'25 February upstream merge #2897

'25 February upstream merge #2897

whatston3 commented Feb 10, 2025 •

edited

Loading

github-actions bot commented Feb 26, 2025

github-actions bot commented Feb 26, 2025

dvir001 left a comment

'25 February upstream merge #2897

'25 February upstream merge #2897

Conversation

whatston3 commented Feb 10, 2025 • edited Loading

About the PR

Why / Balance

How to test

Media

Requirements

Breaking changes

github-actions bot commented Feb 26, 2025

github-actions bot commented Feb 26, 2025

dvir001 left a comment

Choose a reason for hiding this comment

whatston3 commented Feb 10, 2025 •

edited

Loading