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

Stun batons cannot be turned on for 8 Seconds after being dropped - #14322

Merged
JamieD1 merged 16 commits into
masterfrom
Baton2
Jun 14, 2022
Merged

Stun batons cannot be turned on for 8 Seconds after being dropped#14322
JamieD1 merged 16 commits into
masterfrom
Baton2

Conversation

@JamieD1

@JamieD1 JamieD1 commented Jun 4, 2022

Copy link
Copy Markdown
Contributor

Stun batons cannot be turned on for 8 Seconds after being dropped

Theos half approved

Most likely needed after 1 hit might be merged.

🆑
rscadd: Stun batons cannot be turned on for 8 Seconds after being dropped
/:cl:

@Yogbot-13 Yogbot-13 added the Feature This adds new content to the game label Jun 4, 2022
Comment thread code/game/objects/items/stunbaton.dm
Comment thread code/game/objects/items/stunbaton.dm Outdated
Comment thread code/game/objects/items/stunbaton.dm Outdated
Comment thread code/game/objects/items/stunbaton.dm Outdated
Comment thread code/game/objects/items/stunbaton.dm Outdated
Comment thread code/game/objects/items/stunbaton.dm Outdated
JamieD1 and others added 3 commits June 4, 2022 18:01
Co-authored-by: Theos <theubernyan@gmail.com>
@maxion12345

Copy link
Copy Markdown
Contributor

heres an idea

what if we just didn't merge one-hit batons so all of this wouldn't be needed

@ghost

ghost commented Jun 4, 2022

Copy link
Copy Markdown

heres an idea

what if we just didn't merge one-hit batons so all of this wouldn't be needed

Based

Comment thread code/game/objects/items/stunbaton.dm
Yogbot-13 added a commit that referenced this pull request Jun 4, 2022
Yogbot-13 added a commit that referenced this pull request Jun 5, 2022
@Mqiib

Mqiib commented Jun 5, 2022

Copy link
Copy Markdown
Contributor

Also gives you an 8 second timer before it can be turned on when you pull it out of a belt, which is less than ideal. please fix (also dont merge 1-hit batong pls)

@JamieD1

JamieD1 commented Jun 7, 2022

Copy link
Copy Markdown
Contributor Author

Also gives you an 8 second timer before it can be turned on when you pull it out of a belt, which is less than ideal. please fix (also dont merge 1-hit batong pls)

Fun fact it was fixed before you made this comment

Yogbot-13 added a commit that referenced this pull request Jun 7, 2022
Comment thread code/__DEFINES/components.dm Outdated
Comment thread code/game/objects/items/stunbaton.dm
Yogbot-13 added a commit that referenced this pull request Jun 7, 2022
Comment thread code/__DEFINES/components.dm Outdated
Comment thread code/__DEFINES/components.dm Outdated
Co-authored-by: Byemoh <baiomurang@gmail.com>

@ToasterBiome ToasterBiome left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is only approval on the stuff i commented on

Yogbot-13 added a commit that referenced this pull request Jun 9, 2022
Yogbot-13 added a commit that referenced this pull request Jun 9, 2022
Yogbot-13 added a commit that referenced this pull request Jun 12, 2022
@JamieD1
JamieD1 merged commit 7b0eba4 into master Jun 14, 2022
@JamieD1
JamieD1 deleted the Baton2 branch June 14, 2022 17:15
Yogbot-13 added a commit that referenced this pull request Jun 14, 2022
@ghost

ghost commented Jun 14, 2022

Copy link
Copy Markdown

Literaly merging a PR with 9 downvotes

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Feature This adds new content to the game

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants