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 clothing - Carnival #942

Merged
merged 19 commits into from
Jan 18, 2025
Merged

Conversation

m-dzianishchyts
Copy link

@m-dzianishchyts m-dzianishchyts commented Dec 29, 2024

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

Добавляет пачку одежды за авторством @Fridh3lm, @EdinoroGNK, Sirstaniya.

  • Добавить спрайты.
  • Названия и описания.
  • Засунуть в вендор то, что там должно быть.
  • Навалить цветовых сочетаний.
  • Обновить obj спрайты масок.

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

Одежда круто!

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

Spoiler

image

image

image

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

Нашел предметы, надел, походил.

Changelog

🆑 Fredhelm, Edinorog, Sirstaniya, Maxiemar
add: Добавлены новогодние свитер, плащ и гирлянды (в качестве накидки и шарфа). Доступно в Autodrobe (other).
add: Добавлены костюмы, платья и карнавальные маски. Доступно в Autodrobe (fancy) в любом цвете.
add: Добавлены образы Силко, Мэл Медарды и Кима Кицураги.
/:cl:

Summary by Sourcery

Add new holiday and carnival clothing items, including sweaters, cloaks, garlands, masks, suits, and dresses. Also add character outfits for Silko, Mel Medarda, and Kim Kitsuragi.

New Features:

  • Add new holiday clothing: New Year sweater, cloak, and garlands (worn as a neck item or suit).
  • Add new carnival clothing: formal suits, jacket suits, fancy dresses, corset dresses, and various carnival masks.
  • Add new character outfits: Silko, Mel Medarda, and Kim Kitsuragi.

@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Dec 29, 2024
@Furrior
Copy link
Collaborator

Furrior commented Dec 29, 2024

@sourcery-ai review

Copy link

sourcery-ai bot commented Dec 29, 2024

Reviewer's Guide by Sourcery

This pull request adds new holiday and carnival clothing items to the game. It also adds outfits for three characters: Silko, Mel Medarda, and Kim Kitsuragi.

Class diagram for new carnival clothing items

classDiagram
    class CarnivalMask {
      +name: string
      +icon: string
      +worn_icon: string
      +flags_inv: int
    }
    class CarnivalSuit {
      +name: string
      +icon: string
      +worn_icon: string
    }
    class CarnivalUnder {
      +icon: string
      +worn_icon: string
    }

    CarnivalMask <|-- FeatherMask
    CarnivalMask <|-- HalfMask
    CarnivalMask <|-- TrianglesMask
    CarnivalMask <|-- ColoredMask

    class FeatherMask {
      +name: "Jester mask"
      +greyscale_config
      +flags_cover
    }

    CarnivalUnder <|-- FormalSuit
    CarnivalUnder <|-- JacketSuit
    CarnivalUnder <|-- DressCorset
    CarnivalUnder <|-- DressFancy

    CarnivalSuit <|-- IndustrialistCoat
    CarnivalSuit <|-- KitsuragiJacket

    note for CarnivalMask "Base class for all carnival masks"
    note for CarnivalSuit "Base class for carnival outerwear"
    note for CarnivalUnder "Base class for carnival clothing"
Loading

Class diagram for holiday clothing items

classDiagram
    class HolidayClothing {
      +name: string
      +desc: string
      +icon: string
      +worn_icon: string
    }

    HolidayClothing <|-- NewYearSweater
    HolidayClothing <|-- NewYearCloak
    HolidayClothing <|-- Garland

    class Garland {
      +light_range: int
      +light_power: float
      +light_system: int
      +color: string
    }

    note for HolidayClothing "Base class for holiday-themed items"
    note for Garland "Can be worn as neck item or suit"
Loading

File-Level Changes

Change Details Files
Added new holiday clothing items.
  • New Year's sweater
  • New Year's cloak
  • Garland (worn as neck item or suit)
modular_bandastation/objects/_objects.dm
modular_bandastation/objects/_objects.dme
modular_bandastation/objects/code/items/clothing/suits/holiday.dm
modular_bandastation/objects/code/items/clothing/neck/holiday.dm
modular_bandastation/translations/code/translation_data/ru_names.toml
Added new carnival clothing items.
  • Formal suits
  • Jacket suits
  • Fancy dresses
  • Corset dresses
  • Jester mask
  • Colombina mask
  • Harlequin mask
  • Volto mask
modular_bandastation/objects/_objects.dm
modular_bandastation/objects/_objects.dme
modular_bandastation/objects/code/items/clothing/under/carnival.dm
modular_bandastation/objects/code/items/clothing/masks/carnival.dm
modular_bandastation/objects/code/greyscale/config_types/greyscale_clothes.dm
modular_bandastation/translations/code/translation_data/ru_names.toml
code/datums/greyscale/json_configs/bandastation/mask_carnival_colored.json
code/datums/greyscale/json_configs/bandastation/mask_carnival_feather.json
code/datums/greyscale/json_configs/bandastation/mask_carnival_half.json
code/datums/greyscale/json_configs/bandastation/mask_carnival_triangles.json
code/datums/greyscale/json_configs/bandastation/under_carnival_dress_corset.json
code/datums/greyscale/json_configs/bandastation/under_carnival_dress_fancy.json
code/datums/greyscale/json_configs/bandastation/under_carnival_formal.json
code/datums/greyscale/json_configs/bandastation/under_carnival_jacket.json
Added new character outfits.
  • Silko's outfit (Industrialist's suit and coat)
  • Mel Medarda's outfit (Wolf's dress)
  • Kim Kitsuragi's outfit (suit and jacket)
modular_bandastation/objects/code/items/clothing/suits/carnival.dm
modular_bandastation/objects/code/items/clothing/under/carnival.dm
modular_bandastation/translations/code/translation_data/ru_names.toml

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

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @m-dzianishchyts - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Several TODO comments and empty greyscale configuration files need to be addressed before this can be merged. Please complete the icon file updates and configurations.
  • The PR adds new items but doesn't specify which vending machine they'll be available in. Please implement the vending machine access for these items.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@m-dzianishchyts m-dzianishchyts marked this pull request as ready for review December 30, 2024 15:09
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @m-dzianishchyts - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

github-actions bot commented Jan 7, 2025

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Jan 7, 2025
@dj-34 dj-34 added 💩 Stale Кажется всем похуй на этот ПР. Жизнь сурова... and removed Stale labels Jan 12, 2025
@github-actions github-actions bot removed the 💩 Stale Кажется всем похуй на этот ПР. Жизнь сурова... label Jan 16, 2025
@PhantornRU PhantornRU changed the title Event clothing New clothing - Carnival Jan 18, 2025
@PhantornRU PhantornRU merged commit bedcfe5 into ss220club:master Jan 18, 2025
23 of 26 checks passed
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 18, 2025
ss220app bot added a commit that referenced this pull request Jan 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден Этот чейнджлог будет успешно опубликован
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants