From 44fa91047dc1264ef41da0f4e9998a219081c93f Mon Sep 17 00:00:00 2001
From: crazyclonetheninja
 <crazyclonetheninja@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 16 Dec 2010 07:03:07 +0000
Subject: [PATCH] PDA ranks now use an existing var instead of a new one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@639 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/jobs/jobprocs.dm       |  4 ++--
 code/game/objects/devices/PDA.dm | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index f79b7f1467e..f9ad3cb3ff6 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -611,12 +611,12 @@
 		var/obj/item/device/pda/pda = src.belt
 		pda.owner = src.real_name
 		pda.ownjob = src.wear_id.assignment
-		pda.name = "PDA-[src.real_name] ([rank])"
+		pda.name = "PDA-[src.real_name] ([pda.ownjob])"
 	if (istype(src.r_store, /obj/item/device/pda))  //damned mime PDAs not starting in belt slot
 		var/obj/item/device/pda/pda = src.r_store
 		pda.owner = src.real_name
 		pda.ownjob = src.wear_id.assignment
-		pda.name = "PDA-[src.real_name] ([rank])"
+		pda.name = "PDA-[src.real_name] ([pda.ownjob])"
 
 /client/proc/mimewall()
 	set category = "Mime"
diff --git a/code/game/objects/devices/PDA.dm b/code/game/objects/devices/PDA.dm
index 0327574f144..50bcdc4e018 100644
--- a/code/game/objects/devices/PDA.dm
+++ b/code/game/objects/devices/PDA.dm
@@ -10,7 +10,6 @@
 	flags = FPRINT | TABLEPASS | ONBELT
 
 	var/owner = null
-	var/rank = null
 	var/default_cartridge = 0 // Access level defined by cartridge
 	var/obj/item/weapon/cartridge/cartridge = null //current cartridge
 	var/mode = 0 //0-10, Main menu, Crew manifest, Engine monitor, Atmos scanner, med records, notes, sec records, messenger, mop locator, signaler, status display.
@@ -1426,8 +1425,8 @@ Code:
 	else if (istype(C, /obj/item/weapon/card/id) && C:registered)
 		if(!src.owner)
 			src.owner = C:registered
-			src.rank = C:assignment
-			src.name = "PDA-[src.owner]([src.rank])"
+			src.ownjob = C:assignment
+			src.name = "PDA-[src.owner]([src.ownjob])"
 			user << "\blue Card scanned."
 			src.updateSelfDialog()
 			return
@@ -1435,13 +1434,13 @@ Code:
 			user << "\blue Name on card does not match registered name. Please try again."
 			src.updateSelfDialog()
 			return
-		if((src.owner == C:registered) && (src.rank == C:assignment))
+		if((src.owner == C:registered) && (src.ownjob == C:assignment))
 			user << "\blue Rank is up to date."
 			src.updateSelfDialog()
 			return
-		if((src.owner == C:registered) && (src.rank != C:assignment))
-			src.rank = C:assignment
-			src.name = "PDA-[src.owner]([src.rank])"
+		if((src.owner == C:registered) && (src.ownjob != C:assignment))
+			src.ownjob = C:assignment
+			src.name = "PDA-[src.owner]([src.ownjob])"
 			user << "\blue Rank updated."
 			src.updateSelfDialog()
 			return