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

re:knifes #2933

Merged
merged 3 commits into from
May 15, 2024
Merged

re:knifes #2933

merged 3 commits into from
May 15, 2024

Conversation

rye-rice
Copy link
Member

About The Pull Request

Repsprites most knifes in the games, at least the ones that matter. Done on behalf of FleetingExpertise.

Why It's Good For The Game

image

Changelog

🆑 FleetingExpertise
add: Most knifes in the game have been resprited!
/:cl:

@rye-rice rye-rice requested a review from a team as a code owner April 24, 2024 21:23
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Apr 24, 2024
icon_state = "knife"
item_state = "knife"
icon = 'icons/obj/item/knife.dmi'
lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
lefthand_file = 'icons/mob/inhands/weapons/knives_lefthand.dmi'

oops?

@thgvr
Copy link
Member

thgvr commented May 5, 2024

w/e

@thgvr thgvr added this pull request to the merge queue May 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 5, 2024
@rye-rice
Copy link
Member Author

rye-rice commented May 6, 2024

Remember, no clue why checks failed

@thgvr thgvr added this pull request to the merge queue May 6, 2024
@thgvr
Copy link
Member

thgvr commented May 6, 2024

same reason CI fails on prs

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 6, 2024
@FalloutFalcon
Copy link
Member

" The plural form of ‘knife’ is ‘knives.’ "

@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch May 15, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 15, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 15, 2024
@rye-rice rye-rice enabled auto-merge May 15, 2024 20:57
@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
Merged via the queue into shiptest-ss13:master with commit 871c6fc May 15, 2024
14 checks passed
@rye-rice rye-rice deleted the resprite_knifes branch May 15, 2024 21:19
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request May 25, 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
Repsprites most knifes in the games, at least the ones that matter. Done
on behalf of FleetingExpertise.
## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/cc85332f-520c-4b21-96bf-9a248c3b321e)

## Changelog

:cl: FleetingExpertise
add: Most knifes in the game have  been resprited!
/:cl:
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.

3 participants