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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Combat Defib - Cell Change #14698
Merged
variableundefined
merged 3 commits into
ParadiseSS13:master
from
Kiyahitayika:Combat-Defib-Changes
Oct 27, 2020
Merged
Combat Defib - Cell Change #14698
variableundefined
merged 3 commits into
ParadiseSS13:master
from
Kiyahitayika:Combat-Defib-Changes
Oct 27, 2020
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
AffectedArc07
added
the
Balance
This PR will modify how effective something is or isnt
label
Oct 23, 2020
AffectedArc07
requested changes
Oct 23, 2020
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
marlyn-x86
reviewed
Oct 25, 2020
|
||
/obj/item/defibrillator/compact/combat/loaded/New() | ||
..() | ||
paddles = make_paddles() | ||
cell = new /obj/item/stock_parts/cell/infinite(src) | ||
cell = new(src) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to be the functional change in this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep! I'll document that better next time.
variableundefined
approved these changes
Oct 25, 2020
Approved for design |
Kyep
approved these changes
Oct 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What Does This PR Do
Exchanges the infinite cell in the Nukie Combat Defib with the regular cell that all defibs have (10k maxcharge)
Line 244:
cell = new /obj/item/stock_parts/cell/infinite(src)
to
cell = new(src)
I also went through and changed various 1/0 variables to TRUE/FALSE variables so AA wouldn't beat me.
Why It's Good For The Game
Slight nerf to Nukie Combat Defib - discussed in Discord.
Changelog
馃啈
tweak: The cell in the Nukie Combat Defib now has 1/3 the maximum charge.
/:cl: