upstream merge 27/04/2025 #3596

deltanedas · 2025-04-27T19:28:43Z

About the PR

smes ui god bless pjb
used implanters have their names again so you can explicitly say what kind of contraband someone is in possession of instead of relying on kinda meta knowledge that every syndicate implant happens to be controlled
localized material silos which give mats to nearby lathes, can be mapped in epi and maybe engi
clowns mimes and borgs can have job-specific names now
ICEE moved into new upstream t3 arsenal temperature guns
new t3 experimental desynchronizer that puts you in stasis when used, costs bluespace to make
traitors can no longer buy jugg or elite suit, new elite web vest has good stamina resistance
dragons have random names now
economy changes so the sale cut can be changed
botany no longer gets free egg-plant seeds they have to mutate or buy them
nukie agent renamed to nukie corpsman
cotton burgers and other new food
borg module rework
cable sprites are more accessible
toy sword uses the real ones sprites
borgs and bots can boop and whirr now

Excluded

scrubber/vent resprite, i feel they draw too much attention when for most people its just part of the background
interior shuttle wall removal lol
cabinet whitelists stinky
solars dont get randomized by variation passes, we use random spawners already
delivery/xenoarch stuff

Changelog
🆑

add: Merged most of April's changes from upstream.

Co-authored-by: Helm4142 <[email protected]>

All SMG magazines are now 30 round, rather than half being 35 round.

* Initial commit. * added SMG descriptions * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml Co-authored-by: ArtisticRoomba <[email protected]> * Updated descriptions to incorporate Roomba's feedback. * Slightly changed Viper description * Minor formatting change * Updated Atreides description * Fixed a minor convention mistake in magazines * Slightly changed the Viper's description to not reveal its manufacturer. * Updated Drozd description. * Rerun test * Updated descriptions in accordance with Roomba's suggestions! * Updated Viper description! * Shit I forgot to remove the cartridge length, did it now! * More smart changes by Roomba * Tests gaslighting me * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml Co-authored-by: ArtisticRoomba <[email protected]> * Updated WT550 description --------- Co-authored-by: ArtisticRoomba <[email protected]>

* 1 * 2

* Makes more items recyclable. * Added newlines * Fixed material issues which were NOT MY FAULT --------- Co-authored-by: RedBookcase <[email protected]>

Update chemistry.yml Fixing glass dupe.

* 1 * Fix local * formatting --------- Co-authored-by: Milon <[email protected]>

* Salvage * atmos a * more muted colours * Mapping Related to AI * Fixed small naming inconsistency * Revert "Fixed small naming inconsistency" This reverts commit 985e1fd46a09e521c11dc345f470228e7907fbb9. * Revert "Mapping Related to AI" This reverts commit 5d5ae4feb819396c5c2a7413399ab5ce34f8683b. * Revert "atmos a" This reverts commit 529831e2584df27fa102ee1c970948fa3b6bab56. * indent --------- Co-authored-by: Milon <[email protected]>

…bled) * Expand-Shelves-Whitelist Made departmental shelves hold a wider variety of items. * Accidentally included "Packet" twice

* commit GET!! * minor cleanup

* take 2! fight!!! * final touches * reeeeeee

Use non-generic TryComp in StationSpawningSystem

DA WIZARDgit add -A

* change MV cable outline * zamn

sowelipililimute · 2025-04-27T19:30:04Z

direction review incoming 7 days

deltanedas · 2025-04-27T19:30:11Z

fast

Toby222 · 2025-04-28T07:22:37Z

Excluded

* scrubber/vent resprite, i feel they draw too much attention when for most people its just part of the background

They're in the process of being resprited here anyway

deltanedas · 2025-04-28T12:07:14Z

all the sprites are changed so itll be 5% easier
and upstream just reverted it lmao

github-actions · 2025-04-28T13:37:51Z

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

github-actions · 2025-05-01T12:03:08Z

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

Toby222 · 2025-05-01T14:57:49Z

Why do pAIs have 30 memory when there's only 20 memory worth of programs even implemented?

Avalon-Proto · 2025-05-01T15:00:54Z

Why do pAIs have 30 memory when there's only 20 memory worth of programs even implemented?

Probably some extra allowance for future programs to install

Toby222 · 2025-05-01T18:38:49Z

A lot of job requirements lowered a by lot, is this wanted for our server?
Also, when you ghost or suicide as a pAI the memorized programs get removed but the store isn't reset so the next person can't do anything.
Not sure if it's debug shenanigans but taking pAI ghost role, suiciding, taking the role again, then suiciding again will leave you with an non-player ghost just floating around?

deltanedas · 2025-05-02T02:05:27Z

A lot of job requirements lowered a by lot, is this wanted for our server?

irrelevant because of job overrides

Not sure if it's debug shenanigans but taking pAI ghost role, suiciding, taking the role again, then suiciding again will leave you with an non-player ghost just floating around?

upstream issue already reported

github-actions · 2025-05-02T19:51:22Z

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

Spessmann and others added 30 commits April 27, 2025 16:27

Small ruin fixes (#36763)

00d92e9

Fix soup (#34633)

b304f54

Co-authored-by: Helm4142 <[email protected]>

Automatic changelog update

de1910a

Fix some SMG magazines fitting 35 rounds (#34782)

1fb2979

All SMG magazines are now 30 round, rather than half being 35 round.

Fix head markings under some helmets (#36074)

f21f90d

* 1 * 2

Automatic changelog update

07a663d

Makes more items recyclable. (#35800)

84958b5

* Makes more items recyclable. * Added newlines * Fixed material issues which were NOT MY FAULT --------- Co-authored-by: RedBookcase <[email protected]>

Automatic changelog update

67d3f25

Automatic changelog update

1e38ef3

Fix glass duplication with beakers (#34441)

783441c

Update chemistry.yml Fixing glass dupe.

Automatic changelog update

dbfb85d

Heterochromia for Moth (#36061)

353948c

* 1 * Fix local * formatting --------- Co-authored-by: Milon <[email protected]>

Automatic changelog update

eb4d48c

Departmental shelves whitelist expansion (Attempt №3) (#34292) (disa…

002350e

…bled) * Expand-Shelves-Whitelist Made departmental shelves hold a wider variety of items. * Accidentally included "Packet" twice

Automatic changelog update

7fb6918

Replace GetEntitiesInTile with EntityLookupSystem equivalent (#36756)

9b9d592

* commit GET!! * minor cleanup

Automatic changelog update

6e058a8

Unused dependency cleanup. (#36760)

3b72622

* take 2! fight!!! * final touches * reeeeeee

Fire protection for ERT engineering hardsuit (#34949)

3c69c3f

Automatic changelog update

9bc9e37

Nonlethal throwables crate (#35808)

3a28aa3

Automatic changelog update

d8e7826

Use non-generic TryComp in StationSpawningSystem (#36769)

09cd0cf

Use non-generic TryComp in StationSpawningSystem

Add marker components for admin shenanigans (#36776)

cab84b9

Automatic changelog update

2b5fe9c

Restore LimitedChargesComponent.MaxCharges default value to 3 (#36778)

229eabe

Wizard Figure Voiceline Fix #36771 (#36779)

4afb9ff

DA WIZARDgit add -A

change MV cable outline (#36751)

9bf9b54

* change MV cable outline * zamn

github-actions bot added 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 labels Apr 27, 2025

deltanedas changed the title ~~Upstream ops~~ upstream merge 27/04/2025 Apr 27, 2025

deltanedas added 2 commits April 28, 2025 14:35

put surgery borg module icons in _Shitmed

1a8ddca

the big fix

429bd94

deltanedas force-pushed the upstream-ops branch from 0f65901 to 429bd94 Compare April 28, 2025 13:35

github-actions bot added the size/L 256-1023 lines label Apr 28, 2025

github-actions bot added the S: Merge Conflict Fix your PR! label Apr 28, 2025

merge master

4ef73bc

github-actions bot removed the S: Merge Conflict Fix your PR! label Apr 28, 2025

deltanedas added 2 commits April 28, 2025 16:39

abstract the right recipe

b6b1736

goida

1ceab4b

github-actions bot added the S: Merge Conflict Fix your PR! label May 1, 2025

merge master

815c4f0

github-actions bot removed the S: Merge Conflict Fix your PR! label May 1, 2025

github-actions bot added the S: Merge Conflict Fix your PR! label May 2, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upstream merge 27/04/2025 #3596

upstream merge 27/04/2025 #3596

deltanedas commented Apr 27, 2025

sowelipililimute commented Apr 27, 2025

deltanedas commented Apr 27, 2025

Toby222 commented Apr 28, 2025

Excluded

deltanedas commented Apr 28, 2025

github-actions bot commented Apr 28, 2025

github-actions bot commented May 1, 2025

Toby222 commented May 1, 2025

Avalon-Proto commented May 1, 2025

Toby222 commented May 1, 2025 •

edited

Loading

deltanedas commented May 2, 2025

github-actions bot commented May 2, 2025

upstream merge 27/04/2025 #3596

Are you sure you want to change the base?

upstream merge 27/04/2025 #3596

Conversation

deltanedas commented Apr 27, 2025

About the PR

Excluded

sowelipililimute commented Apr 27, 2025

deltanedas commented Apr 27, 2025

Toby222 commented Apr 28, 2025

Excluded

deltanedas commented Apr 28, 2025

github-actions bot commented Apr 28, 2025

github-actions bot commented May 1, 2025

Toby222 commented May 1, 2025

Avalon-Proto commented May 1, 2025

Toby222 commented May 1, 2025 • edited Loading

deltanedas commented May 2, 2025

github-actions bot commented May 2, 2025

Toby222 commented May 1, 2025 •

edited

Loading