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

Remove cyborg antagonist roles on death #17215

Merged
merged 6 commits into from
Dec 6, 2023
Merged

Remove cyborg antagonist roles on death #17215

merged 6 commits into from
Dec 6, 2023

Commits on Dec 4, 2023

  1. Uniform handling of cyborg antagonist roles: 

    * Roles persist after the death of a cyborg - good for the crew credits.
* Roles are removed if the new body is not emagged/syndicate.
    @DasBrain
    DasBrain committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9bc66b1 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'master' into antagcyborgs

    @DasBrain
    DasBrain committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    966ee45 View commit details
    Browse the repository at this point in the history

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

    …nto antagcyborgs

# Conflicts:
#	code/mob/living/silicon/robot.dm
#	code/modules/antagonists/syndicate_cyborg/syndicate_cyborg.dm
    @DasBrain
    DasBrain committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    fb0bd7c View commit details
    Browse the repository at this point in the history

  3. More paranoia. 

    Giving out the equipment again should link to the right rack in (hopefully) all cases.
    @DasBrain
    DasBrain committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    df3c9b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Finally fix no on-death antag removal for cyborgs.

    @DasBrain
    DasBrain committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    b99f890 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into antagcyborgs

    @DasBrain
    DasBrain committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    2bbbf80 View commit details
    Browse the repository at this point in the history