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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Marker obj and door opening for simple animals (currently only necromorphs)" #10828

Merged
merged 1 commit into from
Jun 28, 2016

Conversation

ComicIronic
Copy link
Contributor

Reverts #10742 because you don't self-merge Jesus

@gbasood
Copy link
Contributor

gbasood commented Jun 28, 2016

Fuck off
If you think I'm abusing shit by self merging, talk to pomf
Revert the code if you have reason to, not to prove some point.

@ghost
Copy link

ghost commented Jun 28, 2016

Sood, regardless of your status, you shouldn't self merge.

Also, this gives us a chance to re-approach the marker, because after seeing it in action, it needs some serious tweaks.

@PJB3005
Copy link
Contributor

PJB3005 commented Jun 28, 2016

Doubled issue count after I reviewed it.

Yeah definitely revert.

I mean IMO necromorphs are retarded, but eh.

@ghost
Copy link

ghost commented Jun 28, 2016

That's kinda saying you look over PRs after they're merged and gain complaints ingame rather than reviewing them before merge

@gbasood
Copy link
Contributor

gbasood commented Jun 28, 2016

Nothing to do with status
I allowed time for review and I thought I got it but apparently only contrib review matters
And I thought I bugged @PJB3005 but apparently I didn't
@clusterfack I know I bugged like three times to no avail

@PJB3005
Copy link
Contributor

PJB3005 commented Jun 28, 2016

but apparently only contrib review matters

Yeah because others definitely didn't see the what, 15 issues I pointed out?

@Konater
Copy link
Contributor

Konater commented Jun 28, 2016

🍆

@ComicIronic
Copy link
Contributor Author

MERGE WHEN NERDS

@PJB3005 PJB3005 merged commit 85c2752 into Bleeding-Edge Jun 28, 2016
@PJB3005
Copy link
Contributor

PJB3005 commented Jun 28, 2016

NOW

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants