Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@SapphicOverload
Copy link
Contributor

@SapphicOverload SapphicOverload commented Apr 16, 2024

Document the changes in your pull request

This removes intents and replaces them with combat mode and alternate right-click action. Default keybinds are 4 to enable combat mode and 1 to disable, same as previous harm/help intents.

Major changes:

  • Removes disarm and grab intent, help/harm intents are now combat mode off/on
  • Right-click menu moved to shift + right-click
  • Right click is now disarm, grabbing is still ctrl-click, both are possible with or without combat mode enabled
  • Default movement lock key is now alt, to allow grabbing while moving (this does not change existing save files)
  • Some martial arts have been reworked, in-game instructions have been updated to reflect changes

Interaction changes:

  • Right click to deconstruct tables/racks/walls/etc, and to open the wire panel of autolathes
  • Right click to harm when using a baton or bo staff
  • Right click to unlock APCs and air alarms, alt-click to discharge energy into them as an ethereal or recharge as a preternis.
  • Right click to malpractice surgery
  • Right click to hold people at gunpoint
  • Right click to use PDA while in ID slot
  • Right click to open a storage item (on top of alt click)
  • Right click to fire kinetic crusher projectile, left click can now cleave attack with combat mode on
  • Right click to toggle pumps and other atmospherics machines

Plus more that I likely forgot about. In general if something used to be done with disarm or grab intent, it's probably done with right-click or ctrl-click now.

Original PR here: tgstation/tgstation#56601

Why is this good for the game?

After having been on other servers that use the combat mode system, it's difficult to go back to using intents because of how clunky and unintuitive they feel compared to it.

To anyone who's already used to it and don't know anything else, intents might seem intuitive on the surface in a "what do you want to do with your click" sort of way, but this goes out the window when clicking on anything that isn't another player where "disarm" and "grab" don't make much sense, like when deconstructing a table.

As the original PR puts it:

"Intents heavily cripple both the code and the UI design of interactions. While I understand that a lot of people will dislike this PR as they are used to intents, they are one of our weakest links in terms of explaining to players how to do specific things, and require a lot more keypresses to do compared to this.

As an example, martial arts can now be done without having to juggle 1 2 3 and 4 to switch intents quickly.

The full intention of this shift in control scheme is that right click will become 'secondary interaction' for items, which prevents some of the awkward juggling we have now with item modes etcetera."

Testing

It's like 300+ files changed, no way I can test every single thing I've touched, but everything I've tested so far does work.

Buster arm demonstration:

buster_arm_vs_lizar.mp4

Spriting

image

image

image

image

image

image

image

image

image

Changelog

🆑 Qustinnus, SapphicOverload, Molti
experimental: Replaced intents with combat mode
imageadd: Adds combat mode buttons to the UI, replacing intents
bugfix: Fixes some of the martial arts not working sometimes
/:cl:

@SapphicOverload SapphicOverload requested review from a team and Bibby0110 as code owners April 16, 2024 04:12
@Yogbot-13 Yogbot-13 added the Fix This fixes an issue. Please link issues in fix PRs label Apr 16, 2024
Yogbot-13 added a commit that referenced this pull request Apr 16, 2024
@Moltijoe Moltijoe added Test Merge - Scheduled This PR is waiting to be test merged Test Merge - Requested This PR is waiting for a test merge to be scheduled TESTMERGED This PR is currently live in a test merge. Feature This adds new content to the game labels Apr 16, 2024
@warface1234455
Copy link
Contributor

combat off icon button is invisible

@Addust
Copy link
Contributor

Addust commented Apr 16, 2024

i am neutral on this, but PLEASE give people the option to use intents

@Therandomhoboo
Copy link
Contributor

Yes please for the love of god, i dont care if im banned this is just QoL

@SapphicOverload
Copy link
Contributor Author

combat off icon button is invisible

Should be fixed now

@Cartlord
Copy link
Contributor

please do not do this

Yogbot-13 added a commit that referenced this pull request Apr 28, 2024
Yogbot-13 added a commit that referenced this pull request Apr 29, 2024
Yogbot-13 added a commit that referenced this pull request Apr 29, 2024
Yogbot-13 added a commit that referenced this pull request Apr 29, 2024
Yogbot-13 added a commit that referenced this pull request Apr 30, 2024
@cuackles
Copy link
Contributor

cuackles commented May 6, 2024

image

deleting this was intended or accident ?

Yogbot-13 added a commit that referenced this pull request May 8, 2024
Yogbot-13 added a commit that referenced this pull request May 8, 2024
Yogbot-13 added a commit that referenced this pull request May 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Controversial People are divided on this PR DO NOT MERGE Should not be merged without express approval from a Head Dev Feature This adds new content to the game Fix This fixes an issue. Please link issues in fix PRs Test Merge - Requested This PR is waiting for a test merge to be scheduled Test Merge - Scheduled This PR is waiting to be test merged TESTMERGED This PR is currently live in a test merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.