From 6bba7a121bb020a165fc491c4472d93d9634b34c Mon Sep 17 00:00:00 2001 From: Lucy Date: Sun, 21 Apr 2024 17:11:07 -0400 Subject: [PATCH 1/2] Battlecruiser Allies now get the Syndicate faction (#1663) --- .../modules/antagonists/battlecruiser/battlecruiser.dm | 9 +++++++++ tgstation.dme | 1 + 2 files changed, 10 insertions(+) create mode 100644 monkestation/code/modules/antagonists/battlecruiser/battlecruiser.dm diff --git a/monkestation/code/modules/antagonists/battlecruiser/battlecruiser.dm b/monkestation/code/modules/antagonists/battlecruiser/battlecruiser.dm new file mode 100644 index 000000000000..a9863c0d5662 --- /dev/null +++ b/monkestation/code/modules/antagonists/battlecruiser/battlecruiser.dm @@ -0,0 +1,9 @@ +/datum/antagonist/battlecruiser/ally/apply_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/target = mob_override || owner.current + target.faction |= ROLE_SYNDICATE + +/datum/antagonist/battlecruiser/ally/remove_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/target = mob_override || owner.current + target.faction -= ROLE_SYNDICATE diff --git a/tgstation.dme b/tgstation.dme index 5892186d9976..248bbcef3e87 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5795,6 +5795,7 @@ #include "monkestation\code\modules\aesthetics\walls\iron.dm" #include "monkestation\code\modules\antagonists\_common\antag_datum.dm" #include "monkestation\code\modules\antagonists\_common\antag_hud.dm" +#include "monkestation\code\modules\antagonists\battlecruiser\battlecruiser.dm" #include "monkestation\code\modules\antagonists\brainwashing\brainwashing.dm" #include "monkestation\code\modules\antagonists\brainwashing\brainwashing_alert.dm" #include "monkestation\code\modules\antagonists\brainwashing\brainwashing_helpers.dm" From c9685aa1d204ca87f791aaaf602059ef72555e04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:11:51 +0000 Subject: [PATCH 2/2] Automatic changelog for PR #1663 [ci skip] --- html/changelogs/AutoChangeLog-pr-1663.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1663.yml diff --git a/html/changelogs/AutoChangeLog-pr-1663.yml b/html/changelogs/AutoChangeLog-pr-1663.yml new file mode 100644 index 000000000000..a1a85d51d7f7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1663.yml @@ -0,0 +1,4 @@ +author: "Absolucy" +delete-after: True +changes: + - qol: "Battlecruiser Allies now get the Syndicate faction, allowing them to go back with the battlecruiser crew to their base without being gunned down by turrets." \ No newline at end of file