Merge branch 'meta-drone-fix' of https://github.com/DexeeXI/Monkestat…

…ion2.0 into meta-drone-fix
Monkestation · Apr 21, 2024 · 3be9186 · 3be9186
2 parents 6413b1f + 152749d
commit 3be9186
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-1663.yml 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."
diff --git a/monkestation/code/modules/antagonists/battlecruiser/battlecruiser.dm 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
@@ -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"