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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combat Defib - Cell Change #14698

Merged

Conversation

Kiyahitayika
Copy link
Contributor

@Kiyahitayika Kiyahitayika commented Oct 23, 2020

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:

@AffectedArc07 AffectedArc07 added the Balance This PR will modify how effective something is or isnt label Oct 23, 2020
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/defib.dm Outdated Show resolved Hide resolved
Kiyahitayika and others added 2 commits October 23, 2020 11:46
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

/obj/item/defibrillator/compact/combat/loaded/New()
..()
paddles = make_paddles()
cell = new /obj/item/stock_parts/cell/infinite(src)
cell = new(src)
Copy link
Member

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

Copy link
Contributor Author

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
Copy link
Contributor

Approved for design

@variableundefined variableundefined merged commit 26486a2 into ParadiseSS13:master Oct 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance This PR will modify how effective something is or isnt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants