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/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
-