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

Adds patting! #23989

Merged
merged 2 commits into from Feb 13, 2017
Merged

Adds patting! #23989

merged 2 commits into from Feb 13, 2017

Conversation

GunHog
Copy link
Contributor

@GunHog GunHog commented Feb 12, 2017

馃啈 Gun Hog
add: You can now hug someone while aiming at the head, eyes or mouth to give them a pat on the head!
/:cl:

You may now hug someone while aiming at the head, eyes or mouth to give
them a friendly pat!
@AnonymousNow
Copy link
Contributor

That's cute. I like that.

@ghost
Copy link

ghost commented Feb 12, 2017

pat the lizards condescendingly, yes yes.

@PKPenguin321
Copy link
Contributor

This was already rejected

@Iamgoofball
Copy link
Contributor

#21352

@imtakingabreakdontatme
Copy link
Contributor

Good PR

@Iamgoofball
Copy link
Contributor

this is a meme PR zone now becaUSE THIS WAS ALREADY REJECTED

@imtakingabreakdontatme
Copy link
Contributor

We have PRs that were rejected opened later all the time

@Arianya
Copy link
Contributor

Arianya commented Feb 12, 2017

@PKPenguin321 If something that was rejected once was never merged then goof would be out of a not-a-job

@PKPenguin321
Copy link
Contributor

when goof reopens things he changes them, like removing doublefrying

@GunHog
Copy link
Contributor Author

GunHog commented Feb 12, 2017

How should I change it, then?

@silicons
Copy link
Contributor

馃憤

@Arianya
Copy link
Contributor

Arianya commented Feb 12, 2017

@PKPenguin321 Please don't make me pull up the multiple times goof has re-opened a PR literally unchanged~

@Iamgoofball
Copy link
Contributor

fuck you

@Arianya
Copy link
Contributor

Arianya commented Feb 12, 2017

@Iamgoofball 鉂わ笍

@PKPenguin321
Copy link
Contributor

name one unchanged reopened goof pull that got merged

@silicons
Copy link
Contributor

rude

@optimumtact
Copy link
Member

fuck off

@imtakingabreakdontatme
Copy link
Contributor

Just imagine if he we tried to add hugging today someone would probably scream and try to stop it

@Arianya
Copy link
Contributor

Arianya commented Feb 12, 2017

Considering goof has something like a 95% closure to merge ratio and git doesn't let me search by merge vs closed... @PKPenguin321

@Iamgoofball
Copy link
Contributor

@Arianya DOT DOT DOT

@jughu
Copy link
Contributor

jughu commented Feb 12, 2017

COMMA

@Arianya
Copy link
Contributor

Arianya commented Feb 12, 2017

@Iamgoofball ellipse

@AnonymousNow
Copy link
Contributor

This seems like a harmless change that'll add a little something without being a detriment to anything (unless you count ERP, and we don't have that anymore). Is this a kneejerk "meme" contrarian reaction I'm seeing?

@optimumtact
Copy link
Member

it's denied for the same reason as the original pr

@silicons
Copy link
Contributor

gee maybe people who don't even know what lorebus is might want this.

@imtakingabreakdontatme
Copy link
Contributor

lorebus invented patting on the head

@RemieRichards RemieRichards reopened this Feb 12, 2017
@silicons
Copy link
Contributor

馃ぁ

@GunHog
Copy link
Contributor Author

GunHog commented Feb 12, 2017

WHAT HAVE I STARTED!?

@silicons
Copy link
Contributor

shut up goof.

@silicons
Copy link
Contributor

1/3 ok fine.

@PKPenguin321
Copy link
Contributor

now how many have been remade without any changes to the code and merged? hmm

@WJohn WJohn added the Feature Exposes new bugs in interesting ways label Feb 12, 2017
@Arianya Arianya mentioned this pull request Feb 12, 2017
@ShadowDeath6
Copy link

this buffs the borg hugging module too much, not sure if I can get behind this pr 馃槙

@Repukan

This comment was marked as off-topic.

@Grazyn
Copy link

Grazyn commented Feb 12, 2017

Old PR was rejected because it was pandering to a well known metagang which made constant use of patting (Kyo the green cat and the other pink cat and their orbiters), this metagang has since been disbanded so there's no reason to oppose patting at this time.

@Thunder12345
Copy link
Contributor

Was never about those cats. Was always inspired by lorebus.

@Repukan

This comment was marked as off-topic.

Down came the rain and washed poor spidey out
@optimumtact optimumtact merged commit 10ab63d into tgstation:master Feb 13, 2017
@GunHog
Copy link
Contributor Author

GunHog commented Feb 13, 2017

Clearly this is a lesson. Never enable "Allow maintainer edits".

@Cyberboss
Copy link
Member

Unchecking that shit so fast from now on

Copy link
Contributor

@PKPenguin321 PKPenguin321 left a comment

Choose a reason for hiding this comment

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

馃憣

@RemieRichards
Copy link
Contributor

@GunHog @Cyberboss Don't disable it.

@GunHog GunHog deleted the Petting branch February 13, 2017 15:33
@Doppeltongue
Copy link

This should get reverted, it shows up in the changelog, but doesn't actually exist in game, which is not good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet