From 75b5cf0b1e2f12980b0beb6a536f73e641319caa Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Sat, 9 May 2015 15:36:04 +0100
Subject: [PATCH] Acting jobs now sort with non-acting jobs on the manifest.

---
 code/defines/obj.dm                              | 15 +++++++++++++--
 html/changelogs/GinjaNinja32_acting_manifest.yml |  5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/GinjaNinja32_acting_manifest.yml

diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index e105d67a5b4..a70822942fe 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -80,7 +80,8 @@
 	for(var/datum/data/record/t in data_core.general)
 		var/name = t.fields["name"]
 		var/rank = t.fields["rank"]
-		var/real_rank = t.fields["real_rank"]
+		var/real_rank = make_list_rank(t.fields["real_rank"])
+
 		if(OOC)
 			var/active = 0
 			for(var/mob/M in player_list)
@@ -165,6 +166,15 @@
 	return dat
 
 
+/var/list/acting_rank_prefixes = list("acting", "temporary", "interim")
+
+/proc/make_list_rank(rank)
+	for(var/prefix in acting_rank_prefixes)
+		if(findtext(rank, "[prefix] ", 1, 2+length(prefix)))
+			return copytext(rank, 2+length(prefix))
+	return rank
+
+
 /*
 We can't just insert in HTML into the nanoUI so we need the raw data to play with.
 Instead of creating this list over and over when someone leaves their PDA open to the page
@@ -189,7 +199,8 @@ var/global/ManifestJSON
 	for(var/datum/data/record/t in data_core.general)
 		var/name = sanitize(t.fields["name"])
 		var/rank = sanitize(t.fields["rank"])
-		var/real_rank = t.fields["real_rank"]
+		var/real_rank = make_list_rank(t.fields["real_rank"])
+
 		var/isactive = t.fields["p_stat"]
 		var/department = 0
 		var/depthead = 0 			// Department Heads will be placed at the top of their lists.
diff --git a/html/changelogs/GinjaNinja32_acting_manifest.yml b/html/changelogs/GinjaNinja32_acting_manifest.yml
new file mode 100644
index 00000000000..18f2dd32e62
--- /dev/null
+++ b/html/changelogs/GinjaNinja32_acting_manifest.yml
@@ -0,0 +1,5 @@
+author: GinjaNinja32
+delete-after: True
+
+changes: 
+  - rscadd: "Acting jobs on the manifest will now sort with their non-acting counterparts. All assignments beginning with the word 'acting', 'temporary', or 'interim' will do this."