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

Readds Cat emotes - #11739

Merged
JamieD1 merged 10 commits into
masterfrom
Cat-Emotes
Aug 7, 2021
Merged

Readds Cat emotes#11739
JamieD1 merged 10 commits into
masterfrom
Cat-Emotes

Conversation

@JamieD1

@JamieD1 JamieD1 commented Jul 9, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fuck off alexkar, you cant just close and revert a PR within 14 minutes then use the excuse of a exploit to do it.

Made the sounds quieter and added 10 second cooldown to meow.

Sounds are free to reuse.

🆑
tweak: Fixes Meow sound
/🆑

@JamieD1
JamieD1 requested a review from a team as a code owner July 9, 2021 08:26
adamsong
adamsong suggested changes Jul 9, 2021
View reviewed changes
Comment thread code/modules/mob/living/carbon/human/emote.dm Outdated
JamieD1
JamieD1 commented Jul 9, 2021
View reviewed changes
Comment thread code/modules/mob/living/carbon/human/emote.dm Outdated
JamieD1
JamieD1 commented Jul 9, 2021
View reviewed changes
Comment thread code/modules/mob/living/carbon/human/emote.dm Outdated
@JamieD1
JamieD1 requested a review from adamsong July 9, 2021 08:42
@github-actions github-actions Bot added the Sound This PR changes audio files label Jul 9, 2021
SomeguyManperson
SomeguyManperson approved these changes Jul 9, 2021
View reviewed changes

@SomeguyManperson SomeguyManperson 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.

should work

adamsong
adamsong approved these changes Jul 9, 2021
View reviewed changes

@adamsong adamsong 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.

Code looks good

@JamieD1

JamieD1 commented Jul 9, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Waiting 24 HOURS as REQUIRED by all maintainers.

@adamsong adamsong added Test Merge - Scheduled This PR is waiting to be test merged TESTMERGED This PR is currently live in a test merge. labels Jul 9, 2021
@alexkar598

alexkar598 commented Jul 9, 2021

Copy link
Copy Markdown
Member

"Waiting 24 hours"

immediately testmerges it

Doesnt need testmerging

Basically a speed merge in disguise. Nice one Jamie

@adamsong

adamsong commented Jul 9, 2021

Copy link
Copy Markdown
Contributor

This PR was open for more time before being test merged, than the other one which you full merged

@alexkar598

alexkar598 commented Jul 9, 2021

Copy link
Copy Markdown
Member

https://i.imgur.com/1wDpLxf.png

@Marmio64

Marmio64 commented Jul 11, 2021

Copy link
Copy Markdown
Contributor

even anime catgirls dont meow like a stray cat though

@Tipy1802

Tipy1802 commented Jul 19, 2021

Copy link
Copy Markdown

Purrbation already makes a cat noise when triggered so cat sounds arent out of line

@Cartlord Cartlord mentioned this pull request Jul 23, 2021
Closed
@Cartlord Cartlord mentioned this pull request Jul 26, 2021
Open
@JamieD1
JamieD1 merged commit 7623b33 into master Aug 7, 2021
@JamieD1
JamieD1 deleted the Cat-Emotes branch August 7, 2021 11:38
Yogbot-13 added a commit that referenced this pull request Aug 7, 2021
@Yogbot-13
Automatic changelog generation #11739 [ci skip]
62d2e3a
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers
@adamsong adamsong adamsong approved these changes
@SomeguyManperson SomeguyManperson SomeguyManperson approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Sound This PR changes audio files Test Merge - Scheduled This PR is waiting to be test merged TESTMERGED This PR is currently live in a test merge.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@JamieD1 @alexkar598 @adamsong @Marmio64 @Tipy1802 @SomeguyManperson