[MIRROR] [MODULAR] Fixed hypospray wait times #866
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 hyposprays * Update hyposprays_II.dm removed blank spaces which weren't necessary for visibility * Update modular_skyrat/modules/hyposprays/code/hyposprays_II.dm Changes suggested by vinylspiders Co-authored-by: Bloop <[email protected]> --------- Co-authored-by: Bloop <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Nov 28, 2023
Iajret
pushed a commit
that referenced
this pull request
Feb 9, 2024
* Adds an IS_CHANGELING helper (#81228) ## About The Pull Request What it says on the tin. I also replaced checks with it everywhere I found appropriate, hopefully without accidentally breaking anything. ## Why It's Good For The Game We have a helper for most other antags, and it makes code a lot cleaner and easier to read. I'm surprised we didn't have this one already. ## Changelog :cl: code: added an IS_CHANGELING() helper and used it where applicable /:cl: * Adds an IS_CHANGELING helper --------- Co-authored-by: A miscellaneous Fern <[email protected]>
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.
Original PR: Skyrat-SS13/Skyrat-tg#25295
Fixed hypospray wait times so they actually used the constants other than "WAIT_INJECT" (and their counterparts based on variant). "WAIT_SPRAY", "DELUXE_WAIT_SPRAY" "SELF_SPRAY", and "DELUXE_SELF_SPRAY" are now used for hypos' spray functions, which not only makes the CMO's hypospray actually have an instant use option like it should, but also makes them more tweakable overall. "SELF_INJECT" is now also used for a hypo's inject function when used on yourself.
About The Pull Request
Added a new "selected_wait_time" variable in the afterattack method that is dynamically defined based on the hypospray's current use type and then used for the length of the doafter timer.
Why It's Good For The Game
I like hyposprays and just want them to be good. Also it annoys me.
Changelog
🆑 Ghasterino
fix: Made the hypospray actually use the "WAIT_" values for the respective mode it's using.
fix: Made the CMO hypospray actually instant, instead of seeming instant in code but not actually instant in game.
/:cl: