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

Returns Ice V2 to rotation for the Holiday Season #5242

Closed
wants to merge 47 commits into from
Closed

Returns Ice V2 to rotation for the Holiday Season #5242

wants to merge 47 commits into from

Commits on Dec 16, 2023

  1. Adds intel

    @private-tristan
    private-tristan committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    f378e09 View commit details
    Browse the repository at this point in the history

  2. adds comms towers in questionable spots

    @private-tristan
    private-tristan committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    deabd2a View commit details
    Browse the repository at this point in the history

  3. Copying code from V1 PR 

    spartanbobby and  BeagleGaming1 wrote this, im just copying it.
    @private-tristan
    private-tristan committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    9d8812b View commit details
    Browse the repository at this point in the history

  4. misplaced file, 130 min player

    @private-tristan
    private-tristan committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    aa18ded View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2023

  1. Minor changes, replaces missing texture floors

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    f7a523e View commit details
    Browse the repository at this point in the history

  2. maybe working elevator??? I hope?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    452603c View commit details
    Browse the repository at this point in the history

  3. maybe work?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    cb21475 View commit details
    Browse the repository at this point in the history

  4. buttons before testing

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    df1c428 View commit details
    Browse the repository at this point in the history

  5. more work

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    6553194 View commit details
    Browse the repository at this point in the history

  6. will it work nooow???

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    928c86f View commit details
    Browse the repository at this point in the history

  7. Works now?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    7207da5 View commit details
    Browse the repository at this point in the history

  8. All Elevators done?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    3609a3f View commit details
    Browse the repository at this point in the history

  9. Maybe?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    3b98b51 View commit details
    Browse the repository at this point in the history

  10. Update Ice_Colony_v2.dmm

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    d98d44c View commit details
    Browse the repository at this point in the history

  11. more testing

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    e0f8a9d View commit details
    Browse the repository at this point in the history

  12. it should work this time I think

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    d44ee9b View commit details
    Browse the repository at this point in the history

  13. please work please work

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    86823bb View commit details
    Browse the repository at this point in the history

  14. Maybe buttons work?

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    0e57857 View commit details
    Browse the repository at this point in the history

  15. THIS SHOULD WORK COMPLETELY 

    please
    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    eff48f9 View commit details
    Browse the repository at this point in the history

  16. fixes omicorn button

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    125f2bc View commit details
    Browse the repository at this point in the history

  17. Ice Version Two

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    8628330 View commit details
    Browse the repository at this point in the history

  18. sensor tower

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    34afe34 View commit details
    Browse the repository at this point in the history

  19. not sure why it keeps doing this.

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    2b29f1f View commit details
    Browse the repository at this point in the history

  20. Fix Linter I think

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    2281b4f View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into icev2-real

    @private-tristan
    private-tristan authored Dec 17, 2023
    Configuration menu
    Copy the full SHA
    02c634a View commit details
    Browse the repository at this point in the history

  22. deletes an oopsie

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    ae353c7 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'icev2-real' of https://github.com/private-tristan/cmss13 … 

    …into icev2-real
    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    3a874cb View commit details
    Browse the repository at this point in the history

  24. maybe

    @private-tristan
    private-tristan committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    b28fe75 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. may have figured it out

    @private-tristan
    private-tristan committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c04e4c0 View commit details
    Browse the repository at this point in the history

  2. just testing this for linters

    @private-tristan
    private-tristan committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    d2bd580 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into icev2-real

    @private-tristan
    private-tristan authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    0da96c5 View commit details
    Browse the repository at this point in the history

  4. deleted this earlier, maybe reintroducing will fix?

    @private-tristan
    private-tristan committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    e95722b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into icev2-real

    @private-tristan
    private-tristan authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    a40e198 View commit details
    Browse the repository at this point in the history

  6. throwing stuff at the wall and seeing if it works

    @private-tristan
    private-tristan committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    9f3a75d View commit details
    Browse the repository at this point in the history

  7. oh and this too

    @private-tristan
    private-tristan committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    8240938 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Is there a better way to do this? i have no idea

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    7a8f239 View commit details
    Browse the repository at this point in the history

  2. I am going insane

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    77c7136 View commit details
    Browse the repository at this point in the history

  3. maybe if i add a \improper?

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    e36a9eb View commit details
    Browse the repository at this point in the history

  4. wait i forgot to press save on this??

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    a03c989 View commit details
    Browse the repository at this point in the history

  5. maybe? im throwing more stuff at the checks

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    3f4f1e8 View commit details
    Browse the repository at this point in the history

  6. Maybe???

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    997960b View commit details
    Browse the repository at this point in the history

  7. rename map and clean up a space

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    6961817 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into icev2-real

    @private-tristan
    private-tristan authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    cca089b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into icev2-real

    @private-tristan
    private-tristan authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    c4dc07f View commit details
    Browse the repository at this point in the history

  10. Adds the map

    @private-tristan
    private-tristan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    0a15cef View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2023

  1. disables V1 because I actually don't like it

    @private-tristan
    private-tristan committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    fef0994 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. told to reenable v1

    @private-tristan
    private-tristan committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    884a9c0 View commit details
    Browse the repository at this point in the history