Add weapon checks to suicide by gun in mouth #353
Merged
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.
Putting your gun in your mouth and pulling the trigger killed you even if the gun's safety is still on. While comparing the suicide subroutine with the Fire subroutine, I found other checks that were also missing.
This is now changed to the following behavior:
First I check if the gun is not waterproof and the player is submerged. While in the Fire subroutine the gun will just not fire, I will show a message to the user, because it's stupid if you get a message with "...pulls the trigger" and then ... nothing. Tested in the cistern.
Then the special checks (Hulk, clumsy, ...), the same subroutine called in the Fire subroutine is called.
If the safety is on, the same reflex-unsafety-ing as in Fire is performed. If you are trained enough to do it by reflex, the same reflex should kick in when you do it ... to yourself.
I'm not sure why my syncs from original Vesta.Bay/dev to my own dev are shown here, even if without file changes. If I did something wrong, please tell me what. I'm still a Subversion main...