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

More wooden floors #1074

Merged
merged 6 commits into from
Feb 1, 2025
Merged

More wooden floors #1074

merged 6 commits into from
Feb 1, 2025

Conversation

AyIong
Copy link
Collaborator

@AyIong AyIong commented Jan 26, 2025

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

Порт того что я делал для пары - куча деревянных полов.
Я люблю дерево

Все полы можно скрафтить из дерева (как неожиданно)
Но некоторые стоят дороже - 5 досок вместо 1

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

Разнообразие

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

image
image

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

Yeppers

Changelog

🆑
add: Добавлена куча деревянных полов и возможность их скрафтить.
/:cl:

Summary by Sourcery

Add several new wooden floor types, including oak, birch, cherry, amaranth, ebonite, pink ivory, and guaiacum. These floors are craftable using wood, with some rarer variants requiring more resources.

New Features:

  • Added new craftable wooden floor types.

Tests:

  • Updated grayscale for wooden floors.

Copy link

sourcery-ai bot commented Jan 26, 2025

Reviewer's Guide by Sourcery

This pull request introduces a variety of craftable wooden floor tiles, including different wood types and styles like parquet and large tiles. It also ensures that these new floor types are properly rendered with decals.

Class diagram for wooden floor types and tiles

classDiagram
    class TurfOpenFloorWood {
      +color: string
      +icon_state: string
      +broken_states()
    }
    class ObjItemStackTileWood {
      +color: string
      +icon_state: string
      +name: string
      +singular_name: string
      +turf_type
      +merge_type
    }

    TurfOpenFloorWood <|-- WoodLarge
    TurfOpenFloorWood <|-- WoodParquet
    TurfOpenFloorWood <|-- WoodTile

    ObjItemStackTileWood <|-- WoodLargeTile
    ObjItemStackTileWood <|-- WoodParquetTile
    ObjItemStackTileWood <|-- WoodTileTile

    note for TurfOpenFloorWood "Base class for all wooden floors"
    note for ObjItemStackTileWood "Base class for all wooden floor tiles"
Loading

File-Level Changes

Change Details Files
Added new wooden floor tiles and their crafting recipes.
  • Added crafting recipes for various wooden floor types, including regular, large, parquet, and tiled parquet.
  • Implemented different wood types for each floor style, such as oak, birch, cherry, amaranth, ebonite, pink ivory, and guaiacum.
  • Defined new tile and turf types for each wooden floor variation.
  • Added a helper macro to generate subtypes for wooden floors.
  • Added new icons for the new floor types.
modular_bandastation/objects/_objects.dm
modular_bandastation/objects/code/floors/wooden.dm
Modified decal application to handle grayscale for wooden floors.
  • Added a check to apply grayscale to wooden floors when decals are applied.
code/datums/elements/decals/_decal.dm
Updated modpack authors.
  • Added 'Aylong' to the list of authors for the 'objects' modpack.
  • Removed 'larentoun' and added 'Aylong' to the list of authors for the 'aesthetics' modpack.
modular_bandastation/objects/_objects.dm
modular_bandastation/aesthetics/_aesthetics.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 26, 2025
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 26, 2025
Copy link

@PhantornRU PhantornRU left a comment

Choose a reason for hiding this comment

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

полыыыыыыыыыыы

@PhantornRU PhantornRU merged commit 62bf82c into ss220club:master Feb 1, 2025
24 checks passed
ss220app bot added a commit that referenced this pull request Feb 1, 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.

2 participants