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

Jammin #985

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Jammin #985

wants to merge 24 commits into from

Commits on Apr 13, 2013

  1. Added the Hotline gamemode. Name isn't really appropriate.

    @Petethegoat
    Petethegoat committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    acbe97b View commit details
    Browse the repository at this point in the history

  2. Fix for the burn/stab objectives.

    @Petethegoat
    Petethegoat committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    e3798a9 View commit details
    Browse the repository at this point in the history

  3. Crystal mode. There are 3 crystal zealots each with their own unique … 

    …crystals, which have powers that you can activate by clicking while in your hand. Each zealot must collect 2 crystals to complete their objective; they can find more crystals by examining their own crystal and it will glow depending on how close other crystals are.
    @Giacom
    Giacom committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    f818d76 View commit details
    Browse the repository at this point in the history

  4. Added Clone Gamemode

    @Iamgoofball
    Iamgoofball committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    776bf96 View commit details
    Browse the repository at this point in the history

  5. * Fixed the players required.

    @Giacom
    Giacom committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    b407c8f View commit details
    Browse the repository at this point in the history

  6. * Forgot a file.

    @Giacom
    Giacom committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    04b8110 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2013

  1. Made the antags spawn with a random job, minus the space wizard.

    @Iamgoofball
    Iamgoofball committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    48496ee View commit details
    Browse the repository at this point in the history

  2. Working build of the Clone gamemode.

    @Iamgoofball
    Iamgoofball committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    ecbfe76 View commit details
    Browse the repository at this point in the history

  3. Removed my useless shit from factions.dm that I forgot to remove with… 

    … the first commit.
    @Iamgoofball
    Iamgoofball committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    6b6cf1d View commit details
    Browse the repository at this point in the history

  4. Fixed the clone bitflag.

    @Iamgoofball
    Iamgoofball committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    5a87e5b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2013

  1. Merge pull request #360 from Giacomand/GameJam_Crystal 

    [JAM] Crystal mode.
    Pete Goodfellow committed Apr 16, 2013
    Configuration menu
    Copy the full SHA
    b7cb3c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #356 from Petethegoat/gamemodejam 

    [JAM] Added the Hotline gamemode.
    Pete Goodfellow committed Apr 16, 2013
    Configuration menu
    Copy the full SHA
    1c9a477 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #354 from Giacomand/GameJam_DoubleAgents 

    [JAM] Double Agent gamemode.
    Pete Goodfellow committed Apr 16, 2013
    Configuration menu
    Copy the full SHA
    ea05d80 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2013

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

    @Iamgoofball
    Iamgoofball committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    0a41754 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2013

  1. Merge branch 'master' into jammin

    @caelaislinn
    caelaislinn committed Apr 18, 2013
    Configuration menu
    Copy the full SHA
    1805492 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2013

  1. Merge pull request #405 from caelaislinn/jammin 

    Update Jammin branch with Master branch
    Pete Goodfellow committed Apr 19, 2013
    Configuration menu
    Copy the full SHA
    cc17432 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2013

  1. Select Equipment update 

    -Renamed 'Strip' to 'Naked'
-Added Assistant
-Re-added Death Commando
-Added job titles to IDs of figures who should have it displayed. Shortened the titles of some of them so it wouldn't make ID and PDA names too long.
    @Ikarrus
    Ikarrus committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    76651bf View commit details
    Browse the repository at this point in the history

  2. **This is a remake of tgstation/tgstation#453 after git imploded on i… 

    …tself.

-Removed head jumpsuits from the steal objectives list, as they were hardly taken seriously.
-Added Medal of Captaincy to list of steal objectives
-Readded Nuke Disk to list of special steal objectives. I've tested it and it DOES work.
-Grammar fix for special steal objectives
    @Ikarrus
    Ikarrus committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    411a0c2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #458 from Ikarrus/steal 

    Steal Objectives Update
    @caelaislinn
    caelaislinn committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    06e945d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #451 from Ikarrus/selequip 

    Select Equipment update
    @caelaislinn
    caelaislinn committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    9479128 View commit details
    Browse the repository at this point in the history

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

    @Iamgoofball
    Iamgoofball committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    72151ea View commit details
    Browse the repository at this point in the history

  6. Merge branch 'jammin' of https://github.com/tgstation/-tg-station 

    Conflicts:
	tgstation.dme
    @Iamgoofball
    Iamgoofball committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    b85e484 View commit details
    Browse the repository at this point in the history

  7. fixing the dme file

    @Iamgoofball
    Iamgoofball committed Apr 26, 2013
    Configuration menu
    Copy the full SHA
    b3344f4 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2013

  1. Merge pull request #441 from iamgoofballsecondfork/master 

    [GAME JAM] Clone Gamemode
    @caelaislinn
    caelaislinn committed May 2, 2013
    Configuration menu
    Copy the full SHA
    a8eb02c View commit details
    Browse the repository at this point in the history