Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Service QoL Shortcuts #13029

Merged
merged 2 commits into from
Dec 23, 2016
Merged

Service QoL Shortcuts #13029

merged 2 commits into from
Dec 23, 2016

Conversation

Kurfursten
Copy link
Collaborator

  • Changed the shortcut to make the grinder grind from alt+click to ctrl+click. Eject remains alt+click. Fixes Separate Grinder Shortcuts #13021
  • You can now alt+click to change transfer amounts on any reagent dispenser (welding tank, water tank, pepper spray, etc.) that has alterante transfer amounts.
  • Granted the water cooler alternate transfer amounts as per a thread request.
  • Alt+click on the biogenerator to eject the contained produce. Ctrl+click to grind.
  • Alt+click on microwave changed to eject ingredients.
  • Ctrl+click on microwave to cook.
  • The microwave can now have reagent disposal disabled, so that ejecting will not waste any resources

Reminder: you can safely remove reagents from a microwave with a baster or dropper.

@PJB3005 PJB3005 added the ❤️ Quality of Life ❤️ This is a change that removes hassle and improves quality of life. label Dec 23, 2016
@Probe1 Probe1 added Content Adds something. Neat! UI Edits UI in some way. ❤️ Quality of Life ❤️ This is a change that removes hassle and improves quality of life. and removed ❤️ Quality of Life ❤️ This is a change that removes hassle and improves quality of life. labels Dec 23, 2016
@Probe1
Copy link
Member

Probe1 commented Dec 23, 2016

Interesting if we add tags at the exact same moment the second person to submit tags removes the previous ones.

@PJB3005
Copy link
Contributor

PJB3005 commented Dec 23, 2016

Reminder: you can safely remove reagents from a microwave with a baster or dropper.

WHY DID I NOT KNOW THIS.

@Probe1
Copy link
Member

Probe1 commented Dec 23, 2016

Oh ffs why do you use the changelog file get with the 🆑 times gramps.

@Probe1 Probe1 self-requested a review December 23, 2016 13:42
Probe1
Probe1 approved these changes Dec 23, 2016
View reviewed changes
Copy link
Member

@Probe1 Probe1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see no issues codewise or gameplay wise.

PJB3005
PJB3005 suggested changes Dec 23, 2016
View reviewed changes
code/game/machinery/biogenerator.dm
return ..()

/obj/machinery/biogenerator/CtrlClick(mob/user)
if(!user.incapacitated() && Adjacent(user) && beaker && user.dexterity_check())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the biogenerator has WRENCHMOVE, make this not pass if it's unbolted so you can still use control-click to pull it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a really good point

Honestly I feel like instead of making all these checks over and over we should at some point have some kind of high-level proc for 'user can use a machine' that makes the big three checks, then when machinery inherits it, add broken and power checks, etc.

code/game/machinery/kitchen/microwave.dm
@@ -431,19 +434,25 @@
ffuu.reagents.add_reagent(TOXIN, amount/10)
return ffuu

/obj/machinery/microwave/AltClick(mob/user)
/obj/machinery/microwave/CtrlClick(mob/user)
if(!user.incapacitated() && Adjacent(user) && user.dexterity_check())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, make this only pass if it's anchored.

code/modules/reagents/machinery/reagentgrinder.dm
return ..()

/obj/machinery/reagentgrinder/CtrlClick()
if(!usr.incapacitated() && Adjacent(usr) && usr.dexterity_check() && !inuse && holdingitems.len)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, anchored.

@9600bauds
Copy link
Contributor

This makes it so that you can't drag these machines at all

Which is why ctrl+click was only used for an item to begin with

Actually, can't we use mouse3?

@PJB3005
Copy link
Contributor

PJB3005 commented Dec 23, 2016

This makes it so that you can't drag these machines at all

Which I line commented and they'll probably fix.

Also, Mouse 3 is swap hands. Personally I'd like to see mouse 3 changed to point though.

@Probe1
Copy link
Member

Probe1 commented Dec 23, 2016

Lets cross one bridge at a time.

@Kurfursten
Copy link
Collaborator Author

@PJB3005 @9600bauds Yeah, there will be an exception made if unanchored. Give me a sec to get my commit together.

@Kurfursten
Copy link
Collaborator Author

100% tested including drag testing

@Probe1
Copy link
Member

Probe1 commented Dec 23, 2016

Local collaborator about to lose all faith in humanity after 100% tested turns out to be untrue

@Probe1 Probe1 merged commit 52cd899 into vgstation-coders:Bleeding-Edge Dec 23, 2016
@9600bauds
Copy link
Contributor

Update wiki please

@PJB3005 PJB3005 added the Update WIKI Update the wiki at some point please. label Dec 23, 2016
9600bauds
9600bauds reviewed Dec 23, 2016
View reviewed changes
code/modules/reagents/reagent_dispenser.dm
@@ -16,6 +16,12 @@
var/amount_per_transfer_from_this = 10
var/possible_transfer_amounts = list(10,25,50,100)

/obj/structure/reagent_dispensers/AltClick(mob/user)
if(user.Adjacent(get_turf(src)) && possible_transfer_amounts)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs incapacitated() or ghosts can fuck with this, honk

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TRUST ISSUES.

@Probe1 Probe1 mentioned this pull request Dec 23, 2016
Merged
@Kurfursten
Copy link
Collaborator Author

Wiki updated

@Probe1 Probe1 removed the Update WIKI Update the wiki at some point please. label Dec 23, 2016
@Probe1
Copy link
Member

Probe1 commented Dec 23, 2016

I need me a ❤️ label

@Intigracy
Copy link
Contributor

dere u go fag

ihadtoregisterforthis pushed a commit to ihadtoregisterforthis/fork4 that referenced this pull request Jul 3, 2017
@Kurfursten @ihadtoregisterforthis
Service QoL Shortcuts (vgstation-coders#13029)
f3baadd 
* Do microwaves dream of aluminum foil?

* drag exceptions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@9600bauds 9600bauds 9600bauds left review comments

@Probe1 Probe1 Probe1 approved these changes

@PJB3005 PJB3005 PJB3005 approved these changes

Assignees
No one assigned
Labels
Content Adds something. Neat! ❤️ Quality of Life ❤️ This is a change that removes hassle and improves quality of life. UI Edits UI in some way.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Kurfursten @Probe1 @PJB3005 @9600bauds @Intigracy