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

NEW: ERT MODsuits #1685

Merged
merged 19 commits into from
Jan 9, 2025
Merged

NEW: ERT MODsuits #1685

merged 19 commits into from
Jan 9, 2025

Conversation

Kar4es
Copy link

@Kar4es Kar4es commented Dec 4, 2024

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

Добавил ОБР класса РЭД моды. В кой то век я решил этим занятся.

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

Потому что мы избавляемся от ебучих старых никому нахуй не нужных ригов.

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

image

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

Вроде все работает

Changelog

🆑
add: Добавлены МОДы для ОБР класса "Рэд"
tweak: При выборе расы ОБР больше нельзя выбрать ксенорасу. (Выбора в принципе нет)
/:cl:

Summary by Sourcery

Add red Emergency Response Team (ERT) MODsuits.

New Features:

  • Added MODsuits for the ERT "Red" class.

Tests:

  • Tested and confirmed functionality.

@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Dec 4, 2024
@Kar4es Kar4es changed the title NEW: ERT Red MODsuits NEW: ERT MODsuits Dec 8, 2024
@github-actions github-actions bot added the Merge Conflict Ну блять... label Dec 10, 2024
@github-actions github-actions bot added the :feelsgood: Частичная модульность Не всегда получается всё впихнуть в модуль, увы. label Dec 12, 2024
@github-actions github-actions bot removed the Merge Conflict Ну блять... label Dec 12, 2024
Copy link

This pull request seems to be stale as there have been no changes in 14 days, please make changes within 7 days or the PR will be closed. If you believe this is a mistake, please inform a development team member on Discord.

@github-actions github-actions bot added the Stale ПР долго был не активен, и требует обновления. label Dec 27, 2024
@m-dzianishchyts m-dzianishchyts added Stale Exempt PR не может быть устаревшим. Видать кто-то подкупил хэда. and removed Stale ПР долго был не активен, и требует обновления. labels Dec 28, 2024
@Kar4es Kar4es marked this pull request as ready for review January 6, 2025 10:05
@Kar4es Kar4es changed the title NEW: ERT MODsuits [НЕ МЕРЖИТЬ] NEW: ERT MODsuits Jan 6, 2025
Copy link

sourcery-ai bot commented Jan 6, 2025

Reviewer's Guide by Sourcery

This pull request introduces Emergency Response Team (ERT) MODsuits, a new type of modular clothing. It adds new outfit definitions for ERT roles using these MODsuits and restricts ERT species selection to humans only.

Class diagram for new MODsuit themes and controls

classDiagram
    class datum_mod_theme {
        +name: string
        +desc: string
        +extended_desc: string
        +species_allowed: list
        +is_species_allowed(species)
    }

    class obj_item_mod_control {
        +build_head()
        +build_suit()
        +build_gloves()
        +build_shoes()
        +is_any_part_deployed()
        +pre_species_gain(new_species)
        +quick_deploy(user)
        +deploy(user, part, mass)
    }

    class datum_mod_theme_responsory_red {
        +name: "Rhino responsory"
        +desc: string
        +armor_type_1
        +resistance_flags
        +slowdown_inactive: 0.5
        +slowdown_active: 0
    }

    datum_mod_theme <|-- datum_mod_theme_responsory_red
    obj_item_mod_control -- datum_mod_theme
Loading

State diagram for MODsuit deployment process

stateDiagram-v2
    [*] --> Undeployed
    Undeployed --> SpeciesCheck: quick_deploy/deploy
    SpeciesCheck --> Deployed: Species Allowed
    SpeciesCheck --> Undeployed: Species Not Allowed
    Deployed --> Undeployed: retract
    Deployed --> Active: activate
    Active --> Deployed: deactivate
Loading

File-Level Changes

Change Details Files
Added ERT MODsuits
  • New outfit datums for ERT Commander, Security, Engineer, Medic, Paranormal, and Janitor roles were created, utilizing the new 'Rhino' responsory MODsuit.
  • A new MODsuit theme, 'responsory/red', was defined with specific properties like armor values, resistance flags, and allowed species (Humans only).
  • Pre-equipped MODsuit configurations for each ERT role were added, specifying the included modules and insignia types.
  • Added species restriction logic to MODsuit deployment to prevent unauthorized use by non-human species.
modular_ss220/outfits/code/outfits.dm
modular_ss220/mod/code/mod_theme.dm
modular_ss220/mod/code/mod_types.dm
Restricted ERT species selection to humans
  • Modified the ERT species selection prompt to only offer "Human" as a choice.
  • Removed other species options from the selection list.
modular_ss220/outfits/code/outfits.dm
code/modules/response_team/ert.dm
Added new MODsuit clothing and modules
  • Created new clothing items for MODsuits, including head, suit, gloves, and shoes, with exclusive icons and sprites.
  • Added new insignia modules for ERT roles with specific colors for each role: Commander (blue), Security (red), Engineer (yellow), Medic (white), Janitor (purple), Clown (pink), and Chaplain (orange).
modular_ss220/mod/code/mod_clothes.dm
modular_ss220/mod/code/mod_modules.dm
Added MODsuit control and types
  • Implemented functions for building different MODsuit parts (head, suit, gloves, shoes).
  • Added a check to prevent MODsuit deployment if the user's species is not allowed by the theme.
  • Added pre-equipped exclusive MODsuit types for corporate and ERT red with specific icons and overrides.
  • Added species restriction logic to MODsuit deployment to prevent unauthorized use by non-human species.
modular_ss220/mod/code/mod_control.dm
Updated modpack information
  • Added a new modpack entry for MODsuits with description and authors.
modular_ss220/mod/_mods.dm
Removed unused MOD clothing code
  • Deleted the file modular_ss220/clothing/code/mod.dm which contained unused code related to MOD clothing.
modular_ss220/clothing/code/mod.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.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a 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. You can also use
    this command to specify where the summary should be inserted.

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

modular_ss220/mod/code/mod_theme.dm Outdated Show resolved Hide resolved
modular_ss220/mod/code/mod_theme.dm Outdated Show resolved Hide resolved
modular_ss220/mod/code/mod_theme.dm Outdated Show resolved Hide resolved
modular_ss220/mod/code/mod_theme.dm Show resolved Hide resolved
modular_ss220/mod/code/mod_types.dm Outdated Show resolved Hide resolved
modular_ss220/mod/code/mod_types.dm Outdated Show resolved Hide resolved
modular_ss220/mod/code/mod_types.dm Outdated Show resolved Hide resolved
modular_ss220/outfits/code/outfits.dm Outdated Show resolved Hide resolved
Kar4es and others added 4 commits January 9, 2025 18:34
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Kar4es and others added 2 commits January 9, 2025 18:37
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
@Kar4es Kar4es requested a review from m-dzianishchyts January 9, 2025 11:50
Co-authored-by: Mikhail Dzianishchyts <[email protected]>
@m-dzianishchyts m-dzianishchyts changed the title [НЕ МЕРЖИТЬ] NEW: ERT MODsuits NEW: ERT MODsuits Jan 9, 2025
@m-dzianishchyts m-dzianishchyts merged commit 5d81aaf into ss220club:master Jan 9, 2025
11 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:feelsgood: Частичная модульность Не всегда получается всё впихнуть в модуль, увы. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден Stale Exempt PR не может быть устаревшим. Видать кто-то подкупил хэда.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants