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

separate branch for multiz #27873

Closed
wants to merge 13 commits into from
Closed

separate branch for multiz #27873

wants to merge 13 commits into from

Commits on May 12, 2017

  1. Initial framework + Gas Spread + ZShadows + Early attempt at pipes.

    @RemieRichards
    RemieRichards committed May 12, 2017
    Configuration menu
    Copy the full SHA
    a85861d View commit details
    Browse the repository at this point in the history

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

    …o VERTICALITY

Conflicts:
	code/__DEFINES/atmospherics.dm
	code/controllers/subsystem/air.dm
	code/modules/atmospherics/environmental/LINDA_system.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	tgstation.dme
    @RemieRichards
    RemieRichards committed May 12, 2017
    Configuration menu
    Copy the full SHA
    c521ea9 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2017

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

    …o VERTICALITY
    @RemieRichards
    RemieRichards committed May 13, 2017
    Configuration menu
    Copy the full SHA
    c8f4845 View commit details
    Browse the repository at this point in the history

  2. Modernisation + revert/merge fixes

    @RemieRichards
    RemieRichards committed May 13, 2017
    Configuration menu
    Copy the full SHA
    8375d51 View commit details
    Browse the repository at this point in the history

  3. Multiz Test map is now loaded the standard way.

    @RemieRichards
    RemieRichards committed May 13, 2017
    Configuration menu
    Copy the full SHA
    441bd0f View commit details
    Browse the repository at this point in the history

  4. Rest in peace Zvent.

    @RemieRichards
    RemieRichards committed May 13, 2017
    Configuration menu
    Copy the full SHA
    c3ffeba View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. Merge branch 'VERTICALITY' of https://github.com/RemieRichards/-tg-st… 

    …ation into RemieRichards-VERTICALITY

ok
    @Razharas
    Razharas committed May 14, 2017
    Configuration menu
    Copy the full SHA
    da10817 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2017

  1. Makes vines 3d 

    Makes vines 3d
    @Razharas
    Razharas committed May 15, 2017
    Configuration menu
    Copy the full SHA
    c133119 View commit details
    Browse the repository at this point in the history

  2. Checking zlevel connection on creation or movement 

    Checking zlevel connection on creation or movement
    @Razharas
    Razharas committed May 15, 2017
    Configuration menu
    Copy the full SHA
    271d02e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #18 from Razharas/RemieRichards-VERTICALITY 

    3d vines
    @RemieRichards
    RemieRichards committed May 15, 2017
    Configuration menu
    Copy the full SHA
    c9f46a2 View commit details
    Browse the repository at this point in the history

  4. Makes explosions 3d 

    Makes explosions 3d
    @Razharas
    Razharas committed May 15, 2017
    Configuration menu
    Copy the full SHA
    1995587 View commit details
    Browse the repository at this point in the history

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

    …o RemieRichards-VERTICALITY
    @Razharas
    Razharas committed May 15, 2017
    Configuration menu
    Copy the full SHA
    f6dd79d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #19 from Razharas/RemieRichards-VERTICALITY 

    Makes bakuretsutachi 3d
    @RemieRichards
    RemieRichards committed May 15, 2017
    Configuration menu
    Copy the full SHA
    b29247d View commit details
    Browse the repository at this point in the history