-
Notifications
You must be signed in to change notification settings - Fork 68
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MIRROR] Thermal Pistol Rework Attempt Two: You Spin to Win (it uses the crank energy weapon mechanics) #2399
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
…the crank energy weapon mechanics) (#1433) * Thermal Pistol Rework Attempt Two: You Spin to Win (it uses the crank energy weapon mechanics) (#81819) ## About The Pull Request Thermal pistols now can be 'cranked' in order to reload them, similar to a smoothbore disabler. Each 'crank' recharges one shot out of 8 shots. And by crank, I mean you SPIN THE GUN. In order to spin guns, you need a holster. So, without a holster, you can't utilize this mechanic of the pistols. (Also they're more accurate while dual-wielded hoo haa) Thermal pistol crates are now slightly more expensive, at 2000 credits. (is this even a balancing point now that we have stocks?) ## Why It's Good For The Game People really liked what was going on in this [PR with the gun flipping resulting in a reload](tgstation/tgstation#76076). However, it was...maybe a little too strong. As a more middle ground approach, the gun crank component was a particularly helpful addition to the game that allows for things like...slow bullet-by-bullet reloading of even energy weapons. ## Changelog :cl: balance: Thermal pistols can now be 'cranked' to recharge shots. You must have a holster equipped in order to utilize this feature. Also, they have a tighter dual-wield cone. balance: Thermal pistol crates are now 2000 credits, up from 1400 credits. /:cl: * Thermal Pistol Rework Attempt Two: You Spin to Win (it uses the crank energy weapon mechanics) --------- Co-authored-by: necromanceranne <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Mar 14, 2024
Iajret
pushed a commit
that referenced
this pull request
May 9, 2024
…r decreasing reagent contents (#2399) * Fixes the stomach pump surgery not actually causing vomit nor decreasing reagent contents (#83110) ## About The Pull Request So while playing I had to get a bunch of unstable mutagen out of a corpse's stomach before reviving it, and thus I tried to stomach pump it. This, however, never decreased the amount in the stomach, nor did it actually create any vomit like it's supposed to. Looking into it, the issue seems to be with this line: https://github.com/tgstation/tgstation/blob/0c562fd74299f8ce92a81c0a932b8ec4862189af/code/modules/surgery/stomachpump.dm#L49 Which doesn't line up with the parameters `vomit(...)` takes: https://github.com/tgstation/tgstation/blob/0c562fd74299f8ce92a81c0a932b8ec4862189af/code/modules/mob/living/carbon/carbon.dm#L417 `vomit_type = FALSE` isn't very helpful. This mismatch seems to be due to the `vomit(...)` proc getting changed quite a while ago, but in the process forgetting to update stomach pump to use it. Based on what I found looking into this, I replaced it with the following: ```dm target_human.vomit((MOB_VOMIT_MESSAGE | MOB_VOMIT_STUN), lost_nutrition = 20, purge_ratio = 0.67) ``` Where we don't use `VOMIT_CATEGORY_DEFAULT` as that includes `MOB_VOMIT_HARM`, and we already have our own harm condition. This fixes our issue. Oh, we also fix a minor spelling issue, "brusing" to "bruising". ## Why It's Good For The Game Makes stomach pumping actually work. ## Changelog :cl: fix: The stomach pump surgery actually works again. spellcheck: "brusing" to "bruising" in the message you get when failing the stomach pump surgery. /:cl: * Fixes the stomach pump surgery not actually causing vomit nor decreasing reagent contents --------- Co-authored-by: _0Steven <[email protected]>
ReezeBL
pushed a commit
that referenced
this pull request
May 9, 2024
…r decreasing reagent contents (#2399) (#3247) * Fixes the stomach pump surgery not actually causing vomit nor decreasing reagent contents (#83110) ## About The Pull Request So while playing I had to get a bunch of unstable mutagen out of a corpse's stomach before reviving it, and thus I tried to stomach pump it. This, however, never decreased the amount in the stomach, nor did it actually create any vomit like it's supposed to. Looking into it, the issue seems to be with this line: https://github.com/tgstation/tgstation/blob/0c562fd74299f8ce92a81c0a932b8ec4862189af/code/modules/surgery/stomachpump.dm#L49 Which doesn't line up with the parameters `vomit(...)` takes: https://github.com/tgstation/tgstation/blob/0c562fd74299f8ce92a81c0a932b8ec4862189af/code/modules/mob/living/carbon/carbon.dm#L417 `vomit_type = FALSE` isn't very helpful. This mismatch seems to be due to the `vomit(...)` proc getting changed quite a while ago, but in the process forgetting to update stomach pump to use it. Based on what I found looking into this, I replaced it with the following: ```dm target_human.vomit((MOB_VOMIT_MESSAGE | MOB_VOMIT_STUN), lost_nutrition = 20, purge_ratio = 0.67) ``` Where we don't use `VOMIT_CATEGORY_DEFAULT` as that includes `MOB_VOMIT_HARM`, and we already have our own harm condition. This fixes our issue. Oh, we also fix a minor spelling issue, "brusing" to "bruising". ## Why It's Good For The Game Makes stomach pumping actually work. ## Changelog :cl: fix: The stomach pump surgery actually works again. spellcheck: "brusing" to "bruising" in the message you get when failing the stomach pump surgery. /:cl: * Fixes the stomach pump surgery not actually causing vomit nor decreasing reagent contents --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: _0Steven <[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.
Mirrored on Nova: NovaSector/NovaSector#1433
Original PR: tgstation/tgstation#81819
About The Pull Request
Thermal pistols now can be 'cranked' in order to reload them, similar to a smoothbore disabler. Each 'crank' recharges one shot out of 8 shots.
And by crank, I mean you SPIN THE GUN. In order to spin guns, you need a holster. So, without a holster, you can't utilize this mechanic of the pistols.
(Also they're more accurate while dual-wielded hoo haa)
Thermal pistol crates are now slightly more expensive, at 2000 credits. (is this even a balancing point now that we have stocks?)
Why It's Good For The Game
People really liked what was going on in this PR with the gun flipping resulting in a reload. However, it was...maybe a little too strong.
As a more middle ground approach, the gun crank component was a particularly helpful addition to the game that allows for things like...slow bullet-by-bullet reloading of even energy weapons.
Changelog
🆑 necromanceranne
balance: Thermal pistols can now be 'cranked' to recharge shots. You must have a holster equipped in order to utilize this feature. Also, they have a tighter dual-wield cone.
balance: Thermal pistol crates are now 2000 credits, up from 1400 credits.
/:cl: