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.

Sign up for GitHub

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

Jump to bottom

[Feature] Body Types #180

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

[Feature] Body Types #180

wants to merge 9 commits into from

Conversation

Spatison
Copy link
Member

@Spatison Spatison commented Dec 21, 2024 •
edited
Loading

Описание PR

У людей теперь можно выбрать различное телосложения:

  1. Нормальное
  2. Худощавое

Изменения

🆑 Spatison

  • add: Добавлены различные типы телосложения у людей

@Spatison Spatison self-assigned this Dec 21, 2024
@Spatison Spatison requested a review from Remuchi December 21, 2024 21:40
@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 21, 2024 •
edited
Loading

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

73 files out of 155 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 21, 2024 •
edited
Loading

RSI Diff Bot; head commit f2e14ce merging into 13a6983
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi

State Old New Status
icon Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi

State Old New Status
icon Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/general.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/security.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added
open-equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi

State Old New Status
equipped-OUTERCLOTHING-body-slim Added

Edit: diff updated after f2e14ce

@PuroSlavKing
Copy link
Member

PuroSlavKing commented Dec 21, 2024 •
edited
Loading

no way, опять это ломающее всё гавно
Нужна displacements карта, уникальные спрайты нужны только если карта не справляется по качеству смещения

@Remuchi
Copy link
Collaborator

Remuchi commented Dec 22, 2024

без дисплейсмент карт не буду принимать. Эта хуйня постоянно только что-то ломала и не вносила никакой пользы за исключением ровно 1 человека, который с этим играл. Ебаться со спрайтами для этого без дисплейсмент карт - харам.

@Spatison
Copy link
Member Author

Как рисовать дисплейсменты?

@PuroSlavKing
Copy link
Member

Как рисовать дисплейсменты?

Вопрос хороший, хуй знает, я так и не разобрался.

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Remuchi Remuchi Awaiting requested review from Remuchi

At least 1 approving review is required to merge this pull request.

Assignees

@Spatison Spatison

Labels
Changes: C# Changes: Localization Changes: Sprite Changes: UI Changes: YML Status: Merge Conflict Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Spatison @PuroSlavKing @Remuchi