From 3312bfb1fc4b6366b8a2c05d155f42bfb91cf1a2 Mon Sep 17 00:00:00 2001
From: GuppyLaxx <25938722+GuppyLaxx@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:38:25 -0400
Subject: [PATCH] Makes command immune to FAMILIES (#2175)

* Makes command immune to FAMILIES

* makes blueshield immune
---
 code/game/gamemodes/gang/gang_things.dm            |  4 ++--
 .../modules/antagonists/code/gamemodes.dm          |  3 +++
 .../modules/antagonists/code/gang_things.dm        | 14 ++++++++++++++
 tgstation.dme                                      |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 modular_skyrat/modules/antagonists/code/gang_things.dm

diff --git a/code/game/gamemodes/gang/gang_things.dm b/code/game/gamemodes/gang/gang_things.dm
index 9a3bbfa70b6..4491dde95c0 100644
--- a/code/game/gamemodes/gang/gang_things.dm
+++ b/code/game/gamemodes/gang/gang_things.dm
@@ -12,9 +12,9 @@
 
 /obj/item/gang_induction_package/attack_self(mob/living/user)
 	..()
-	if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
+	/*if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
 		to_chat(user, "You attended a seminar on not signing up for a gang and are not interested.")
-		return
+		return*/
 	if(user.mind.has_antag_datum(/datum/antagonist/ert/families))
 		to_chat(user, "As a police officer, you can't join this family. However, you pretend to accept it to keep your cover up.")
 		for(var/threads in team_to_use.free_clothes)
diff --git a/modular_skyrat/modules/antagonists/code/gamemodes.dm b/modular_skyrat/modules/antagonists/code/gamemodes.dm
index 5ce91cd8b6a..ad1c421aac9 100644
--- a/modular_skyrat/modules/antagonists/code/gamemodes.dm
+++ b/modular_skyrat/modules/antagonists/code/gamemodes.dm
@@ -13,6 +13,9 @@
 /datum/game_mode/heretics
 	protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 
+/datum/game_mode/gang
+	protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //i hate whoever just copy pasted this a bunch of times
+
 /datum/dynamic_ruleset/roundstart/traitor
 	protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 
diff --git a/modular_skyrat/modules/antagonists/code/gang_things.dm b/modular_skyrat/modules/antagonists/code/gang_things.dm
new file mode 100644
index 00000000000..7717ced7d6c
--- /dev/null
+++ b/modular_skyrat/modules/antagonists/code/gang_things.dm
@@ -0,0 +1,14 @@
+/obj/item/gang_induction_package/attack_self(mob/living/user)
+	if(user.mind.assigned_role in GLOB.command_positions)
+		to_chat(user, "Joining a gang would hurt profits, wouldn't it? Central wouldn't be happy.")
+		user.emote("shake")
+		return
+	if(user.mind.assigned_role == "Blueshield")
+		to_chat(user, "It'd be a terrible idea. What about the Heads of Staff?")
+		user.emote("shake")
+		return
+	if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
+		to_chat(user, "You attended a seminar on not signing up for a gang and are not interested.")
+		user.emote("shake")
+		return
+	..()
diff --git a/tgstation.dme b/tgstation.dme
index e4ccc0989fa..d7582582cdd 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3404,6 +3404,7 @@
 #include "modular_skyrat\modules\ambitions\code\antag_datums.dm"
 #include "modular_skyrat\modules\ambitions\code\mind.dm"
 #include "modular_skyrat\modules\antagonists\code\gamemodes.dm"
+#include "modular_skyrat\modules\antagonists\code\gang_things.dm"
 #include "modular_skyrat\modules\antagonists\code\modules\uplink\uplink_items.dm"
 #include "modular_skyrat\modules\autotransfer\code\autotransfer.dm"
 #include "modular_skyrat\modules\autotransfer\code\autotransfer_config.dm"