allow syringes to set transfer amount #12173
Conversation
github-actions
bot
added
the
S: Needs Review
| component.TransferAmount = FixedPoint2.New(amount); | ||
| args.User.PopupMessage(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount))); |
There was a problem hiding this comment.
Maybe make the delay change based on the amount transferred? Something like 1 second per 5u? Still faster than multiple injections, but gives the target a bit more time.
There was a problem hiding this comment.
Sounds good. Done.
| // Custom transfer verb | ||
| AlternativeVerb custom = new(); | ||
| custom.Text = Loc.GetString("comp-solution-transfer-verb-custom-amount"); | ||
| custom.Category = VerbCategory.SetTransferAmount; | ||
| custom.Act = () => component.UserInterface?.Open(actor.PlayerSession); | ||
| custom.Priority = 1; | ||
| args.Verbs.Add(custom); |
There was a problem hiding this comment.
In SS13, it only allows 5, 10, and 15 for syringes. No custom amounts. For smaller amounts, players would use a dropper for 1-5. Should that be replicated here or should it just all be done using syringes?
There was a problem hiding this comment.
Yeah I'll strip out the custom amount.
Update: Stripped.
| private void AddSetTransferVerbs(EntityUid uid, InjectorComponent component, GetVerbsEvent<AlternativeVerb> args) | ||
| { | ||
| if (!args.CanAccess || !args.CanInteract || args.Hands == null) | ||
| return; |
There was a problem hiding this comment.
This function is double-indented
| } | ||
|
|
||
|
|
||
| private static void OnInjectionCancelled(InjectionCancelledEvent ev) |
There was a problem hiding this comment.
Should just be one blank line here.
| @@ -64,5 +81,7 @@ public InjectorToggleMode ToggleState | |||
| Dirty(); | |||
| } | |||
| } | |||
|
|
|||
| [ViewVariables] public BoundUserInterface? UserInterface => Owner.GetUIOrNull(TransferAmountUiKey.Key); | |||
There was a problem hiding this comment.
Is this needed? Doesn't look like it's used.
There was a problem hiding this comment.
RIght. This was used in the custom transfer amount that was stripped out, thanks.
| { | ||
|
|
||
| /// <summary> | ||
| /// Default transfer amounts for the set-transfer verb. | ||
| /// </summary> | ||
| public static readonly List<int> DefaultTransferAmounts = new() { 5, 10, 15}; | ||
| private void InitializeInjector() |
There was a problem hiding this comment.
| { | |
| /// <summary> | |
| /// Default transfer amounts for the set-transfer verb. | |
| /// </summary> | |
| public static readonly List<int> DefaultTransferAmounts = new() { 5, 10, 15}; | |
| private void InitializeInjector() | |
| { | |
| /// <summary> | |
| /// Default transfer amounts for the set-transfer verb. | |
| /// </summary> | |
| public static readonly List<int> DefaultTransferAmounts = new() { 5, 10, 15}; | |
| private void InitializeInjector() |
Also maybe just call this TransferAmounts
There was a problem hiding this comment.
I don't see any difference in the suggested change diff. Updated the name as requested.
There was a problem hiding this comment.
Just whitespace. There should be a blank line before the first method.
| if (!args.CanAccess || !args.CanInteract || args.Hands == null) | ||
| return; | ||
|
|
||
| if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor)) |
There was a problem hiding this comment.
There's a TryGetComp proxy function you could use instead. It does the same it's just shorthand.
There was a problem hiding this comment.
Tho it looks like actor never gets used so it should probably be HasComp.
|
Looks good. Just so you know, in the future when you finish part of a review you can hit the Resolve conversation button to minimize it and let the reviewer know that you addressed that part of the review. |
About the PR
So I decided to try out playing as the sole chemist with only using syringes. Making the stuff was a breeze and was more engaging than the current pill meta (where you just scatter a massive amount of pills on the table for the public to use all willy-nilly). I was able to give out precise doses and was happy with the results.
The crew, on the other hand, were not happy. They wanted their pills and they wanted them badly, to the point of breaking into my lab making them themselves. I would ask them why they didn't want to bother with the syringes and the major pain point was the speed in administering the drugs. Crew are limited to only 15u per syringe and could only inject 5u per doafter.
Solution I've come up with is to allow syringes to have their solution transfer amount to be configurable just like any other container. It still defaults to 5u, but can be set to 10 or 15u as necessary. This in my opinion buffs syringes just enough to make them more palatable for crew to use.
Screenshots
Changelog
🆑