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

Sledgehammer #69

Merged
merged 18 commits into from
Feb 28, 2023
Merged

Sledgehammer #69

merged 18 commits into from
Feb 28, 2023

Conversation

DjfjdfofdjfjD
Copy link

@DjfjdfofdjfjD DjfjdfofdjfjD commented Feb 24, 2023

About PR

Кувалда от Томского, перенёс всё как было, не уверен в том что работает
Changelog
🆑

  • add: Добавлена кувалда от Томского

@github-actions
Copy link

github-actions bot commented Feb 24, 2023

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

Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi

State Old New Status
icon Added
inhand_left Added
inhand_right Added
sledgehammer_weilded_inhand_left Added
sledgehammer_weilded_inhand_right Added

Edit: diff updated after babc34c

Copy link
Member

@AruMoon AruMoon left a comment

Choose a reason for hiding this comment

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

Расставь пробелы как положено для YAML

@DjfjdfofdjfjD
Copy link
Author

Расставь пробелы как положено для YAML

я удалил лишнее, поставил пробелы вроде как, но где-то не хватает всё равно

@ArmedMidas
Copy link

Пиздец

@AruMoon
Copy link
Member

AruMoon commented Feb 24, 2023

Расставь пробелы как положено для YAML

я удалил лишнее, поставил пробелы вроде как, но где-то не хватает всё равно

Ему icon текстуры не хватает

@AruMoon
Copy link
Member

AruMoon commented Feb 24, 2023

Потому что ты вообще не добавлял ему иконку

@AruMoon AruMoon mentioned this pull request Feb 28, 2023
1 task
@AruMoon AruMoon merged commit 14f96d2 into Workbench-Team:arumoon-server Feb 28, 2023
AruMoon pushed a commit that referenced this pull request Nov 2, 2023
This reverts commit 14f96d2.

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants