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

Resprites the leather jacket to be more stylish #2710

Merged
merged 7 commits into from
Feb 13, 2024

Conversation

Spefo
Copy link
Contributor

@Spefo Spefo commented Feb 8, 2024

About The Pull Request

This is my first ever sprite and pr. Adds a new stylish leather jacket! That replaces the old one. The old one has been renamed to "Faux Leather Jacket"
jacke

Why It's Good For The Game

The new leather jacket looks more leathery, plus leather jackets are awesome

Changelog

🆑
add: Resprited the leather jacket to be more stylish
/🆑

@Spefo Spefo requested a review from a team as a code owner February 8, 2024 06:58
@github-actions github-actions bot added Config Watch us shake head admins violently until this gets merged. Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Feb 8, 2024
@github-actions github-actions bot removed the Config Watch us shake head admins violently until this gets merged. label Feb 8, 2024
name = "leather jacket"
desc = "Pompadour not included."
icon_state = "leatherjacket"
name = "faux leather jacket"
Copy link
Member

Choose a reason for hiding this comment

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

Don't keep the old one - just replace it's sprite with the new.

path = /obj/item/clothing/suit/jacket/leather

/datum/gear/suit/jacket/leather/authentic
display_name = "leather jacket"
path = /obj/item/clothing/suit/jacket/leather/authentic
Copy link
Member

Choose a reason for hiding this comment

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

Remember to not use spaces instead of tabs for your indentation.

desc = "This makes you feel like the coolest guy in town."
icon_state = "leatherjacket"
item_state = "leatherjacket"

Copy link
Member

Choose a reason for hiding this comment

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

Only one new line necessary at end of file.

Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 11, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 13, 2024
@thgvr thgvr changed the title Added a new stylish leather jacket Resprites the leather jacket to be more stylish Feb 13, 2024
@thgvr thgvr added this pull request to the merge queue Feb 13, 2024
Merged via the queue into shiptest-ss13:master with commit 073db74 Feb 13, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 13, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This is my first ever sprite and pr. Adds a new stylish leather jacket!
That replaces the old one. The old one has been renamed to "Faux Leather
Jacket"

![jacke](https://github.com/shiptest-ss13/Shiptest/assets/28844475/1a55d2b9-fc22-4cea-bfc6-a807cdda037c)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
The new leather jacket looks more leathery, plus leather jackets are
awesome
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog
🆑 
add: added a new, more faithful leather jacket to the game. Now
available in loadouts!
tweak: renamed the old leather jacket to "faux leather jacket," to
better reflect its sprite
/🆑

---------

Co-authored-by: Spefoe <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants