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.

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

upstream merge 21/12 #2496

Merged
merged 160 commits into from
Dec 22, 2024
Merged

upstream merge 21/12 #2496

merged 160 commits into from
Dec 22, 2024

Conversation

deltanedas
Copy link
Member

Notable changes

  • man o war shuttle with 4 free agents @DeltaV-Station/direction
  • holopads real including the bugfixes
  • atmospheric pipe monitor computer real
  • advanced SMESes for mapping
  • inverted lizard plushie that makes you !heW
  • godawful buttons in top left are fixed
  • author of the clearly nuclear music yoinked it, rip
  • using new holy water and holy damage from upstream, had to migrate every HolyWater reagent to Holywater (thats the 2 lines of map changes)
  • vox detectives dont get their vest on the floor

christmas things:

  • present anomaly for farming presents
  • smite cranberry

Excluded changes

  • ame power change since we have our own ame curve
  • revenant damage modifier is the same as before

Changelog
🆑 Santa

  • add: Merged the Christmas cheer from upstream. Ho ho ho!

PJB3005 and others added 30 commits December 21, 2024 09:36

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
* Give silicons proper lobby/character editor previews

No more naked dummies, properly show a borg/AI sprite now.

This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined.

Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad.

* Update Content.Shared/Roles/JobPrototype.cs

* Update Content.Client/Lobby/LobbyUIController.cs

* Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
This reverts commit f27fa1ed30920581c6322d08867cb3334f897589.

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
These were coded to only listen to InteractHand, which doesn't follow our interaction model properly.
…oor, force detective to have a selected outerclothing like all other sec roles (#33765)

fix detective vox spawning with their outer clothing on the floor

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
* fix gas pipe unanchoring

* remove unneeded update

* revert popup change

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
* max duration

* comment

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
* Popup when being pulled

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

* Update Resources/Locale/en-US/movement/pulling.ftl

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
G1gg1L3s Nazar Serhiichuk
* Fix disposals.

* Rename properly

---------

Co-authored-by: sleepyyapril <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>
…3348)

* Adds an introductory message to the user-facing ahelp chat window

* Update Resources/Locale/en-US/administration/bwoink.ftl

* Update Resources/Locale/en-US/administration/bwoink.ftl

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* does everything

* beer flavor revert and linter fix

* Update Resources/Locale/en-US/flavors/flavor-profiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* fix misspelling

* fix yet another misspelling

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* english has weird spellings huh

* im starting to feel ashamed of myself

* this is shameful

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
SMES now has wirepanels visuals
Construction always grants a blank newline even if it not currently constructing.
Added a generic anchor visuals enum
fix greytide virus hitting other maps
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
metalgearsloth and others added 7 commits December 21, 2024 10:25
* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Implement field deltas for guns

* Content done

* Update

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
* Content changes for engine toolshed PR

* add contains command

* more permissive commands
:trollface:
@deltanedas deltanedas requested review from a team as code owners December 21, 2024 11:16
@github-actions github-actions bot added S: Needs Review size/XL Over 1024 lines 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: Shaders Changes any swsl shaders Changes: Audio Changes any audio files and removed S: Needs Review size/XL Over 1024 lines labels Dec 21, 2024
:trollface:
@github-actions github-actions bot added the size/XL Over 1024 lines label Dec 21, 2024
@ThataKat
Copy link
Contributor

Direction reviewing, 1-2 days

Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, man o war we're gonna keep an eye on but should be fun. Velcro wants us to keep an eye out for any barricades if bariccades are already mapped over a window, i think the only place that might be the case is pebble engi maints

@deltanedas deltanedas merged commit 13a1e1f into DeltaV-Station:master Dec 22, 2024
14 checks passed
@deltanedas deltanedas deleted the upstream-ops branch December 22, 2024 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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: Shaders Changes any swsl shaders Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files size/XL Over 1024 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet