From 3f35592f4e72227a9e48f8f0b0a00d081b3c64cc Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Thu, 18 May 2017 11:33:37 -0500
Subject: [PATCH] Gang mode sync (#933)

* Revert "Gang mode now calls a 4 minute shuttle once 60% of the crew is dead"

* gang fixes

* gang modernizations
---
 code/game/gamemodes/gang/dominator.dm  |  2 +-
 code/game/gamemodes/gang/gang.dm       | 21 ++++++++++++++-------
 code/game/gamemodes/gang/gang_datum.dm |  2 +-
 code/game/gamemodes/gang/gang_items.dm |  2 +-
 code/game/gamemodes/gang/gang_pen.dm   |  2 +-
 code/game/gamemodes/gang/recaller.dm   |  2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm
index b22052e7aa..a961ec48b1 100644
--- a/code/game/gamemodes/gang/dominator.dm
+++ b/code/game/gamemodes/gang/dominator.dm
@@ -209,4 +209,4 @@
 		gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
 		for(var/datum/gang/G in SSticker.mode.gangs)
 			if(G != gang)
-				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
+				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
\ No newline at end of file
diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index 12191ac44a..46f651d359 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -58,13 +58,19 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
 		gangs += G
 
 		//Now assign a boss for the gang
-		var/datum/mind/boss = pick(antag_candidates)
-		antag_candidates -= boss
-		G.bosses += boss
-		boss.gang_datum = G
-		boss.special_role = "[G.name] Gang Boss"
-		boss.restricted_roles = restricted_jobs
-		log_game("[boss.key] has been selected as the Boss for the [G.name] Gang")
+		for(var/n in 1 to 3)
+			var/datum/mind/boss = pick(antag_candidates)
+			antag_candidates -= boss
+			G.bosses += boss
+			boss.gang_datum = G
+			var/title
+			if(n == 1)
+				title = "Boss"
+			else
+				title = "Lieutenant"
+			boss.special_role = "[G.name] Gang [title]"
+			boss.restricted_roles = restricted_jobs
+			log_game("[boss.key] has been selected as the [title] for the [G.name] Gang")
 
 	if(gangs.len < 2) //Need at least two gangs
 		return 0
@@ -251,6 +257,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
 /proc/determine_domination_time(var/datum/gang/G)
 	return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
 
+
 //////////////////////////////////////////////////////////////////////
 //Announces the end of the game with all relavent information stated//
 //////////////////////////////////////////////////////////////////////
diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm
index 805cac552f..ba455e94e5 100644
--- a/code/game/gamemodes/gang/gang_datum.dm
+++ b/code/game/gamemodes/gang/gang_datum.dm
@@ -263,4 +263,4 @@
 	ganghud = new()
 
 /datum/gang/multiverse/income()
-	return
+	return
\ No newline at end of file
diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm
index 30eea7dbad..d626aa3b9a 100644
--- a/code/game/gamemodes/gang/gang_items.dm
+++ b/code/game/gamemodes/gang/gang_items.dm
@@ -316,4 +316,4 @@
 	return ..()
 
 /datum/gang_item/equipment/dominator/spawn_item(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool)
-	new item_path(user.loc)
+	new item_path(user.loc)
\ No newline at end of file
diff --git a/code/game/gamemodes/gang/gang_pen.dm b/code/game/gamemodes/gang/gang_pen.dm
index 621d40cc45..930c612d14 100644
--- a/code/game/gamemodes/gang/gang_pen.dm
+++ b/code/game/gamemodes/gang/gang_pen.dm
@@ -57,4 +57,4 @@
 	cooldown = 0
 	icon_state = "pen"
 	var/mob/M = get(src, /mob)
-	to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")
+	to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")
\ No newline at end of file
diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index f67bcad50a..c8c98e5d47 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -241,4 +241,4 @@
 	outfits = 1
 
 /obj/item/device/gangtool/spare/lt
-	promotable = 1
+	promotable = 1
\ No newline at end of file