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

[Repo] Corvax #20

Merged
merged 86 commits into from
Aug 29, 2023
Merged

[Repo] Corvax #20

merged 86 commits into from
Aug 29, 2023

Commits on Jan 14, 2023

  1. Station goals

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    d461efd View commit details
    Browse the repository at this point in the history

  2. Locale

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    e9e5a75 View commit details
    Browse the repository at this point in the history

  3. Fuck it, add everything else (chat is broke)

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    d855d84 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    552f15f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    430559d View commit details
    Browse the repository at this point in the history

  2. Remove Corvax TTS

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    dcf5965 View commit details
    Browse the repository at this point in the history

  3. remove unnecessary things

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    88ed341 View commit details
    Browse the repository at this point in the history

  4. fix

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    5456c75 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Remove SponsorSystem and Loadouts

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    ac8bf95 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    a8e1024 View commit details
    Browse the repository at this point in the history

  3. lots of cleanup

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    27e3a49 View commit details
    Browse the repository at this point in the history

  4. Slime and XenoQueen TypingIndicators

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    2918976 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. why doesnt this work..

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    7196933 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    136d4c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    31dd347 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Remove gendered last names

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    964ede5 View commit details
    Browse the repository at this point in the history

  2. Undo pacifist diona

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    f6a53a9 View commit details
    Browse the repository at this point in the history

  3. Add hijack traitor objective

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    d7fa904 View commit details
    Browse the repository at this point in the history

  4. Add colored chat names (#844)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    8883a44 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    6c2b838 View commit details
    Browse the repository at this point in the history

  6. [Resprite] Singularity stuff (#320) 

    * Update containment field sprite

* Update 1 level singularity sprite

* Update 3 level singularity sprite

* Fix sprite sizes

* Fix sprite state name

* Update 4 level singularity sprite

* Fix sprite size

* Update 5 level singularity sprite

* Update level 6 singularity sprite

* Remove 6 level sprite of singularity

* Remove 6 level meta.json

* Add level 6 singularity custom sprite

* Update containment generator sprites

* Remake emitter with new sprites

* Update collector sprites

* New emitter sprite files

* Update level 6 singularity sprite

* Update license singularity level 6

* Decrease singularity to 20 fps
    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9b56571 View commit details
    Browse the repository at this point in the history

  7. [Resprite] Syndicate EVA (#694) 

    Co-authored-by: Morbo <[email protected]>
    @nomad0260 @Morb0 @DEATHB4DEFEAT
    2 people authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    fb22c18 View commit details
    Browse the repository at this point in the history

  8. [Resprite] Paramed hardsuit (#706)

    @nomad0260 @DEATHB4DEFEAT
    nomad0260 authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    59d76b2 View commit details
    Browse the repository at this point in the history

  9. [Resprite] ERT

    @nomad0260 @DEATHB4DEFEAT
    nomad0260 authored and DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    85d1ea4 View commit details
    Browse the repository at this point in the history

  10. debug

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    26a1e0a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    f1fd9c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. merge remote branch 'master' of https://github.com/Park-Station/Parks… 

    …tation
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    8b33538 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. Merge branch 'master' into corvax

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    d09d6fc View commit details
    Browse the repository at this point in the history

  2. works

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    4cbb560 View commit details
    Browse the repository at this point in the history

  3. [Resprite] Intercom (#897)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    df7b148 View commit details
    Browse the repository at this point in the history

  4. Shotgun more sounds

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    15bc0e6 View commit details
    Browse the repository at this point in the history

  5. Discord linking

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    3262e53 View commit details
    Browse the repository at this point in the history

  6. Add field with auth url (#975)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    a4801cf View commit details
    Browse the repository at this point in the history

  7. Add lobby arts (#976)

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    5744d77 View commit details
    Browse the repository at this point in the history

  8. Psychologist stamp

    @fedKotikeD @DEATHB4DEFEAT
    fedKotikeD authored and DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    c61a320 View commit details
    Browse the repository at this point in the history

  9. loc

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    4085b23 View commit details
    Browse the repository at this point in the history

  10. fixing the things

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    72ac7b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    f4c178b View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. Merge branch 'master' into corvax

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    42a9fe1 View commit details
    Browse the repository at this point in the history

  2. Revert "Add colored chat names (#844)" 

    This reverts commit 8883a44.
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    bea6a94 View commit details
    Browse the repository at this point in the history

  3. Improve station goals system

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    43d4de4 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Bunch of resprites (#996)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed May 3, 2023
    Configuration menu
    Copy the full SHA
    2935acd View commit details
    Browse the repository at this point in the history

  2. Update lamp plushie sprite (#1006)

    @lzk228 @DEATHB4DEFEAT
    lzk228 authored and DEATHB4DEFEAT committed May 3, 2023
    Configuration menu
    Copy the full SHA
    f96e1d0 View commit details
    Browse the repository at this point in the history

  3. [Add] Captain's and HoP's clothing (#1030)

    @JerryImMouse @DEATHB4DEFEAT
    JerryImMouse authored and DEATHB4DEFEAT committed May 3, 2023
    Configuration menu
    Copy the full SHA
    17021b3 View commit details
    Browse the repository at this point in the history

  4. remove extra localization files (fix plants)

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed May 3, 2023
    Configuration menu
    Copy the full SHA
    a28c3da View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. yaml linter fix

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed May 4, 2023
    Configuration menu
    Copy the full SHA
    8749233 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. Revert "Add hijack traitor objective" 

    This reverts commit d7fa904.
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed May 7, 2023
    Configuration menu
    Copy the full SHA
    8da8553 View commit details
    Browse the repository at this point in the history

  2. Revert "[Resprite] Paramed hardsuit (#706)" 

    This reverts commit 59d76b2.
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed May 7, 2023
    Configuration menu
    Copy the full SHA
    b208c48 View commit details
    Browse the repository at this point in the history

  3. goal cvar

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed May 7, 2023
    Configuration menu
    Copy the full SHA
    56307cb View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. Merge branch 'master' into corvax 

    # Conflicts:
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/typing_indicator.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    3c1d3d1 View commit details
    Browse the repository at this point in the history

  2. review

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    09fb337 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Merge branch 'master' of https://github.com/Park-station/Parkstation … 

    …into corvax
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    d30b8f4 View commit details
    Browse the repository at this point in the history

  2. remove unwanted lobby screens

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    1395817 View commit details
    Browse the repository at this point in the history

  3. what

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    db24325 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. fix the oracle having a stroke whenever it barks

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    08d635e View commit details
    Browse the repository at this point in the history

  2. fix moth typing indicator

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    f7d1f75 View commit details
    Browse the repository at this point in the history

  3. fix funky rsi metas

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    cb2feeb View commit details
    Browse the repository at this point in the history

  4. fix moth typing indicator

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    999afbf View commit details
    Browse the repository at this point in the history

  5. barking doesn't shatter the fabric of reality

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a633e30 View commit details
    Browse the repository at this point in the history

  6. typing indicator also doesn't shatter reality but who cares

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    61a1b4d View commit details
    Browse the repository at this point in the history

  7. fix central command stamps on station goals

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    b4a1c16 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. more station goals

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    b5498b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into corvax 

    # Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    2cd00c9 View commit details
    Browse the repository at this point in the history

  3. fix station goal paper formatting

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    46d176e View commit details
    Browse the repository at this point in the history

  4. remove bank goal

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    e92f196 View commit details
    Browse the repository at this point in the history

  5. add date/station to station goals

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    de8aac4 View commit details
    Browse the repository at this point in the history

  6. Diagonal wall resprite (#1130) 

    Co-authored-by: faint <[email protected]>
    @SonicHDC @ficcialfaint @DEATHB4DEFEAT
    2 people authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    1abadc0 View commit details
    Browse the repository at this point in the history

  7. Added directional sprites for lamps (#1047)

    @SonicHDC @DEATHB4DEFEAT
    SonicHDC authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    0a63511 View commit details
    Browse the repository at this point in the history

  8. [Resprite] Ammo machine redisign (#873)

    @SonicHDC @DEATHB4DEFEAT
    SonicHDC authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    024a6fe View commit details
    Browse the repository at this point in the history

  9. [Resprite] Cans (#1365)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    56450f2 View commit details
    Browse the repository at this point in the history

  10. [Resprite] ERT helmets (#1352)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    a9e9905 View commit details
    Browse the repository at this point in the history

  11. [Resprite] Atmospheric backpacks (#1235)

    @lzk228 @DEATHB4DEFEAT
    lzk228 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    1648e41 View commit details
    Browse the repository at this point in the history

  12. [Resprite] Meson & thermal glasses icon (#1225)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    58d9fc5 View commit details
    Browse the repository at this point in the history

  13. Coats, cloaks and captain mask resprite (#1134)

    @mhamsterr @DEATHB4DEFEAT
    mhamsterr authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    d3162cc View commit details
    Browse the repository at this point in the history

  14. Mailing resprite (#1117)

    @SonicHDC @DEATHB4DEFEAT
    SonicHDC authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    162b895 View commit details
    Browse the repository at this point in the history

  15. [Resprite] Better tanks (#1095) 

    Co-authored-by: lzk228 <[email protected]>
Co-authored-by: faint <[email protected]>
    @SonicHDC @lzk228
    @ficcialfaint @DEATHB4DEFEAT
    3 people authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5668cdf View commit details
    Browse the repository at this point in the history

  16. [Resprite] Uranium windows (#1089)

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    c38c115 View commit details
    Browse the repository at this point in the history

  17. [Resprite] Ore & hydro bag inhand (#1059)

    @lzk228 @DEATHB4DEFEAT
    lzk228 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    6ace299 View commit details
    Browse the repository at this point in the history

  18. [Resprite] Chairs (#887)

    @Morb0 @DEATHB4DEFEAT
    Morb0 authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    1746263 View commit details
    Browse the repository at this point in the history

  19. remove extra locale from cherry picks

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    44900f8 View commit details
    Browse the repository at this point in the history

  20. fix banana lamp

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5724532 View commit details
    Browse the repository at this point in the history

  21. fix advertisements

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    0a5da39 View commit details
    Browse the repository at this point in the history

  22. [Resprite] Fax and gas canisters (#659)

    @RomanMinaev @DEATHB4DEFEAT
    RomanMinaev authored and DEATHB4DEFEAT committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    e1f2537 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. [Resprite] Melee weapon (#883)

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8def667 View commit details
    Browse the repository at this point in the history

  2. fix chat again

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    f45e4ef View commit details
    Browse the repository at this point in the history

  3. enable queue

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    488a774 View commit details
    Browse the repository at this point in the history