From 634f9e406cab565823d8abdfe03c0fac152faf41 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sun, 31 May 2015 23:51:40 +0300
Subject: [PATCH] Hotfix 01, 31MAY2015

* Fixes a proc crash for the three ID related procs
* DME update
---
 aurora.dme                                    | 15 ------
 code/modules/mob/living/carbon/human/human.dm | 51 ++++++++++++-------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/aurora.dme b/aurora.dme
index c7d1c3fa..c346d35e 100644
--- a/aurora.dme
+++ b/aurora.dme
@@ -50,21 +50,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "nano"
 #define FILE_DIR "nano/images"
-#define FILE_DIR "Sammacs Folder"
-#define FILE_DIR "Sammacs Folder/Aurora Map"
-#define FILE_DIR "Sammacs Folder/Aurora Map/flora"
-#define FILE_DIR "Sammacs Folder/Engie Uniform"
-#define FILE_DIR "Sammacs Folder/ERT Revamp"
-#define FILE_DIR "Sammacs Folder/ERT Revamp/Equipment"
-#define FILE_DIR "Sammacs Folder/ERT Revamp/Uniform"
-#define FILE_DIR "Sammacs Folder/ERT Revamp/Uniform/Worn"
-#define FILE_DIR "Sammacs Folder/Gifs"
-#define FILE_DIR "Sammacs Folder/L7 Gun"
-#define FILE_DIR "Sammacs Folder/L7 Gun/AussecL7"
-#define FILE_DIR "Sammacs Folder/L7 Gun/AussecL7A1"
-#define FILE_DIR "Sammacs Folder/L7 Gun/AussecL7Attachments"
-#define FILE_DIR "Sammacs Folder/Medical Uniforms"
-#define FILE_DIR "Sammacs Folder/TG Download"
 #define FILE_DIR "Scopes Files"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index f9a4169a..b7e9aea9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -484,36 +484,51 @@
 
 // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc.
 /mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job")
-	if(istype(wear_id, /obj/item/device/pda))
-		var/obj/item/device/pda/PDA = wear_id
-		return PDA.ownrank
-	var/obj/item/weapon/card/id/id = wear_id.GetID()
-	if(id)
-		return id.rank ? id.rank : if_no_job
+	if(wear_id)
+		var/obj/item/weapon/card/id/ID
+		if(istype(wear_id, /obj/item/device/pda))
+			var/obj/item/device/pda/PDA = wear_id
+			ID = PDA.GetID()
+		if(istype(wear_id, /obj/item/weapon/storage/wallet))
+			var/obj/item/weapon/storage/wallet/Wallet = wear_id
+			ID = Wallet.GetID()
+		if(!ID)
+			return if_no_id
+		return ID.rank ? ID.rank : if_no_job
 	else
 		return if_no_id
 
 //gets assignment from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers
 /mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job")
-	if(istype(wear_id, /obj/item/device/pda))
-		var/obj/item/device/pda/PDA = wear_id
-		return PDA.ownjob
-	var/obj/item/weapon/card/id/id = wear_id.GetID()
-	if(id)
-		return id.assignment ? id.assignment : if_no_job
+	if(wear_id)
+		var/obj/item/weapon/card/id/ID
+		if(istype(wear_id, /obj/item/device/pda))
+			var/obj/item/device/pda/PDA = wear_id
+			ID = PDA.GetID()
+		if(istype(wear_id, /obj/item/weapon/storage/wallet))
+			var/obj/item/weapon/storage/wallet/Wallet = wear_id
+			ID = Wallet.GetID()
+		if(!ID)
+			return if_no_id
+		return ID.assignment ? ID.assignment : if_no_job
 	else
 		return if_no_id
 
 //gets name from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers
 /mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown")
-	if(istype(wear_id, /obj/item/device/pda))
-		var/obj/item/device/pda/PDA = wear_id
-		return PDA.owner
-	var/obj/item/weapon/card/id/id = wear_id.GetID()
-	if(id)
-		return id.registered_name
+	if(wear_id)
+		var/obj/item/weapon/card/id/ID
+		if(istype(wear_id, /obj/item/device/pda))
+			var/obj/item/device/pda/PDA = wear_id
+			ID = PDA.GetID()
+		if(istype(wear_id, /obj/item/weapon/storage/wallet))
+			var/obj/item/weapon/storage/wallet/Wallet = wear_id
+			ID = Wallet.GetID()
+		if(!ID)
+			return if_no_id
+		return ID.registered_name
 	else
 		return if_no_id