Fixed Multiple Amped Weapons Timers #500
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
Fixed multiple Amped Weapon uses not resetting the timer
ASpoonPlaysGames
approved these changes
Sep 16, 2022
uniboi
approved these changes
Nov 10, 2022
|
will merge once conflicts are solved |
* Upload cl_titan_cockpit.nut * Add eject string in script * Moved to client * index issue + removed else so always returns * Apply suggestions from code review Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> * Rest of the suggestions because github makes me want to cry * Commit suggestions from review GitHub really hates batching suggestions Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
|
|
|
I fixed this PR to do what I said it should do |
|
@BobTheBob9 merge conflicts have been resolved :> |
BobTheBob9
approved these changes
Jan 3, 2023
GeckoEidechse
pushed a commit
that referenced
this pull request
Jan 4, 2023
* Add files via upload * Delete _burnmeter.gnut * Add files via upload Fixed multiple Amped Weapon uses not resetting the timer * Add eject quotes (#527) * Upload cl_titan_cockpit.nut * Add eject string in script * Moved to client * index issue + removed else so always returns * Apply suggestions from code review Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> * Rest of the suggestions because github makes me want to cry * Commit suggestions from review GitHub really hates batching suggestions Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> * Add files via upload * Delete _burnmeter.gnut * Rename _burnmeter.gnut.txt to _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut * Update _burnmeter.gnut Co-authored-by: JMM889901 <41163714+JMM889901@users.noreply.github.com> Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
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.
Applies the missing signal from the code for the Amped Weapons timer.
(Using another amped weapons boost before the last one ends would make the effect end prematurely when the original timer ended, this PR fixes that)
(if I broke any other changes, whoops)