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

Upstream0611 #752

Merged
merged 206 commits into from
Nov 10, 2024
Merged

Upstream0611 #752

merged 206 commits into from
Nov 10, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Nov 6, 2024

Описание PR

Почему / Баланс

Техническая информация

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Критические изменения

  • Проверить норм ли это робит Ai law update #435
    по пути Content.Server\Silicons\Laws\SiliconLawSystem.cs
    protected override void OnUpdaterInsert(Entity<SiliconLawUpdaterComponent> ent, ref EntInsertedIntoContainerMessage args)
    {
        // TODO: Prediction dump this
        if (!TryComp(args.Entity, out SiliconLawBoundComponent? provider)) //ADT custom AI law
            return;

        var lawset = GetLaws(args.Entity, provider).Laws; //ADT custom AI law
        var query = EntityManager.CompRegistryQueryEnumerator(ent.Comp.Components);

        while (query.MoveNext(out var update))
        {
            SetLaws(lawset, update);
            if (provider.LawUploadSound != null && _mind.TryGetMind(update, out var mindId, out _))
                _roles.MindPlaySound(mindId, provider.LawUploadSound);
        }
        ///ADT AI Custom law start
        UpdateBorgsNTLaws(lawset);
    }

Чейнджлог

🆑
Шрёдька

  • tweak: Подтянуты коммиты с Корвакса, 06.11.2024.

slarticodefast and others added 30 commits October 15, 2024 20:57
* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Added ReptilianBodyEmotes to speech_emote_sounds.yml, yada yada yada

* added sound and changed volume

* fix thingies

* fixed bug with reptilians not being able to do default emotes

* lowered the volume of the hiss and huff

* reformat the yml

* Add sigh keywords to the huff

* Undo changes to BuildChecker.csproj

* Add icons to the emotes

* Remove sigh triggers from the huff emote since it breaks normal sighing.

* Remove the Huff and Hiss since i cant find good audio for it

* i forgor

* Changed attribution

* Credit Sarahon for the tailslap

---------

Co-authored-by: nicho <[email protected]>
* le fixo smotes

* CURSE OF BLINDNESS

* Guh
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add robo control comp, also de-reinforce a lot of walls.

* Revert "Add robo control comp, also de-reinforce a lot of walls."

This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.

* FTLdiskburner command to make FTL disks.

* Elegant failure on mistyped ID.

* even more more eleganter failures.

* foo

* bar

* I have reached completion

* prevent id confusion

* I'm givin' her all she's got captain!

* a bit more hug boxing for safe destinations.

* comments for foo

* extra thoughts.

* cleanup

* continuen't

* Improve feedback strings

* reviewer QOL

* Reviewer QOL 2

* handle easy reviews

* Add comments to clarify reviews

* howdoicode to the rescue.

* ftldisk in hand

* ftl.ftl

* funny disk case

* loc

* unusing
* Several small sfx tweaks

* fix small yml oopsie

* Redo the basin code to use events

* now uses an event for when the transfer is successful, not when there's just an attempt

* forgot to remove this

* Update Content.Server/Botany/Components/PlantHolderComponent.cs

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

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

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

* adds sound variations to shoes as well

* variations on honkbots and the H.O.N.K mech

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

* Update Content.Server/Botany/Systems/PlantHolderSystem.cs

* fix compile issue

* oops forgot to delete this

* cleanup

---------

Co-authored-by: Nemanja <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
* changed bananium desc

* removed bananium name and desc ftl string
* enable ejecting in biogenerator UI

* allow inserting too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Subversion Board Insertion Audio Notification

Add Subversion flag and SubversionSound to SiliconLawProviderComponent

Add new Method (OnSubversionInserted)
to SiliconLawSystem to handle a Subversive
SiliconLawProviderComponent and play it's SubversionSound

Add Check for Subversive law provider to OnUpdaterInsert that
calls OnSubversionInserted if the SiliconLawProviderComponent is
Subversive

* Fix subversion Sound

- Change out Weh sound used to test that subversion sounds can be
changed by prototype for a a not yet present Antimov subversion sound

* Make it not just subversive

- Remove OnSubversionInserted and move the MindPlaySound in the
OnUpdaterInsert so long as LawUploadSound exists

- Modify SubversionSound into LawUploadSound

- Remove the Subversion flag

- Just use emagged_borg.ogg until the better one is made

* Remove errant spaces and a errant namespace

* CR Fixes - Add generic Lawboard insert cue

- Combine the If statements per /pull/32625#discussion_r1786926400
inside OnUpdaterInsert

- Remove the ViewVariables(VVAccess.ReadWrite) per
pull/32625#discussion_r1786924433

- Add Cryo_warning.ogg from TGStation, the sound utilized for Law Upload
cue, Attribution.

* CR Add a placeholder Antimov notification sound

- Add a new sound kitbashed from the cryo_sound used for uploading
and the emagged noise

* Add self referential source attribution

- also fix an errant space

* Add more bespoke Sound by ps3moira + attributions
this was just copypasted without any context wasn't it
…erience (#32851)

set FancyWindow MinHeight to 210
* Change the window titlebar to show the joined server

Requires space-wizards/RobustToolbox#5475

* Totally not a webedit

* Can you tell what cvar I copied?

* And this kids is why we don't webedit

* Reviews

---------

Co-authored-by: metalgearsloth <[email protected]>
* Rename ChatSanitizationManager to ChatEmoteSanitizationManager

The prior name was kind of confusing as there's a emote one and
then now there's also chat expansion happening in the accent system,
so knowing which I actually need to edit is useful.

So, I just need to keep myself not confused.

* Rename smileyToEmote and remove punctuation duplicates

The name SmileyToEmote is just... Bad.

Plus, I needed to remove the punctuation duplicates as that would
break any kind of regex parsing that I tried.

* Switch to regex from checking end of string

I also changed from System.Globalization to ILocalizationManager.

Writing that regex was definitely an experience.

* Document regex and the manager

* Rename it back

* Simplify regex
small ai core lv change
Copy link
Contributor

github-actions bot commented Nov 6, 2024

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

@github-actions github-actions bot added Merge Conflict Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации and removed Merge Conflict labels Nov 6, 2024
@Schrodinger71
Copy link
Collaborator Author

Надо доразобрать законы для ИИшки

@Schrodinger71 Schrodinger71 added the Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест label Nov 7, 2024
@Schrodinger71 Schrodinger71 added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Nov 8, 2024
@Schrodinger71
Copy link
Collaborator Author

НЕА, ЗАКОНЫ НЕ МЕНЯЮТСЯ

@Schrodinger71
Copy link
Collaborator Author

В Пздуу, всё остальное робит

@Schrodinger71 Schrodinger71 removed Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест labels Nov 10, 2024
@Schrodinger71 Schrodinger71 merged commit 53a2796 into master Nov 10, 2024
11 checks passed
@Schrodinger71 Schrodinger71 deleted the upstream0611 branch November 10, 2024 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Development

Successfully merging this pull request may close these issues.