Upstream Merge #1626

formlessnameless · 2025-02-09T16:33:09Z

Latest upstream merge. Big highlights and things to look for bugs in are changes to the contraband system, an official upstream Emag/Door Breaker split, and upstream fake mindshields. I'll be looking out for issues, as always let me know if anything looks fucked. There is almost certainly a better way to handle the ling mindshield faking but this is Fine.

* Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment" * Fixed another awkward grammar situation * Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas * Reverted pylons, and added more entries to help fill out the lists more * reverted all deletions * implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there * realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error * Removed Portugal again, added more Musts since that list was the new shortest one.

* Add option to disable bwoink sound. * Now it's working only with active admin status. * No bwoink, only "notification sound" * Moar changes * Another one

* More scarfs (impstation#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix * Resolved merge conflict * Moved scarves around * Moved scarf textures out of the _CD directory * Removed final CD folder * Removed extra scarfs * Removed extra scarfs, again * Replaced ClothingNeckBase with ClothingScarfBase --------- Co-authored-by: PursuitInAshes <[email protected]> Co-authored-by: TakoDragon <[email protected]>

…ds#34478) * Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys * removed a new line

* Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references

I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.

1. Now clearly says "opened"/"closed" when changing the release valve. 2. Clearly says whether the valve was opened while a canister was inserted or not. 3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment. Fixes space-wizards#34488

* Optimize & clean up RadiationSystem * comments * Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs Co-authored-by: Thomas <[email protected]> --------- Co-authored-by: Thomas <[email protected]>

Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)

* space weh can now be work on top of head * space weh can now be worn on top of head * trim out unnecessary comps

) Co-authored-by: Winkarst <[email protected]>

Add 10u plasma to the chemistry locker so the chemists stop stealing tables.

* Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5

* new empty.ogg * source to tg commit

* Bandage fix denied animations playing on devices without them * CentComm blast door prototype * CentComm button * CentComm window shutters * CC Updates * Save as grid * Remove an extra detective figurine I like them better in the interrogation room * Remove paramed locker, let pumps shut off * Fix wrong HOP locker prototype

Darkmajia · 2025-02-10T01:16:04Z

put a pr on your dev branch to fix a few things, some other issues i noticed:

airlock access override still in uplink
tech debt in EmagSystem from airlock access (whitelist/blacklist, minor and inconsequential for players but this is the best place to note it)

radial menu fixes, heretic ftl fix, thaven emagging fix

formlessnameless · 2025-02-10T05:04:49Z

alright Dark and Flotsam's fixes are in for now I'm gonna review this one last time when I have more than two hours of sleep available. if someone else reviews it all first and wants to merge it fine by me

formlessnameless · 2025-02-10T05:06:04Z

put a pr on your dev branch to fix a few things, some other issues i noticed:

* airlock access override still in uplink

* tech debt in `EmagSystem` from airlock access (whitelist/blacklist, minor and inconsequential for players but this is the best place to note it)

Oh also I purposefully kept the whitelist/blacklist because I thought they were used for something else we might have ported from delta-v. I can double check that later. I didn't know if it was exclusively due to the split or not

…nto dev

Darkmajia · 2025-02-10T08:37:20Z

i think its just used for the airlock access override? i could be wrong

hivehum · 2025-02-10T16:19:49Z

i think its just used for the airlock access override? i could be wrong

correct, we had ideas to reuse the emag whitelist/blacklist but it never ended up panning out

hivehum

reviewing rn once again with the caveat that im only really comfortable with reviewing yaml. also using riders pr review feature and being very scared the entire time

todos:

i dont think this has to be part of this specific pr but should see if the prayer notice i added in prayers play a notif for admins #1306 can be hooked into the bwoink sound effect toggle
we have a pain insensitivity trait (new negative trait pain insensitivity #1056) that should be removed in this pr if it hasnt been yet
didnt the contraband refactor end up in this upstream merge. we have to do a pass on our own contraband tags etc
the upstream fake mindshield needs to fully replace the ling one if it hasnt yet. it looks like you deleted everything you needed to but i didnt see the ling purchase get altered. could have missed it, this pr is huge
i cant figure out how to comment on images in rider but the new drozd looks like shit

Resources/Locale/en-US/store/uplink-catalog.ftl

Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/tcktck.yml

Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/rock.yml

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

Resources/Prototypes/Catalog/thief_toolbox_sets.yml

Resources/Prototypes/Datasets/ion_storm.yml

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml

formlessnameless · 2025-02-10T20:01:18Z

reviewing rn once again with the caveat that im only really comfortable with reviewing yaml. also using riders pr review feature and being very scared the entire time

todos:

* i dont think this has to be part of this specific pr but should see if the prayer notice i added in [prayers play a notif for admins #1306](https://github.com/impstation/imp-station-14/pull/1306) can be hooked into the bwoink sound effect toggle

* we have a pain insensitivity trait ([new negative trait pain insensitivity #1056](https://github.com/impstation/imp-station-14/pull/1056)) that should be removed in this pr if it hasnt been yet

* didnt the contraband refactor end up in this upstream merge. we have to do a pass on our own contraband tags etc

* the upstream fake mindshield needs to fully replace the ling one if it hasnt yet. it looks like you deleted everything you needed to but i didnt see the ling purchase get altered. could have missed it, this pr is huge

* i cant figure out how to comment on images in rider but the new drozd looks like shit

I agree about the bwoink but outside of scope yeah
I will remove our version
It did, and the most that changed for us was that the bandolier and shotgun also got bartender clearance. I think going over the contraband changes is also outside of the scope of this, right now basically all of our old changes are still in place over anything upstream has done.
It has been, entirely. The ling purchase just uses the old system with the new stuff slotted in.
I didn't look at it lol

honeyed-lemons · 2025-02-10T20:06:25Z

10u liquid plasma can get you all the basic chems, you wont need any more unless you decide to make phlog (illegal chem)

hivehum · 2025-02-10T20:15:57Z

1. I agree about the bwoink but outside of scope yeah

2. I will remove our version

3. It did, and the most that changed for us was that the bandolier and shotgun also got bartender clearance. I think going over the contraband changes is also outside of the scope of this, right now basically all of our old changes are still in place over anything upstream has done.

4. It has been, entirely. The ling purchase just uses the old system with the new stuff slotted in.

5. I didn't look at it lol

yeah youre good. kill the accessbreaker in thief toolkit and plasma vial in chemistry locker (and optionally keep the old drozd sprites) and ill switch this to an approve

formlessnameless · 2025-02-10T20:47:58Z

i have made arbitrary decisions that fit my own wants and needs at random

hivehum · 2025-02-10T20:48:51Z

RESPECT !!!

southbridge-fur and others added 30 commits January 16, 2025 21:49

Automatic changelog update

5d9311d

Add option to disable bwoink sound. (space-wizards#33782)

4809ee2

* Add option to disable bwoink sound. * Now it's working only with active admin status. * No bwoink, only "notification sound" * Moar changes * Another one

Automatic changelog update

40e0496

Automatic changelog update

ac04604

Replace the djstation intercoms with freelance intercoms (space-wizar…

50bb5e0

…ds#34478) * Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys * removed a new line

Update nix flake for .NET 9 (space-wizards#34480)

2fa4f0a

Automatic changelog update

464f68d

Holopad networking rework (space-wizards#34112)

efd5d64

* Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references

Make GasMixture enumerable

0e840d8

I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.

Optimize & clean up RadiationSystem (space-wizards#34459)

9d4e600

* Optimize & clean up RadiationSystem * comments * Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs Co-authored-by: Thomas <[email protected]> --------- Co-authored-by: Thomas <[email protected]>

Improve canister admin logs (space-wizards#34495)

970b4a6

Update engine to v240.0.1 (space-wizards#34497)

c4542ee

Various Locale Typo Fixes (and spaces) (space-wizards#34483)

c78717e

Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)

Space lizard plushie can now be worn on your head (space-wizards#33809)

7f0ff0b

* space weh can now be work on top of head * space weh can now be worn on top of head * trim out unnecessary comps

Automatic changelog update

17464ff

Adds bullet collision to wall mounted cameras (space-wizards#34500)

343f59f

Automatic changelog update

fb38bf3

Staging -> Master merge (space-wizards#34489)

026d65d

Change MaskComponent to accommodate sprites namings (space-wizards#33451

86cf3a4

) Co-authored-by: Winkarst <[email protected]>

Automatic changelog update

5d06ee2

Add a 10u vial of plasma to the chemical locker (space-wizards#33871)

1840160

Add 10u plasma to the chemistry locker so the chemists stop stealing tables.

Automatic changelog update

4a015d1

Rarer Highcaps (space-wizards#34469)

993b5c4

* Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5

Automatic changelog update

428fcd6

New dry fire sound (space-wizards#34447)

2f8f536

* new empty.ogg * source to tg commit

Automatic changelog update

a2df771

formlessnameless marked this pull request as ready for review February 9, 2025 16:33

formlessnameless marked this pull request as draft February 9, 2025 16:42

formlessnameless added 2 commits February 9, 2025 10:58

update contraband to meet new standard

d5ad6b9

this works its fine

a3b5764

formlessnameless marked this pull request as ready for review February 9, 2025 19:14

formlessnameless requested a review from a team February 9, 2025 19:14

formlessnameless and others added 3 commits February 9, 2025 13:29

missed these

965c874

rock

6dc5f9a

radial menu fixes, heretic ftl fix, thaven emagging fix

2804d41

TGRCdev and others added 3 commits February 9, 2025 20:02

Fixed thaven emagging happening multiple times

41e92dc

Merge branch 'dev' into upstream-1626-fixes

e23911b

Merge pull request #3 from Darkmajia/upstream-1626-fixes

2401b37

radial menu fixes, heretic ftl fix, thaven emagging fix

formlessnameless added 2 commits February 9, 2025 23:12

remove the rest of the doorjack

4d78696

Merge branch 'dev' of https://github.com/Gh0ulcaller/imp-station-14 i…

8e9cd26

…nto dev

hivehum self-requested a review February 10, 2025 16:21

hivehum requested changes Feb 10, 2025

View reviewed changes

formlessnameless added 2 commits February 10, 2025 14:45

some changes

fe9d4d3

one last one

2f3a28a

hivehum approved these changes Feb 10, 2025

View reviewed changes

hivehum merged commit 8697d06 into impstation:master Feb 10, 2025
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream Merge #1626

Upstream Merge #1626

formlessnameless commented Feb 9, 2025 •

edited

Loading

Darkmajia commented Feb 10, 2025

formlessnameless commented Feb 10, 2025

formlessnameless commented Feb 10, 2025

Darkmajia commented Feb 10, 2025

hivehum commented Feb 10, 2025

hivehum left a comment

formlessnameless commented Feb 10, 2025

honeyed-lemons commented Feb 10, 2025

hivehum commented Feb 10, 2025 •

edited

Loading

formlessnameless commented Feb 10, 2025

hivehum commented Feb 10, 2025

Upstream Merge #1626

Upstream Merge #1626

Conversation

formlessnameless commented Feb 9, 2025 • edited Loading

Darkmajia commented Feb 10, 2025

formlessnameless commented Feb 10, 2025

formlessnameless commented Feb 10, 2025

Darkmajia commented Feb 10, 2025

hivehum commented Feb 10, 2025

hivehum left a comment

Choose a reason for hiding this comment

formlessnameless commented Feb 10, 2025

honeyed-lemons commented Feb 10, 2025

hivehum commented Feb 10, 2025 • edited Loading

formlessnameless commented Feb 10, 2025

hivehum commented Feb 10, 2025

formlessnameless commented Feb 9, 2025 •

edited

Loading

hivehum commented Feb 10, 2025 •

edited

Loading