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

Combat mode oomph #276

Merged
merged 3 commits into from
Apr 12, 2024
Merged

Combat mode oomph #276

merged 3 commits into from
Apr 12, 2024

Conversation

Just-a-Unity-Dev
Copy link
Collaborator

@Just-a-Unity-Dev Just-a-Unity-Dev commented Apr 12, 2024

Closes #253

Adds a little more oomph to combat mode. Ports the /tg/ combat mode sound effect and adds a new cursor

Copy link
Contributor

github-actions bot commented Apr 12, 2024

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

Resources/Textures/_FTL/Interface/Misc/crosshair_pointers.rsi

State Old New Status
gun_bolt_sight Added
gun_sight Added
melee_sight Added
pointer Added

Edit: diff updated after 9e8a259

Copy link
Contributor

@Blackern5000 Blackern5000 left a comment

Choose a reason for hiding this comment

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

Please make a better sprite

@Just-a-Unity-Dev
Copy link
Collaborator Author

You cant just make a review telling me to use a "better sprite" when I refused to use yours lmfao

@Blackern5000
Copy link
Contributor

You cant just make a review telling me to use a "better sprite" when I refused to use yours lmfao

I'm not saying you have to use mine, I'm saying the one you have sucks and it needs a better one.

@Just-a-Unity-Dev
Copy link
Collaborator Author

You say this about every single sprite

@Blackern5000
Copy link
Contributor

You say this about every single sprite

Because the sprites you make are usually poorly done.

Copy link
Contributor

@Blackern5000 Blackern5000 left a comment

Choose a reason for hiding this comment

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

Please add an actual sprite for the gun bolt.

@Just-a-Unity-Dev Just-a-Unity-Dev merged commit 2d07d4f into across-the-veil Apr 12, 2024
9 checks passed
@Just-a-Unity-Dev Just-a-Unity-Dev deleted the v/combat_mode_oomph branch April 12, 2024 18:04
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.

Combat needs to look good
2 participants