Assay Psionic Power #1450
Open
Assay Psionic Power #1450
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
# Description **(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge conflicts for our downstream)** Cherry-picks some PRs from The Den: - TheDenSS14/TheDen#8 - TheDenSS14/TheDen#31 - TheDenSS14/TheDen#108 - TheDenSS14/TheDen#116 - TheDenSS14/TheDen#117 - TheDenSS14/TheDen#123 - TheDenSS14/TheDen#124 # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: The Den Contributors - fix: Put actual prescription lenses in the prescription medhuds and sechuds (by KyuPolaris) - add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by sleepyyapril, KyuPolaris) - add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by Rosycup) - fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup) - add: Added the Captain's Combat Gas Mask, for those more fond of close encounters. (by Rosycup) - tweak: Added the Captain's Trenchcoat to the other captain locker variants. (by Rosycup) - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview. (by Azzy) --------- Co-authored-by: flyingkarii <123355664+flyingkarii@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
This reverts commit cb3ca2a.
This reverts commit d02fc77.
github-actions
bot
added
Changes: C#
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Remuchi
approved these changes
Jan 7, 2025
Comment on lines
+3
to
+4
| namespace Content.Shared.Actions.Events; | ||
| public sealed partial class AssayPowerActionEvent : EntityTargetActionEvent |
There was a problem hiding this comment.
Suggested change
| namespace Content.Shared.Actions.Events; | |
| public sealed partial class AssayPowerActionEvent : EntityTargetActionEvent | |
| namespace Content.Shared.Actions.Events; | |
| public sealed partial class AssayPowerActionEvent : EntityTargetActionEvent |
| SubscribeLocalEvent<PsionicComponent, AssayDoAfterEvent>(OnDoAfter); | ||
| } | ||
|
|
||
| private void OnPowerUsed(EntityUid uid, PsionicComponent psionic, AssayPowerActionEvent args) |
There was a problem hiding this comment.
I'd appreciate it if you'd turn your events into Entity<T> events
Suggested change
| private void OnPowerUsed(EntityUid uid, PsionicComponent psionic, AssayPowerActionEvent args) | |
| private void OnPowerUsed(Entity<PsionicComponent> psionic, AssayPowerActionEvent args) |
Comment on lines
+69
to
+81
| var userAmp = MathF.Round(userPsionic.CurrentAmplification, 2).ToString("#.##"); | ||
| var userDamp = MathF.Round(userPsionic.CurrentDampening, 2).ToString("#.##"); | ||
| var userPotentia = MathF.Round(userPsionic.Potentia, 2).ToString("#.##"); | ||
| var assayBody = Loc.GetString("assay-body", ("entity", target), ("amplification", userAmp), ("dampening", userDamp), ("potentia", userPotentia)); | ||
| var userFeedback = $"[font size={args.FontSize}][color={args.FontColor}]{assayBody}[/color][/font]"; | ||
| SendDescToChat(userFeedback, session); | ||
|
|
||
| var assaySelf = Loc.GetString("assay-self", ("entity", target)); | ||
| _popups.PopupEntity(assaySelf, user, user, PopupType.LargeCaution); | ||
|
|
||
| var assaySelfFeedback = $"[font size={args.FontSize}][color={args.FontColor}]{assaySelf}[/color][/font]"; | ||
| SendDescToChat(assaySelfFeedback, session); | ||
| return; |
There was a problem hiding this comment.
For the pure sake of readability this block and block after it should be turned into two separate method like InspectSelf and InspectOther
Remuchi
added
Priority: 2-High
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.
Description
This PR adds a new psionic power to the game, called Assay. Assay is a more advanced information gathering tool that is available roundstart to the Mantis. It essentially acts as the first ingame method for characters to discover the underlying math behind Psionics, displaying to them the target's casting stats, potentia, and metapsionic feedback messages. These messages don't tell the caster directly which powers a target has, instead providing hints as to what those powers might be.
Media
Changelog
🆑