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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports holding down space to toggle throw mode from tg #6493

Merged
merged 3 commits into from May 22, 2022

Conversation

ivanmixo
Copy link
Contributor

@ivanmixo ivanmixo commented Mar 17, 2022

About The Pull Request

PORTS: tgstation/tgstation#57331

Title. Allows holding down space to toggle throw mode. Also removes a few things automatically toggling your throw mode, mainly priming exploding lemons from botany. Adds a CD for throwing stuff too.

Why It's Good For The Game

Being able to catch things as a moments notice is vital when fighting experienced players who know how good thrown weapons are (read: bolas).

Testing Photographs and Procedure

Screenshots&Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

catdrink.mp4

Changelog

馃啈
add: You can now toggle throw mode by pressing space bar!
/:cl:

@ToasterBan
Copy link
Contributor

can't you already do this with the R key?

code/_onclick/click.dm Outdated Show resolved Hide resolved
Comment on lines -120 to -122
if(iscarbon(user))
var/mob/living/carbon/C = user
C.throw_mode_on()
Copy link
Member

Choose a reason for hiding this comment

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

Why are you removing this? When you prime a grenade, throw mode should be entered.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Uhh, no this is specific to this fruit for whatever reason. Regular grenades don't toggle your throw mode, so it's for consistency's sake.

Copy link
Member

Choose a reason for hiding this comment

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

Regular grenades can be thrown while primed, even if not in throw mode.

@PowerfulBacon
Copy link
Member

Pretty certain regular grenades like minibombs toggle on throw mode when you prime them, if not they should

@ivanmixo
Copy link
Contributor Author

I don't think they should. We should at least be consistent about nades auto priming instead of some priming and some not.

@PowerfulBacon
Copy link
Member

I don't think they should. We should at least be consistent about nades auto priming instead of some priming and some not.

If you prime a grenade and click, the grenade gets thrown even when not in throw mode.

Comment on lines -121 to +127
if(in_throw_mode && throw_item(A))
return

var/obj/item/W = get_active_held_item()

if(throw_mode && W)
changeNext_move(CLICK_CD_THROW)
throw_item(A)
return

Copy link
Member

Choose a reason for hiding this comment

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

Broke logic

@ivanmixo ivanmixo deleted the spacethrowmode branch May 29, 2022 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants