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

First Pack - New "in_hands" icon sprites for objects, small changes and fixes #6951

Draft
wants to merge 19 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. Each pack of this series will contain 10 unique new icons (without counting the variations for each item, such as the different camos that depend on the map being played). Below, there's a full list of the icons that this pack adds to the game:

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)

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 ten new and updated "in_hands" icon sprites, with the list being: Clipboard, binoculars (All camos), mortar Shells (All types), space cleaner spray, plant B gone spray, plastic stack, anesthetic and OT canister tanks, flashlight, lantern and mortar (All camos). Fixes two boinked pred "in_hands" icons on the left hand.
/: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.

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 Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants