From a38973ece8bb6fbfcd1c722f43e1531532ba62b3 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 30 May 2017 15:44:41 -0500
Subject: [PATCH] commit

---
 code/game/gamemodes/gang/gang.dm         | 14 ++++++++++++++
 code/game/gamemodes/gang/gang.dm.rej     | 10 ----------
 code/game/gamemodes/gang/recaller.dm     |  3 +++
 code/game/gamemodes/gang/recaller.dm.rej | 10 ----------
 code/modules/jobs/job_types/job.dm.rej   | 12 ------------
 5 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 code/game/gamemodes/gang/gang.dm.rej
 delete mode 100644 code/game/gamemodes/gang/recaller.dm.rej
 delete mode 100644 code/modules/jobs/job_types/job.dm.rej

diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index bb4bf455dc..f32fc80d61 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -261,6 +261,20 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather,/
 		gang_bosses += G.bosses
 	return gang_bosses
 
+/datum/game_mode/proc/shuttle_check()
+	if(SSshuttle.emergencyNoRecall)
+		return
+	var/alive = 0
+	for(var/mob/living/L in GLOB.player_list)
+		if(L.stat != DEAD)
+			alive++
+
+	if((alive < (GLOB.joined_player_list.len * 0.4)) && ((SSshuttle.emergency.timeLeft(1) > (SSshuttle.emergencyCallTime * 0.4))))
+
+		SSshuttle.emergencyNoRecall = TRUE
+		SSshuttle.emergency.request(null, set_coefficient = 0.4)
+		priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.")
+
 /proc/determine_domination_time(var/datum/gang/G)
 	return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
 
diff --git a/code/game/gamemodes/gang/gang.dm.rej b/code/game/gamemodes/gang/gang.dm.rej
deleted file mode 100644
index 08b8203c13..0000000000
--- a/code/game/gamemodes/gang/gang.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm	(rejected hunks)
-@@ -259,7 +259,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
- 	for(var/mob/living/L in GLOB.player_list)
- 		if(L.stat != DEAD)
- 			alive++
--	if((alive < LAZYLEN(GLOB.joined_player_list) * 0.4) && (SSshuttle.emergency.timeLeft(1) < (SSshuttle.emergencyCallTime * 0.4)))
-+	if((alive < (GLOB.joined_player_list.len * 0.4)) && (SSshuttle.emergency.timeLeft(1) < (SSshuttle.emergencyCallTime * 0.4)))
- 		SSshuttle.emergencyNoRecall = TRUE
- 		SSshuttle.emergency.request(null, set_coefficient = 0.4)
- 		priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.")
diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index 1ac08a7e99..8363261c5d 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -167,6 +167,9 @@
 	if(!can_use(user))
 		return 0
 
+	if(SSshuttle.emergencyNoRecall)
+		return 0
+
 	if(recalling)
 		to_chat(usr, "<span class='warning'>Error: Recall already in progress.</span>")
 		return 0
diff --git a/code/game/gamemodes/gang/recaller.dm.rej b/code/game/gamemodes/gang/recaller.dm.rej
deleted file mode 100644
index 1c7b030c48..0000000000
--- a/code/game/gamemodes/gang/recaller.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm	(rejected hunks)
-@@ -165,7 +165,7 @@
- 	if(!can_use(user))
- 		return 0
- 		
--	if(SSticker.mode.forced_shuttle)
-+	if(SSshuttle.emergencyNoRecall)
- 		return 0
- 
- 	if(recalling)
diff --git a/code/modules/jobs/job_types/job.dm.rej b/code/modules/jobs/job_types/job.dm.rej
deleted file mode 100644
index c34e09ddc7..0000000000
--- a/code/modules/jobs/job_types/job.dm.rej
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm	(rejected hunks)
-@@ -156,7 +156,9 @@
- 		else
- 			back = backpack //Department backpack
- 
--	if(backpack_contents && box)
-+	if(box)
-+		if(!backpack_contents)
-+			backpack_contents = list()
- 		backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
- 		backpack_contents[box] = 1
-