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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beepsky no longer infistuns on detain #8869

Merged
merged 11 commits into from Jun 29, 2020
Merged

Beepsky no longer infistuns on detain #8869

merged 11 commits into from Jun 29, 2020

Conversation

ynot01
Copy link
Contributor

@ynot01 ynot01 commented Jun 11, 2020 •
edited

Intent of your Pull Request

Beepsky will now only stun you 30 times (3-4 minutes of stun) before cable tying you on detain

lets be real what sec is going to take that long to get there

Changelog

馃啈
tweak: Beepsky will now only stun you for about 3-4 minutes before cable tying you on detain
/:cl:

@yogstation13-bot yogstation13-bot added the Tweak This PR contains changes to the game. label Jun 11, 2020
@jcatjmeow
Copy link
Contributor

code/modules/mob/living/simple_animal/bot/secbot.dm, line 224, column 42:
error: undefined field: "stuncount" on /atom
code/modules/mob/living/simple_animal/bot/secbot.dm, line 226, column 5:
error: undefined field: "stuncount" on /atom

@jcatjmeow
Copy link
Contributor

jcatjmeow commented Jun 11, 2020 •
edited

you did it I am proud of you
but uh, in the explode(), can you set the lastStunned to null

@JamieD1 JamieD1 added the i ded label Jun 11, 2020
@ynot01
Copy link
Contributor Author

ynot01 commented Jun 13, 2020

you did it I am proud of you
but uh, in the explode(), can you set the lastStunned to null

ill do this tomorrow

@JamieD1 JamieD1 added the WORK IN PROGRESS This PR will take a while before its complete, but is actively being worked on. label Jun 14, 2020
ynot01 and others added 2 commits June 22, 2020 16:37
@ynot01 @jcatjmeow
Update code/modules/mob/living/simple_animal/bot/secbot.dm
eb6a81f 
Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>
@ynot01 @jcatjmeow
Update code/modules/mob/living/simple_animal/bot/secbot.dm
20a4e86 
Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>
@JamieD1 JamieD1 merged commit 78360fd into yogstation13:master Jun 29, 2020
Yogbot-13 added a commit that referenced this pull request Jun 29, 2020
@Yogbot-13
Automatic changelog generation #8869 [ci skip]
2753808
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcatjmeow jcatjmeow jcatjmeow requested changes

@JamieD1 JamieD1 JamieD1 approved these changes

Assignees
No one assigned
Labels
Tweak This PR contains changes to the game. WORK IN PROGRESS This PR will take a while before its complete, but is actively being worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ynot01 @jcatjmeow @JamieD1 @yogstation13-bot