cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 14:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #584 from skull132/master

Browse Source 
Skull's Things, 03JUN2015
This commit is contained in:
skull132
2015-06-03 16:50:04 +03:00
parent e6bfbebeed 2921ab37c4
commit bda102ec88
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+6
View File
@@ -492,6 +492,8 @@
if(istype(wear_id, /obj/item/weapon/storage/wallet))
var/obj/item/weapon/storage/wallet/Wallet = wear_id
ID = Wallet.GetID()
if(istype(wear_id, /obj/item/weapon/card/id))
ID = wear_id
if(!ID)
return if_no_id
return ID.rank ? ID.rank : if_no_job
@@ -509,6 +511,8 @@
if(istype(wear_id, /obj/item/weapon/storage/wallet))
var/obj/item/weapon/storage/wallet/Wallet = wear_id
ID = Wallet.GetID()
if(istype(wear_id, /obj/item/weapon/card/id))
ID = wear_id
if(!ID)
return if_no_id
return ID.assignment ? ID.assignment : if_no_job
@@ -526,6 +530,8 @@
if(istype(wear_id, /obj/item/weapon/storage/wallet))
var/obj/item/weapon/storage/wallet/Wallet = wear_id
ID = Wallet.GetID()
if(istype(wear_id, /obj/item/weapon/card/id))
ID = wear_id
if(!ID)
return if_no_id
return ID.registered_name