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

Machinery EMP Resistance (Wild Singulo Fixes) #3020

Merged
merged 4 commits into from Dec 27, 2020
Merged

Machinery EMP Resistance (Wild Singulo Fixes) #3020

merged 4 commits into from Dec 27, 2020

Commits on Dec 10, 2020

  1. Keep singularity from eating things that no longer exist Clean up EMP… 

    … behavior and runtimes from singularities eating things
    @Azrun
    Azrun committed Dec 10, 2020
    Copy the full SHA
    2765a02 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into runtimes_from_nom… 

    …_nom_singlo
    @Azrun
    Azrun committed Dec 10, 2020
    Copy the full SHA
    14baec9 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2020

  1. Merge remote-tracking branch 'upstream/master' into runtimes_from_nom… 

    …_nom_singlo

# Conflicts:
#	code/WorkInProgress/AnimationLibrary.dm
    @Azrun
    Azrun committed Dec 11, 2020
    Copy the full SHA
    9f6c733 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. Adding DMdoc

    @Azrun
    Azrun committed Dec 14, 2020
    Copy the full SHA
    0ec3662 View commit details
    Browse the repository at this point in the history