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

[FIX] Clothes not showing in vendors roundstart #1754

Merged
merged 2 commits into from
Jan 20, 2025

Conversation

rainnspace
Copy link

@rainnspace rainnspace commented Jan 20, 2025

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

Исправляет отображение одежды младшего персонала, равно как и набора метрокопа, в автоматах одежды департаментов.

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

Трекер, но ситуация была характерна не только для набора метрокопа, но и для всех вещей младшего персонала.

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

Скомпилировал локально, проверил отображение в автоматах.

Changelog

🆑 Furgar
fix: Исправлено отображение одежды младшего персонала и набора метрокопа в вендорах отделов.
/:cl:

Summary by Sourcery

Bug Fixes:

  • Fixed missing junior staff clothing and metrocop gear in department vending machines.

Copy link

sourcery-ai bot commented Jan 20, 2025

Reviewer's Guide by Sourcery

The pull request fixes an issue where certain clothing items, specifically those for junior staff and the metro cop set, were not appearing in department vending machines. This was achieved by ensuring that the parent class's initialization logic is called after the vending machine's product list is populated.

Sequence diagram for vending machine initialization

sequenceDiagram
    participant VM as Vending Machine
    participant Parent as Parent Class
    Note over VM: Old initialization flow
    VM->>Parent: Initialize()
    Parent-->>VM: Return
    VM->>VM: Add products
    Note over VM: New initialization flow
    VM->>VM: Add products
    VM->>Parent: Initialize()
    Parent-->>VM: Return
Loading

Class diagram for vending machine hierarchy

classDiagram
    class VendingMachine {
        +Initialize(mapload)
    }
    class MediDrobe {
        +Initialize(mapload)
        +products
    }
    class SecDrobe {
        +Initialize(mapload)
        +products
    }
    class SciDrobe {
        +Initialize(mapload)
        +products
    }
    class EngiDrobe {
        +Initialize(mapload)
        +products
    }
    VendingMachine <|-- MediDrobe
    VendingMachine <|-- SecDrobe
    VendingMachine <|-- SciDrobe
    VendingMachine <|-- EngiDrobe
    note for VendingMachine "Parent initialization must occur after product list modification"
Loading

File-Level Changes

Change Details Files
Moved the parent class initialization call to the end of the Initialize method in vending machine objects.
  • In /obj/machinery/economy/vending/medidrobe, the line '. = ..()' was moved from the beginning to the end of the Initialize method.
  • In /obj/machinery/economy/vending/secdrobe, the line '. = ..()' was moved from the beginning to the end of the Initialize method.
  • In /obj/machinery/economy/vending/scidrobe, the line '. = ..()' was moved from the beginning to the end of the Initialize method.
  • In /obj/machinery/economy/vending/engidrobe, the line '. = ..()' was moved from the beginning to the end of the Initialize method.
modular_ss220/jobs/code/objects/wardrobe_vendors.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

@github-actions github-actions bot added the 🔧 Фикс Переписываем ошибку так, чтобы она проявлялась в других обстоятельствах label Jan 20, 2025
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 20, 2025
@rainnspace
Copy link
Author

Что стоит отметить:
Ввиду того, что автор этого ПР до конца не разобрался, что он хочет от /obj/item/clothing/head/helmet/cop/v2 и даже не дал ему имени, на текущий момент во взломанном SecDrobe будет подобная ошибка отображения.
2025-01-20_14-09-58

@AyIong
Copy link
Collaborator

AyIong commented Jan 20, 2025

Что стоит отметить: Ввиду того, что автор этого ПР до конца не разобрался, что он хочет от /obj/item/clothing/head/helmet/cop/v2 и даже не дал ему имени, на текущий момент во взломанном SecDrobe будет подобная ошибка отображения. 2025-01-20_14-09-58

Вроде это просто реколор. У одного светятся глаза, у другого нет

@AyIong AyIong merged commit 3dc32e4 into ss220club:master Jan 20, 2025
19 checks passed
@rainnspace rainnspace deleted the fix-wardrobe_vendors branch January 20, 2025 11:58
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.

2 participants