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

[FEATURE] Movable Abandoned White Ship V2 #7327

Merged
merged 5 commits into from Jan 28, 2015
Merged

[FEATURE] Movable Abandoned White Ship V2 #7327

merged 5 commits into from Jan 28, 2015

Conversation

Steelpoint
Copy link
Contributor

Fixed Merge Conflicts Edition: #7196

Minor changes I've made.

  • I've allowed the white ship the ability to return to its point of origin.
  • I replaced the white syndi spacesuit with a second medical hardsuit.
  • You can now pilot the ship to the derelict station.

Image of the ship docked at the derelict.
screenshot 2015-01-24 20 25 18

@Deantwo
Copy link
Contributor

Deantwo commented Jan 24, 2015

I know the ship is like super old and stuff... but it just... it looks wrong when compared to the current BoxStation.

@Steelpoint
Copy link
Contributor Author

Its a relic of a older time, kinda the point imo.

@iyaerP
Copy link

iyaerP commented Jan 24, 2015

This is a thing of beauty. MERGE IT!

@Deantwo
Copy link
Contributor

Deantwo commented Jan 24, 2015

Does it still dock to BoxStation the same way as in #7196?
Because that was not all that good.

Does it actually have to dock to the BoxStation?
Couldn't it just stop near the station. Would give engineers something to, like building a docking area out to it.

@Steelpoint
Copy link
Contributor Author

It still docks as described in the last iteration.

I personally prefer it docking directly on the station, simply because it puts the lower arrivals docking ring to good use instead of it just being there.

@Deantwo
Copy link
Contributor

Deantwo commented Jan 24, 2015

Doesn't the Emergency Response Team or Death squad dock there?

@Steelpoint
Copy link
Contributor Author

They dock in the area above it.

@Steelpoint
Copy link
Contributor Author

Is this good to merge?

@Steelpoint
Copy link
Contributor Author

Oh yeah, fixed merge conflicts as well as fixed missing areas from another PR.

@WJohn
Copy link
Contributor

WJohn commented Jan 26, 2015

That PR fixed those areas though... Is your stuff outdated, perhaps?

@Steelpoint
Copy link
Contributor Author

I would assume the mapmerger would have fixed that.

Why would it update the map but not the areas?

@WJohn
Copy link
Contributor

WJohn commented Jan 26, 2015

I have no god damned clue anymore, man. The blast doors don't appear to be layer 2.9 anymore like I made them in atmos or on the bridge anymore and I really haven't got a clue what's going on.

@Steelpoint
Copy link
Contributor Author

Can this be merged please? Its getting old.

@Steelpoint
Copy link
Contributor Author

Updated with Changelog.

@hornygranny hornygranny merged commit ea5afb2 into tgstation:master Jan 28, 2015
@Steelpoint Steelpoint deleted the WhiteShip2 branch January 28, 2015 00:46
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

4 participants