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

Gamma ERT Changes #9631

Merged
merged 25 commits into from
Oct 9, 2018
Merged

Gamma ERT Changes #9631

merged 25 commits into from
Oct 9, 2018

Commits on Aug 29, 2018

  1. adds multi lens immolation gun

    @Birdtalon
    Birdtalon committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    49e47d0 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. further gun tweaks/changes, adds sprite

    @Birdtalon
    Birdtalon committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    5275b5f View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2018

  1. adds extra icon overlay

    @Birdtalon
    Birdtalon committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    8ed6cd3 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. adds scanner icons 

    adds more code for ERT scanner

ert scanner
    @Birdtalon
    Birdtalon committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    0a83572 View commit details
    Browse the repository at this point in the history

  2. finishing touches to scanner 

    corrections to update_icon

updating icons, charging the analyser, power consumption tweaks
    @Birdtalon
    Birdtalon committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    9eea8fa View commit details
    Browse the repository at this point in the history

  3. adds T4 thermite charge, alters thermitemelt() slightly to add speed … 

    …parameter
    @Birdtalon
    Birdtalon committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    5dff419 View commit details
    Browse the repository at this point in the history

  4. adds ERT sidearm "PDW-9"

    @Birdtalon
    Birdtalon committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    d6dc26c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2018

  1. adds telebaton implant

    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    568d920 View commit details
    Browse the repository at this point in the history

  2. changes to ERT equipment datums, organises some files a little clearer

    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    424f3ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ERT-gun 

    # Conflicts:
#	code/modules/response_team/ert_outfits.dm
    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    d35155b View commit details
    Browse the repository at this point in the history

  4. further outfit datum changes, adds janitor advanced mop implant

    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    d60d0f1 View commit details
    Browse the repository at this point in the history

  5. gamma fireproof suits, fixed an accidental removal in scanners.dm

    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    eb312f5 View commit details
    Browse the repository at this point in the history

  6. tidying up

    @Birdtalon
    Birdtalon committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    55fa8bb View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 … 

    …sprite, adds paranormal armour variants.
    @Birdtalon
    Birdtalon committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    deec799 View commit details
    Browse the repository at this point in the history

  2. fixes

    @Birdtalon
    Birdtalon committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    af045a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2018

  1. addresses points in Purpose's review. Fixes some spans, replaces some… 

    … 0,1 with TRUE,FALSE, uses some defines
    @Birdtalon
    Birdtalon committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    c72561d View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2018

  1. adds sprites for ERT helmets

    @Birdtalon
    Birdtalon committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    26d720f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ERT-changes 

    # Conflicts:
#	icons/mob/head.dmi
    @Birdtalon
    Birdtalon committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    1628467 View commit details
    Browse the repository at this point in the history

  3. conflicts fix

    @Birdtalon
    Birdtalon committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    65f8dc0 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. adds sprite for T4

    @Birdtalon
    Birdtalon committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    f877e6b View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2018

  1. bugfixes

    @Birdtalon
    Birdtalon committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    4151487 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ERT-changes

    @Birdtalon
    Birdtalon committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    074ee96 View commit details
    Browse the repository at this point in the history

  3. changes equip_to_slot_or_del() to equip_or_collect() to prevent item … 

    …deletion from backpack_contents list

numerous bugfixes
adds new suit sprites
    @Birdtalon
    Birdtalon committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    f36b0a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. fixes broken type-path and duplicated helmet sprites

    @Birdtalon
    Birdtalon committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    90c2197 View commit details
    Browse the repository at this point in the history

  2. changes telebaton to classic

    @Birdtalon
    Birdtalon committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    50e6721 View commit details
    Browse the repository at this point in the history