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.

Sign up for GitHub

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

Jump to bottom

[Boxstation]Minor Map Changes #24502

Closed
wants to merge 7 commits into from
Closed

[Boxstation]Minor Map Changes #24502

wants to merge 7 commits into from

Commits on Feb 27, 2017

  1. InitalCommit

    @Steelpoint
    Steelpoint committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    308cdf2 View commit details
    Browse the repository at this point in the history

  2. AtmoFixRobo

    @Steelpoint
    Steelpoint committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    2440b7b View commit details
    Browse the repository at this point in the history

  3. AddedFuelTankToRobo

    @Steelpoint
    Steelpoint committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    1984bbc View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. RoboRemoval

    @Steelpoint
    Steelpoint committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    f613748 View commit details
    Browse the repository at this point in the history

  2. AreaIssue

    @Steelpoint
    Steelpoint committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    d620567 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. Merge branch 'master' of https://github.com/tgstation/-tg-station int… 

    …o BoxMapping

# Conflicts:
#	_maps/map_files/TgStation/tgstation.2.1.3.dmm
    @Steelpoint
    Steelpoint committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    0ce4d62 View commit details
    Browse the repository at this point in the history

  2. MergeConflict

    @Steelpoint
    Steelpoint committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    0b21781 View commit details
    Browse the repository at this point in the history