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

Movielike Crit #335

Merged
merged 15 commits into from
Aug 28, 2024
Merged

Movielike Crit #335

merged 15 commits into from
Aug 28, 2024

Commits on Jul 20, 2024

  1. Hopefully doesnt break the ai

    @Merrgear
    Merrgear committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    724b549 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. fixes those two issues we found

    @Merrgear
    Merrgear committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    9d0e872 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    f8a1811 View commit details
    Browse the repository at this point in the history

  2. Update code/datums/components/xeno/ai_behavior_overrides/capture_over… 

    …ride_behavior.dm

Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    2e91858 View commit details
    Browse the repository at this point in the history

  3. Update code/modules/mob/living/carbon/human/human_attackhand.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    c68ab12 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. That damn UMC guy broke muh code!!!!!

    @Merrgear
    Merrgear committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    3aa87fb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into cinematic-crit

    @Merrgear
    Merrgear committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    ce66bc1 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Update code/datums/components/xeno/ai_behavior_overrides/capture_over… 

    …ride_behavior.dm

Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d0b5eb9 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/mob/living/carbon/human/human_attackhand.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    a745eee View commit details
    Browse the repository at this point in the history

  3. Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    69cf9c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. boberthastofindnewstufftocomplain

    @Merrgear
    Merrgear committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    23a6b58 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Update code/datums/effects/mob_crit/human_crit.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    79f842a View commit details
    Browse the repository at this point in the history

  2. Update code/datums/effects/pain/human_pain.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    eb96495 View commit details
    Browse the repository at this point in the history

  3. Update code/datums/effects/pain/human_pain.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    95edb35 View commit details
    Browse the repository at this point in the history

  4. Update code/modules/mob/living/carbon/human/life/handle_regular_statu… 

    …s_updates.dm

Co-authored-by: Doubleumc <[email protected]>
    @Merrgear @Doubleumc
    Merrgear and Doubleumc committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d0915f7 View commit details
    Browse the repository at this point in the history