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

Oppressor cooldown changes #5154

Merged
merged 11 commits into from
Dec 8, 2023
Merged

Oppressor cooldown changes #5154

merged 11 commits into from
Dec 8, 2023

Commits on Dec 7, 2023

  1. number changes

    InsaneRed committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    16920eb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master

    @Red-byte3D
    Red-byte3D authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    de0f09a View commit details
    Browse the repository at this point in the history

  3. fixed for the cd reduction

    InsaneRed committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    9676a4c View commit details
    Browse the repository at this point in the history

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

    InsaneRed committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c7e637f View commit details
    Browse the repository at this point in the history

  5. Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/… 

    …praetorian_abilities.dm

Co-authored-by: Birdtalon <[email protected]>
    @Red-byte3D @Birdtalon
    Red-byte3D and Birdtalon authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    47af0fe View commit details
    Browse the repository at this point in the history

  6. Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/… 

    …praetorian_abilities.dm

Co-authored-by: Birdtalon <[email protected]>
    @Red-byte3D @Birdtalon
    Red-byte3D and Birdtalon authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    2c1a4bd View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. 2 decis

    InsaneRed committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    df7d42c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master

    @Red-byte3D
    Red-byte3D authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    d889dac View commit details
    Browse the repository at this point in the history

  3. tweaks and a bug fix

    InsaneRed committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    c183726 View commit details
    Browse the repository at this point in the history

  4. thiscompilesatleast

    InsaneRed committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    92bf9a2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into master

    @Red-byte3D
    Red-byte3D authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    4c393aa View commit details
    Browse the repository at this point in the history