Skip to content
This repository has been archived by the owner on Oct 7, 2018. It is now read-only.

Port Many prs v2 #222

Merged
merged 3 commits into from Oct 31, 2017
Merged

Port Many prs v2 #222

merged 3 commits into from Oct 31, 2017

Conversation

scrubmcnoob
Copy link
Contributor

ports:
tgstation/tgstation#31145
tgstation/tgstation#31165
tgstation/tgstation#31163
tgstation/tgstation#30297
tgstation/tgstation#29268
tgstation/tgstation#30633
tgstation/tgstation#31137
tgstation/tgstation#32162
tgstation/tgstation#30970
and yes it compiles.
these should be all the prs i ported, may of forgot to list the minor hotfixes ones i had to do
also did some other fixes for gangwars zlevel since we still have the game mode thankkfully

first batch
s
s
ports:
tgstation/tgstation#31145
tgstation/tgstation#31165
tgstation/tgstation#31163
tgstation/tgstation#30297
tgstation/tgstation#29268
tgstation/tgstation#30633
tgstation/tgstation#31137
tgstation/tgstation#32162
tgstation/tgstation#30970
and yes it compiles.
these should be all the prs i ported, may of forgot to list the minor
hotfixes ones i had to do
also did some other fixes for gangwars zlevel since we still have the
game mode thankkfully
@taukausanake
Copy link

Shouldn't you just be pulling from /tg/ upstream at this point? I mean I don't know the contents of these PRs/ports but I could only imagine such

@SamHPurp SamHPurp added Fix This Pull Request fixes unintended functionality Port Refactor/Code Improvement labels Oct 31, 2017
@scrubmcnoob
Copy link
Contributor Author

scrubmcnoob commented Oct 31, 2017

We're too different code wise for a bot to handle @taukausanake
A good amount of PRs would be scrapped.

M.dest = pickedgoal
M.z_original = ZLEVEL_STATION
spawn(0)
walk_towards(M, M.dest, 1)
Copy link
Member

Choose a reason for hiding this comment

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

Lines 43 and 44 shouldn't have been deleted here.

@SamHPurp
Copy link
Member

Good catch, @FlattestGuitar

I think I'd prefer if these ports remain their own individual PRs (other than subsequent fixes, those can all be rolled into one)

But if they're are entirely differnt, they should stay as separate PRs.

@FlattestGuitar
Copy link
Member

Yeah, I've already talked to Scrub about their approach.

Don't do this, kids.

@FlattestGuitar FlattestGuitar merged commit 53df951 into OracleStation:master Oct 31, 2017
@FlattestGuitar
Copy link
Member

Also, that comment I made earlier was apparently not quite right, since it works fine because Scrub also ported another PR which he forgot to mention in the OP.

@scrubmcnoob scrubmcnoob deleted the Port-Many-Prs-v2 branch November 1, 2017 04:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Fix This Pull Request fixes unintended functionality Port Refactor/Code Improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants