-
-
Notifications
You must be signed in to change notification settings - Fork 693
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
Adds combat info, examine flag shorthands. Fixes suicide with guns, fix armor comparisons not working #12480
Open
Tsar-Salat
wants to merge
14
commits into
BeeStation:master
Choose a base branch
from
Tsar-Salat:combatinfo
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
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
Feature
Fix
Merge Conflict
TGUI-Changes
Contains changes to TGUI. Make sure its up to date with TGUI 4.0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This adds combat labels, which show the particular strength of an item when wielded. Item flags have been consolidated into shorthands.
closes #12086
Additionally, I fixed suicide with guns not working, due to a bug in #9845 , and fixed armor comparisions due to a regression in #11742
Ports:
Why It's Good For The Game
These are useful to go along with armor tags, and make it much more accessible for new players to check stats on weapons.
Testing Photographs and Procedure
Screenshots&Videos
dreamseeker_2D7gmmTWRP.mp4
Changelog
🆑 rkz, Ryll/Shaps, SpaceDragon00, TJatPBnJ, EOBGames, GPeckman, LemonInTheDark, SmArtKar, Hatterhat
add: Combat Information tag for weapons. Shows how many hits or bullets a weapon will take to crit
fix: fixes armor comparisions
fix: fixes suicides with guns
add: adds shorthands for item flags
add: adds variable on guns to modify bullet power. No weapon has anything except the normal value of 1, this just makes sure if people modify the integrity of guns or the like in the future, they go through this code which is accounted for in the combat tags display
add: pressure/cold/heat-proof clothing now has appropriate display in armor tag examine block
/:cl: