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

[TM] GAS fixes #1757

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

[TM] GAS fixes #1757

wants to merge 34 commits into from

Conversation

msw7007
Copy link

@msw7007 msw7007 commented Jan 20, 2025

Что этот PR делает

Фиксы ГБС которые обнаружились в ходе эксплуатации

Почему это хорошо для игры

Меньше ошибок

Изображения изменений

Тестирование

Локальный сервер

Changelog

🆑
fix: Исправление спама ГБС
fix: Исправление ошибок связанных с генокрадом-ГБС
tweak: Закрытие для ГБС культа
tweak: Операции по восстановлению целостности панциря больше не требуют слома хитина
tweak: Операции по работе с хитином и целостностью панциря были разделены для более понятного обозначения
/:cl:

Copy link

sourcery-ai bot commented Jan 20, 2025

Reviewer's Guide by Sourcery

This pull request addresses several bug fixes and enhancements, primarily focused on the Serpentid species. It fixes excessive Global Broadcast System (GBS) messages, adjusts Serpentid traits and equipment, and implements other minor improvements.

Sequence diagram for Serpentid blade activation and visibility

sequenceDiagram
    participant User
    participant BladeImplant
    participant Kidneys
    participant Visibility

    User->>BladeImplant: Activate blades
    BladeImplant->>BladeImplant: Check if changeling
    alt is changeling
        BladeImplant->>BladeImplant: Retract changeling weapons
    end
    BladeImplant->>Visibility: Reset visibility
    BladeImplant->>Kidneys: Force off cloak mode
    Note over Kidneys: Prevents cloak abuse
    Kidneys-->>User: Update visibility state
Loading

Class diagram for updated Serpentid organ components

classDiagram
    class OrganDecay {
        -decay_rate
        -recover_rate
        -death_state_timer
        -lt_live
        +Initialize(decay_rate, recover_rate)
        +process()
    }

    class SerpentidOrgans {
        <<interface>>
    }

    class Heart {
        +icon_state: heart-on
        +dead_icon: heart-off
        +Initialize()
    }

    class Kidneys {
        +Initialize()
        +switch_mode()
    }

    class Eyes {
        +Initialize()
        +active: bool
    }

    class Lungs {
        +Initialize()
        +active_secretion: bool
    }

    SerpentidOrgans <|-- Heart
    SerpentidOrgans <|-- Kidneys
    SerpentidOrgans <|-- Eyes
    SerpentidOrgans <|-- Lungs

    note for OrganDecay "Modified decay rates for balance"
    note for SerpentidOrgans "All organs now have increased decay rates"
Loading

State diagram for Serpentid carapace system

stateDiagram-v2
    [*] --> Intact: Initial state
    Intact --> Stage1Broken: Damage > Threshold1
    Stage1Broken --> Stage2Broken: Damage > Threshold2
    Stage2Broken --> Stage3Broken: Damage > Threshold3

    Stage1Broken --> Intact: Surgery repair
    Stage2Broken --> Stage1Broken: Surgery repair
    Stage3Broken --> Stage2Broken: Surgery repair

    note right of Intact: Pierce immune
    note right of Stage1Broken: Reduced armor
    note right of Stage2Broken: Severely reduced armor
    note right of Stage3Broken: No armor
Loading

File-Level Changes

Change Details Files
Fixed excessive Global Broadcast System (GBS) messages.
  • Modified the organ hunger component to only switch off organs if they are currently active and there is insufficient nutrition.
modular_ss220/species/_components/organs/organ_hunger.dm
Serpentid adjustments, including trait and equipment restrictions.
  • Serpentids can no longer wear most clothing items.
  • Serpentids now have the "Chunky Fingers" trait.
  • Adjusted Serpentid preview icon.
  • Adjusted Serpentid name generation.
  • Serpentids are no longer valid sacrifice targets for cult runes.
  • Serpentids are excluded from being cultists.
  • Serpentids are excluded from being escape targets.
  • Serpentids are excluded from being valid targets for the changeling's sting ability.
  • Serpentids are excluded from being valid targets for the sin ruins.
modular_ss220/species/serpentids/code/mob/serpentids.dm
code/datums/datacore.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/game_mode.dm
code/modules/antagonists/changeling/powers/tiny_prick.dm
code/game/gamemodes/objective.dm
code/game/gamemodes/cult/cult_mode.dm
code/modules/ruins/lavalandruin_code/sin_ruins.dm
Carapace component adjustments.
  • Added signals for surgery interaction with carapace.
  • Added pierce immunity trait based on carapace state.
  • Added carapace operation status to prevent healing during surgery.
  • Added clear alert when carapace is broken.
  • Added destroy function to clear alert when carapace is broken.
modular_ss220/species/_components/carapace/carapace_shell.dm
modular_ss220/species/_components/carapace/carapace.dm
modular_ss220/species/serpentids/code/organs/external/serpentids_organs_torso.dm
Serpentid organ adjustments.
  • Adjusted decay rates for Serpentid organs.
  • Adjusted heart icon states.
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_heart.dm
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_ears.dm
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_eyes.dm
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_kidneys.dm
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_liver.dm
modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm
Serpentid blade adjustments.
  • Adjusted serpent blade damage based on changeling status.
  • Added destroy on removal for serpentid blades.
  • Added logic to remove arm blades and shields when blades are active.
modular_ss220/species/serpentids/code/organs/internal/implants/serpentid_mantis_chest.dm
modular_ss220/species/serpentids/code/organs/internal/implants/serpentid_mantis_blades.dm
Mob overlay shift adjustments.
  • Added check for serpentid to apply shift values.
  • Added signal for changeling finished transform.
modular_ss220/species/_components/appearance/mob_overlay_shift.dm

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added the 🔧 Фикс Переписываем ошибку так, чтобы она проявлялась в других обстоятельствах label Jan 20, 2025
@github-actions github-actions bot added 💾 Изменение конфига Ф-ф-фуриор...? :feelsgood: Частичная модульность Не всегда получается всё впихнуть в модуль, увы. labels Jan 21, 2025
@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Jan 22, 2025
@msw7007 msw7007 marked this pull request as ready for review January 23, 2025 15:26
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 23, 2025
@ss220app ss220app bot added 📜 CL невалиден Этот чейнджлог не пройдет валидацию перед публикацией. Исправить или удалить, если не требуется and removed 📜 CL валиден Этот чейнджлог будет успешно опубликован labels Jan 23, 2025
@ss220app ss220app bot removed the 📜 CL невалиден Этот чейнджлог не пройдет валидацию перед публикацией. Исправить или удалить, если не требуется label Jan 23, 2025
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 23, 2025
@m-dzianishchyts m-dzianishchyts changed the title GAS fixes [TM] GAS fixes Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:feelsgood: Частичная модульность Не всегда получается всё впихнуть в модуль, увы. 💾 Изменение конфига Ф-ф-фуриор...? 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден Этот чейнджлог будет успешно опубликован Testmerge Required 🔧 Фикс Переписываем ошибку так, чтобы она проявлялась в других обстоятельствах
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants