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

Pumpkin fix and sprite fixes, general housekeeping (with more dropsounds) #7384

Closed
wants to merge 35 commits into from
Closed

Pumpkin fix and sprite fixes, general housekeeping (with more dropsounds) #7384

wants to merge 35 commits into from

Commits on Nov 8, 2019

  1. improvsword and kokobar newsprites

    @alsoandanswer
    alsoandanswer committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    7e1153f View commit details
    Browse the repository at this point in the history

  2. new janigun

    @alsoandanswer
    alsoandanswer committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    2767f2a View commit details
    Browse the repository at this point in the history

  3. changelog

    @alsoandanswer
    alsoandanswer committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    52f6ae4 View commit details
    Browse the repository at this point in the history

  4. dammit

    @alsoandanswer
    alsoandanswer committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    57a4df9 View commit details
    Browse the repository at this point in the history

  5. App

    @alsoandanswer
    alsoandanswer committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    af62d16 View commit details
    Browse the repository at this point in the history

  6. Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Me… 

    …dicine.dm

Co-Authored-By: MarinaGryphon <ryfoxx93@gmail.com>
    @alsoandanswer @MarinaGryphon
    alsoandanswer and MarinaGryphon committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    05b0653 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. adds new power drill sprites, since I have time

    @alsoandanswer
    alsoandanswer committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    0658629 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ratgun_impsword_kobar_resprite

    @alsoandanswer
    alsoandanswer committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    cb5edff View commit details
    Browse the repository at this point in the history

  3. fingers crossed

    @alsoandanswer
    alsoandanswer committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    f1f00ee View commit details
    Browse the repository at this point in the history

  4. fsauce

    @alsoandanswer
    alsoandanswer committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    70dcead View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. doot doot hoot

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    cec652b View commit details
    Browse the repository at this point in the history

  2. a little more emmulsions

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d5fb106 View commit details
    Browse the repository at this point in the history

  3. fixes my brain

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    ff1b5ff View commit details
    Browse the repository at this point in the history

  4. paff biff baff

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    aad5751 View commit details
    Browse the repository at this point in the history

  5. Fix merge conflicc

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f650f06 View commit details
    Browse the repository at this point in the history

  6. whoops

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e5eb321 View commit details
    Browse the repository at this point in the history

  7. tweaks

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    209d70b View commit details
    Browse the repository at this point in the history

  8. tweaks

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    27314d8 View commit details
    Browse the repository at this point in the history

  9. tweak

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    7fd133c View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master' into pumpkin

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    2aa6586 View commit details
    Browse the repository at this point in the history

  11. fix

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e78cf22 View commit details
    Browse the repository at this point in the history

  12. wtf am i doing

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    95d4e2c View commit details
    Browse the repository at this point in the history

  13. cardtweaks

    @alsoandanswer
    alsoandanswer committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    08c07aa View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. re-enables lightmode on PDA's

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    a0faacb View commit details
    Browse the repository at this point in the history

  2. new depthscanner sproot

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    27b0a50 View commit details
    Browse the repository at this point in the history

  3. transfer wax

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    17c93b1 View commit details
    Browse the repository at this point in the history

  4. changelol

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7be372a View commit details
    Browse the repository at this point in the history

  5. yelling

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    03200f4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'pumpkin' of https://github.com/alsoandanswer/Aurora.3 i… 

    …nto pumpkin
    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7a830fb View commit details
    Browse the repository at this point in the history

  7. changelog

    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    aeebb86 View commit details
    Browse the repository at this point in the history

  8. The mapping stuff

    @fernerr
    fernerr committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f8332f8 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6 from fernerr/wezzy-gum-gum 

    The mapping stuff
    @alsoandanswer
    alsoandanswer committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    27aabc3 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. no message

    @alsoandanswer
    alsoandanswer committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    ee92e19 View commit details
    Browse the repository at this point in the history

  2. fixes impending merge error with codersprite killoff PR

    @alsoandanswer
    alsoandanswer committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    0540e25 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into pumpkin

    @alsoandanswer
    alsoandanswer committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    99fe9c7 View commit details
    Browse the repository at this point in the history