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

Allows for sabre renaming. #20367

Merged
merged 5 commits into from Sep 12, 2016
Merged

Allows for sabre renaming. #20367

merged 5 commits into from Sep 12, 2016

Commits on Sep 6, 2016

  1. Allows for sabre renaming.

    @TechnoAlchemisto
    TechnoAlchemisto committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    476d170 View commit details
    Browse the repository at this point in the history

  2. That's not supposed to be there

    @TechnoAlchemisto
    TechnoAlchemisto committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    04bb24d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. Applies unique_rename to all /weapons

    @TechnoAlchemisto
    TechnoAlchemisto committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    9b537a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'cant_believe_shadowlight_banned_me' of https://github.c… 

    …om/TechnoAlchemisto/-tg-station into cant_believe_shadowlight_banned_me

# Conflicts:
#	code/game/objects/items/weapons/melee/misc.dm
    @TechnoAlchemisto
    TechnoAlchemisto committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    09bd961 View commit details
    Browse the repository at this point in the history

  3. fixes my stupid asshole

    @TechnoAlchemisto
    TechnoAlchemisto committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    bf39a4a View commit details
    Browse the repository at this point in the history