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

Xeno Alliance Announcements + Greeno Civil War #3990

Merged
merged 40 commits into from
Jul 28, 2023
Merged

Xeno Alliance Announcements + Greeno Civil War #3990

merged 40 commits into from
Jul 28, 2023

Commits on Jul 24, 2023

  1. test

    @ihatethisengine
    ihatethisengine committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f662e58 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. many changes

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    4d46b45 View commit details
    Browse the repository at this point in the history

  2. final?

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    0328500 View commit details
    Browse the repository at this point in the history

  3. ohhh

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    6f066b2 View commit details
    Browse the repository at this point in the history

  4. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: Drathek <[email protected]>
    @ihatethisengine @Drulikar
    ihatethisengine and Drulikar committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    9d41561 View commit details
    Browse the repository at this point in the history

  5. fixes

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    824eedb View commit details
    Browse the repository at this point in the history

  6. tgui_alert

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    7b5bb00 View commit details
    Browse the repository at this point in the history

  7. corrupted

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    2335569 View commit details
    Browse the repository at this point in the history

  8. bug bad

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3883159 View commit details
    Browse the repository at this point in the history

  9. renegade proper ally check

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    6f49e80 View commit details
    Browse the repository at this point in the history

  10. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: Drathek <[email protected]>
    @ihatethisengine @Drulikar
    ihatethisengine and Drulikar committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    b607f50 View commit details
    Browse the repository at this point in the history

  11. allies

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d602bb3 View commit details
    Browse the repository at this point in the history

  12. renegade iff

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    c16f4a2 View commit details
    Browse the repository at this point in the history

  13. More IFF stuff

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3f1addf View commit details
    Browse the repository at this point in the history

  14. no facehuggers

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    38e46ee View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into hivewars

    @ihatethisengine
    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    224aca0 View commit details
    Browse the repository at this point in the history

  16. hivemind nerf

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    271586e View commit details
    Browse the repository at this point in the history

  17. eh

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    918491e View commit details
    Browse the repository at this point in the history

  18. new check

    ihatethisengine committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3f1b338 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. heal off weeds

    ihatethisengine committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    d5568e0 View commit details
    Browse the repository at this point in the history

  2. fx

    ihatethisengine committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    1b175ff View commit details
    Browse the repository at this point in the history

  3. no heal off weeds

    ihatethisengine committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    947dd1e View commit details
    Browse the repository at this point in the history

  4. revert 

    oops
    ihatethisengine committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4c51ba0 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

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

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    6d0ed5c View commit details
    Browse the repository at this point in the history

  2. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    defa311 View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    35a3d2c View commit details
    Browse the repository at this point in the history

  4. Update code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    58e72b0 View commit details
    Browse the repository at this point in the history

  5. Update code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    df3d75f View commit details
    Browse the repository at this point in the history

  6. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c86c4ae View commit details
    Browse the repository at this point in the history

  7. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0e991d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

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

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    ff20304 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    982352b View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    0a90371 View commit details
    Browse the repository at this point in the history

  4. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    98ff8ce View commit details
    Browse the repository at this point in the history

  5. Update code/modules/mob/living/carbon/xenomorph/xeno_defines.dm 

    Co-authored-by: harryob <[email protected]>
    @ihatethisengine @harryob
    ihatethisengine and harryob committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    6d44221 View commit details
    Browse the repository at this point in the history

  6. +hrp

    ihatethisengine committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    ef631bc View commit details
    Browse the repository at this point in the history

  7. ++hrp

    ihatethisengine committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    3917a3a View commit details
    Browse the repository at this point in the history

  8. fixes

    ihatethisengine committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    6ef551d View commit details
    Browse the repository at this point in the history

  9. Apply suggestions from code review 

    Co-authored-by: Drathek <[email protected]>
    @ihatethisengine @Drulikar
    ihatethisengine and Drulikar committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    cf36f2e View commit details
    Browse the repository at this point in the history

  10. Apply suggestions from code review 

    Co-authored-by: Drathek <[email protected]>
    @ihatethisengine @Drulikar
    ihatethisengine and Drulikar committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    c706241 View commit details
    Browse the repository at this point in the history