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

New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes #6951

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

Conversation

LC4492
Copy link
Contributor

@LC4492 LC4492 commented Aug 15, 2024

About the pull request

This series of PRs is oriented on adding and updating "in_hands" icon sprites that you can find in-game. This pack does not have an specified number of in_hands and, as so, have now quite a good chunk of them .

Down below, you will be able to read some of the in_hands that this pack currently have:

Clipboard
Binoculars (All camos)
Mortar Shells (All types)
Space Cleaner Spray
Plant B Gone Spray
Plastic stack
Anesthetic and OT canister tanks
Flashlight
Lantern
Mortar (All camos)

The "on_mob" Radio Telephone Pack versions have been updated to look better and to have a "ring" version, so the telephone will not disappear when someone is calling you. Also added an updated version of the chef's hat and to the fireaxe when kept in the back (now it does look better).

This PR also ports Amory's new books, folders and notepads, of which also have their in_hands added by this PR aswell.

Explain why it's good for the game

Do I really need to fill this one?

Testing Photographs and Procedure

Screenshots & Videos

image

image

image

image

image

image

image

image

Changelog

🆑
spellcheck: Fixed typos in the "items" file, where on the proc to "zoom", the text had an extra "the" that resulted in a wrong display on chat.
code: Changed the combat flashlight's light range to 6 tiles instead of the normal 5, to make it actually a little better than a normal flashlight. Added a yellowish light color to the lantern (which can be found in colonies), to make it more unique.
imageadd: Added new and updated "in_hands" icon sprites, with the list being, but not limited to: Clipboard, binoculars (All camos), mortar Shells (All types), space cleaner spray, plant B gone spray, plastic stack, anesthetic and OT canister tanks, flashlight, lantern, mortar (All camos) and more.
/:cl:

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 15, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Code Improvement Make the code longer labels Aug 15, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 15, 2024
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

some unneeded changes from another pr, as well some sprites mistakes, elaborated in discord

@Blundir Blundir marked this pull request as draft August 19, 2024 11:03
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 8, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@LC4492 LC4492 changed the title First Pack - New "in_hands" icon sprites for objects, small changes and fixes First Pack - New "in_hands" and "onmob" icon sprites for objects, small changes and fixes Oct 19, 2024
@LC4492 LC4492 requested a review from Blundir October 19, 2024 20:01
@LC4492 LC4492 marked this pull request as ready for review October 19, 2024 20:03
@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented Oct 27, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@cmss13-ci cmss13-ci bot added the Stale beg a maintainer to review your PR label Oct 27, 2024
@Blundir Blundir added Stale Exempt PR can't go stale Sprites Approved confirmed no stray pixels Sprites Frozen Merge this and you will make the spritetainers angry. and removed Stale beg a maintainer to review your PR Sprites Approved confirmed no stray pixels labels Oct 27, 2024
@LC4492 LC4492 changed the title First Pack - New "in_hands" and "onmob" icon sprites for objects, small changes and fixes New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Oct 28, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 7, 2024
@cm13-github
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
Labels
Code Improvement Make the code longer Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Merge Conflict PR can't be merged because it touched too much code Sprites Frozen Merge this and you will make the spritetainers angry. Sprites Remove the soul from the game. Stale Exempt PR can't go stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants