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

New midround antag: surplus ops #10999

Closed
wants to merge 75 commits into from
Closed

New midround antag: surplus ops #10999

wants to merge 75 commits into from

Commits on Jun 22, 2022

  1. humble spaghetti beginnings

    @NightmareChamillian
    NightmareChamillian committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    5d70d17 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Merge branch 'master' of https://github.com/NightmareChamillian/goons… 

    …tation into midround-nukies
    @NightmareChamillian
    NightmareChamillian committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    715b6bd View commit details
    Browse the repository at this point in the history

  2. adds the assault shuttle

    @NightmareChamillian
    NightmareChamillian committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    d9fcbab View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. continues work on the ship

    @NightmareChamillian
    NightmareChamillian committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    ee1eae8 View commit details
    Browse the repository at this point in the history

  2. finalizes the ship

    @NightmareChamillian
    NightmareChamillian committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    af8ca2c View commit details
    Browse the repository at this point in the history

  3. begins work on loot pools

    @NightmareChamillian
    NightmareChamillian committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    e4c85d2 View commit details
    Browse the repository at this point in the history

  4. adds gun loot pools

    @NightmareChamillian
    NightmareChamillian committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6f708ab View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. adds melee items

    @NightmareChamillian
    NightmareChamillian committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    ae3fd9d View commit details
    Browse the repository at this point in the history

  2. grenades

    @NightmareChamillian
    NightmareChamillian committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    a5b17fd View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. bazingus

    @NightmareChamillian
    NightmareChamillian committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    ef8647d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. gjkladg

    @NightmareChamillian
    NightmareChamillian committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    bde3be0 View commit details
    Browse the repository at this point in the history

  2. gets things sorted out

    @NightmareChamillian
    NightmareChamillian committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    059833a View commit details
    Browse the repository at this point in the history

  3. wabongus

    @NightmareChamillian
    NightmareChamillian committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    b95c322 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. gets it done

    @NightmareChamillian
    NightmareChamillian committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    61397a1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    e11294a View commit details
    Browse the repository at this point in the history

  3. gungyus

    @NightmareChamillian
    NightmareChamillian committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    b63e764 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    3f28021 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2022

  1. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    a70204f View commit details
    Browse the repository at this point in the history

  2. finalish run down of ship

    @NightmareChamillian
    NightmareChamillian committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    9964060 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. biiiig progress

    @NightmareChamillian
    NightmareChamillian committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    877756a View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    e397f8f View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. decontaminates biblegib code

    @NightmareChamillian
    NightmareChamillian committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    d3a1747 View commit details
    Browse the repository at this point in the history

  2. sprites!

    @NightmareChamillian
    NightmareChamillian committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    581dc7d View commit details
    Browse the repository at this point in the history

  3. missing comma, restored at last

    @NightmareChamillian
    NightmareChamillian committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    c83539b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    756bcfc View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    fbfb348 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2022

  1. does code. No sprites, yet.

    @NightmareChamillian
    NightmareChamillian committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    3c2f1d0 View commit details
    Browse the repository at this point in the history

  2. finishes it up

    @NightmareChamillian
    NightmareChamillian committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    a2dad10 View commit details
    Browse the repository at this point in the history

  3. does a bit of teleporter stuff

    @NightmareChamillian
    NightmareChamillian committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    dcb9198 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2022

  1. works on teleporter, fixes lil bippy

    @NightmareChamillian
    NightmareChamillian committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    f012cd3 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. starts putting a wrap on things

    @NightmareChamillian
    NightmareChamillian committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    6792a5c View commit details
    Browse the repository at this point in the history

  2. piratification and rifles

    @NightmareChamillian
    NightmareChamillian committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    1cd822d View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. Adds instruction/lore papers + a few other thigns

    @NightmareChamillian
    NightmareChamillian committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    138eaa1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. new coin sprite

    @NightmareChamillian
    NightmareChamillian committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    7f73b4b View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Merge branch 'master' of https://github.com/goonstation/goonstation

    @NightmareChamillian
    NightmareChamillian committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    2eae94b View commit details
    Browse the repository at this point in the history

  2. moves the shuttle to a prefab file

    @NightmareChamillian
    NightmareChamillian committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    41725b0 View commit details
    Browse the repository at this point in the history

  3. pulls mapping from master

    @NightmareChamillian
    NightmareChamillian committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    08b41f3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/NightmareChamillian/goons… 

    …tation into surplus-ops-contentbranch
    @NightmareChamillian
    NightmareChamillian committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    dc3822f View commit details
    Browse the repository at this point in the history

  5. pre-playtest changes

    @NightmareChamillian
    NightmareChamillian committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    71e8def View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2022

  1. FINAL FINAL COMMIT

    @NightmareChamillian
    NightmareChamillian committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    f0afc35 View commit details
    Browse the repository at this point in the history

  2. fixes a ton, code makes more sense now.

    @NightmareChamillian
    NightmareChamillian committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    cdca545 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. adds objectives and a few tidbits

    @NightmareChamillian
    NightmareChamillian committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    76a8a48 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. continues working on objectives

    @NightmareChamillian
    NightmareChamillian committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    d223a9b View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2022

  1. adds the antag overlays

    @NightmareChamillian
    NightmareChamillian committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    a5e209a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. redoes the respawning

    @NightmareChamillian
    NightmareChamillian committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    4a1791c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/goonstation/goonstation i… 

    …nto surplus-ops-contentbranch
    @NightmareChamillian
    NightmareChamillian committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    4d830a0 View commit details
    Browse the repository at this point in the history

  3. adds bladed gloves

    @NightmareChamillian
    NightmareChamillian committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    e68f41f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. buhhhghgh

    @NightmareChamillian
    NightmareChamillian committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    9fb3177 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2022

  1. Changes some things, deletes force-spawn code

    @NightmareChamillian
    NightmareChamillian committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    17e9d00 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/NightmareChamillian/goons… 

    …tation into surplus-ops-contentbranch
    @NightmareChamillian
    NightmareChamillian committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    50006a1 View commit details
    Browse the repository at this point in the history

  3. adds brawnen, microphaser, and mts255

    @NightmareChamillian
    NightmareChamillian committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    0f536bd View commit details
    Browse the repository at this point in the history

  4. updates gun paths to new standards, adds to defensive

    @NightmareChamillian
    NightmareChamillian committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    b564e3a View commit details
    Browse the repository at this point in the history

  5. forgot to actually impliment the defensive utility

    @NightmareChamillian
    NightmareChamillian committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    ce3454e View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. fixes the spawners

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    27e1b09 View commit details
    Browse the repository at this point in the history

  2. begins finalizing the process

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    7fc2847 View commit details
    Browse the repository at this point in the history

  3. organization!

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    12c707c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/NightmareChamillian/goons… 

    …tation into halberd
    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    0776819 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'halberd' of https://github.com/NightmareChamillian/goon… 

    …station into surplus-ops-contentbranch
    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    8589a5d View commit details
    Browse the repository at this point in the history

  6. sorts the halberd

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    d60c748 View commit details
    Browse the repository at this point in the history

  7. oops

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    bfac92c View commit details
    Browse the repository at this point in the history

  8. guh

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    cde75fb View commit details
    Browse the repository at this point in the history

  9. fix config

    @NightmareChamillian
    NightmareChamillian committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    a66905b View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2022

  1. undoes admin.txt

    @NightmareChamillian
    NightmareChamillian committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    b67e5e2 View commit details
    Browse the repository at this point in the history

  2. moves auth computer and portal to better files

    @NightmareChamillian
    NightmareChamillian committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    82cbf05 View commit details
    Browse the repository at this point in the history

  3. deletes surplus ops shuttle from z2

    @NightmareChamillian
    NightmareChamillian committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    3340142 View commit details
    Browse the repository at this point in the history

  4. removes stray changes

    @NightmareChamillian
    NightmareChamillian committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    d7bf7c2 View commit details
    Browse the repository at this point in the history

  5. oops, halberd shouldn't be in there (yet)

    @NightmareChamillian
    NightmareChamillian committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    73dd485 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2022

  1. removes nukie exclusive weapons and AKM

    @NightmareChamillian
    NightmareChamillian committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    913486e View commit details
    Browse the repository at this point in the history

  2. Pirate trader -> syndicate quartermaster

    @NightmareChamillian
    NightmareChamillian committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    a8e7e40 View commit details
    Browse the repository at this point in the history

  3. forgot to include proper description change

    @NightmareChamillian
    NightmareChamillian committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    628fe3b View commit details
    Browse the repository at this point in the history

  4. purges remaining rifle ammo code

    @NightmareChamillian
    NightmareChamillian committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    eb81174 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. applies some suggestions, more thematic shifts

    @NightmareChamillian
    NightmareChamillian committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    f741474 View commit details
    Browse the repository at this point in the history

  2. renames file

    @NightmareChamillian
    NightmareChamillian committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    640304f View commit details
    Browse the repository at this point in the history

  3. per sord's request, antag threshold

    @NightmareChamillian
    NightmareChamillian committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    7b57f10 View commit details
    Browse the repository at this point in the history

  4. typo on admin message

    @NightmareChamillian
    NightmareChamillian committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    22d3625 View commit details
    Browse the repository at this point in the history