[MIRROR] Making the fuck you coupon trigger only once, take two #2392
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
* Making the fuck you coupon trigger only once, take two (#81953) ## About The Pull Request So a previous pr attempted to fix the fuck you coupon, by adding 1 to the arguments. ```dm (tgstation/code/modules/cargo/coupon.dm, line 87) cursed.AddComponent(/datum/component/omen, 1) ``` But this was setting the `vessel` rather than the `incidents_left` argument to 1. ```dm (tgstation/code/datums/components/omen.dm, line 20) /datum/component/omen/Initialize(obj/vessel, incidents_left, luck_mod, damage_mod) ``` Moving this argument over one fixes the issue. ```dm cursed.AddComponent(/datum/component/omen, null, 1) ``` However! We're now skipping over the `vessel` value, which is used to burn up a curse's vessel once the curse is expended. Setting this to `src` rather than `null` means the fuck you coupon actually gets 'expended', which I think it better than just using `null` or `incidents_left = 1`. The coupon's useless once it's done, and this way it's cooler anyway. For consistency, we then also add this behaviour to when the coupon gives you a heart attack instead. Then! I noticed there was a _second_ bug with fuck you coupons, where it would stop prematurely if the location wasn't a mob. ```dm (tgstation/code/modules/cargo/coupon.dm, line 80-81) if(!ismob(loc)) return FALSE ``` However, this also happens when you don't have a free hand for it to put the coupon in, and thus entirely negating the curse and just giving you a useless fuck you coupon. We fix this by just adding a `user` argument to `generate`, which it prefers to use when available, and is set to the user ripping off the coupon in the first place. ## Why It's Good For The Game Fixes #81946. As fuck you coupons are pretty much useless after expending their curse, and we have to add the vessel value anyway, I thought it'd be more fitting to add the coupon as the vessel rather than just putting in null. Then, for consistency, I felt it'd be best to make them *also* burn when giving you a heart attack when you already have a curse. Y'know, it's expending the coupon for it's one-time fuck you! Also fixes fuck you coupons not actually applying their curse if you didn't have any free hands for it to put the coupon in when ripping it off. ## Changelog :cl: fix: Fuck you coupons ACTUALLY trigger only once again. As a consequence, they also burn up when expended for their one-time fuck you. fix: Fuck you coupons work regardless of whether you had a free hand or not. /:cl: * Making the fuck you coupon trigger only once, take two --------- Co-authored-by: _0Steven <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Mar 14, 2024
Iajret
pushed a commit
that referenced
this pull request
May 8, 2024
* Quick equip no longer throws balloon alerts (#83117) ## About The Pull Request Pressing E to quick equip would throw balloon alerts when it iterates over storage that's full Especially noticeable on round start engies because their toolbelt gets checked ## Why It's Good For The Game Less noise ## Changelog :cl: fix: The quick equip 'E' hotkey shouldn't warn if one of your bags is full anymore /:cl: * Quick equip no longer throws balloon alerts --------- Co-authored-by: Jeremiah <[email protected]>
ReezeBL
pushed a commit
that referenced
this pull request
May 9, 2024
* Quick equip no longer throws balloon alerts (#83117) ## About The Pull Request Pressing E to quick equip would throw balloon alerts when it iterates over storage that's full Especially noticeable on round start engies because their toolbelt gets checked ## Why It's Good For The Game Less noise ## Changelog :cl: fix: The quick equip 'E' hotkey shouldn't warn if one of your bags is full anymore /:cl: * Quick equip no longer throws balloon alerts --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: Jeremiah <[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#1422
Original PR: tgstation/tgstation#81953
About The Pull Request
So a previous pr attempted to fix the fuck you coupon, by adding 1 to the arguments.
But this was setting the
vesselrather than theincidents_leftargument to 1.Moving this argument over one fixes the issue.
However! We're now skipping over the
vesselvalue, which is used to burn up a curse's vessel once the curse is expended.Setting this to
srcrather thannullmeans the fuck you coupon actually gets 'expended', which I think it better than just usingnullorincidents_left = 1. The coupon's useless once it's done, and this way it's cooler anyway.For consistency, we then also add this behaviour to when the coupon gives you a heart attack instead.
Then! I noticed there was a second bug with fuck you coupons, where it would stop prematurely if the location wasn't a mob.
However, this also happens when you don't have a free hand for it to put the coupon in, and thus entirely negating the curse and just giving you a useless fuck you coupon.
We fix this by just adding a
userargument togenerate, which it prefers to use when available, and is set to the user ripping off the coupon in the first place.Why It's Good For The Game
Fixes #81946.
As fuck you coupons are pretty much useless after expending their curse, and we have to add the vessel value anyway, I thought it'd be more fitting to add the coupon as the vessel rather than just putting in null. Then, for consistency, I felt it'd be best to make them also burn when giving you a heart attack when you already have a curse.
Y'know, it's expending the coupon for it's one-time fuck you!
Also fixes fuck you coupons not actually applying their curse if you didn't have any free hands for it to put the coupon in when ripping it off.
Changelog
🆑 00-Steven
fix: Fuck you coupons ACTUALLY trigger only once again. As a consequence, they also burn up when expended for their one-time fuck you.
fix: Fuck you coupons work regardless of whether you had a free hand or not.
/:cl: