Fixes #7619, APCs with no power will now not shock you #12884
Merged
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
ghost
mentioned this pull request
PJB3005
suggested changes
Dec 18, 2016
| @@ -603,7 +603,7 @@ | |||
| opened = 2 | |||
| user.visible_message("<span class='warning'>The APC cover was knocked down with the [W.name] by [user.name]!</span>", \ | |||
| "<span class='warning'>You knock down the APC cover with your [W.name]!</span>", \ | |||
| "You hear bang") | |||
| "You hear a loud bang.") //"you hear bang" is so bad I have to leave a comment to immortalize it | |||
| //We kinda do things our own way and don't really use NOPOWER or such, so we need different sanity | ||
| /obj/machinery/power/apc/shock(mob/user, prb, var/siemenspassed = -1) | ||
| if(shorted) | ||
| return |
There was a problem hiding this comment.
This should return FALSE explicitly.
| @@ -1337,4 +1337,12 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on) | |||
| return 1 | |||
| return 0 | |||
|
|
|||
| //We kinda do things our own way and don't really use NOPOWER or such, so we need different sanity | |||
| /obj/machinery/power/apc/shock(mob/user, prb, var/siemenspassed = -1) | |||
| if(shorted) | |||
There was a problem hiding this comment.
OK.
Why?
if(shorted || (!cell && !charging)) is immediately less readable.
PJB3005
approved these changes
Dec 18, 2016
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.
No description provided.