Added PDA check in wear_id slot to get any potential id rank.

This commit is contained in:
Mark Aherne
2014-07-19 02:12:27 -04:00
committed by ZomgPonies
parent 8ddf65012c
commit de81fdd4ac
2 changed files with 60 additions and 4 deletions
+12 -4
View File
@@ -84,10 +84,18 @@
crewmemberData["tox"] = round(H.getToxLoss(), 1)
crewmemberData["fire"] = round(H.getFireLoss(), 1)
crewmemberData["brute"] = round(H.getBruteLoss(), 1)
crewmemberData["name"] = (H.wear_id ? H.wear_id.name : "Unknown")
crewmemberData["rank"] = "Unknown"
if(H.wear_id && istype(H.wear_id, /obj/item/weapon/card/id))
crewmemberData["rank"] = H.wear_id:rank
crewmemberData["name"] = "Unknown"
crewmemberData["rank"] = "Unknown"
if(H.wear_id && istype(H.wear_id, /obj/item/weapon/card/id) )
var/obj/item/weapon/card/id/I = H.wear_id
crewmemberData["name"] = I.name
crewmemberData["rank"] = I.rank
else if(H.wear_id && istype(H.wear_id, /obj/item/device/pda) )
var/obj/item/device/pda/P = H.wear_id
crewmemberData["name"] = (P.id ? P.id.name : "Unknown")
crewmemberData["rank"] = (P.id ? P.id.rank : "Unknown")
crewmemberData["area"] = get_area(H)
crewmemberData["x"] = pos.x
crewmemberData["y"] = pos.y
+48
View File
@@ -239,6 +239,8 @@
.mapIcon16.dead {
background-image: url(uiIcons16Red.png);
}
/* Command Positions */
.mapIcon16.rank-captain {
background-position: -224px -112px;
}
@@ -258,4 +260,50 @@
background-position: -32px -128px;
}
/* Engineering Positions */
.mapIcon16.rank-stationengineer {
background-position: -176px -112px;
}
.mapIcon16.rank-atmospherictechnician {
background-position: -176px -112px;
}
/* Medical Positions */
.mapIcon16.rank-medicaldoctor {
background-position: -32px -128px;
}
.mapIcon16.rank-geneticist {
background-position: -32px -128px;
}
.mapIcon16.rank-psychiatrist {
background-position: -32px -128px;
}
.mapIcon16.rank-chemist {
background-position: -32px -128px;
}
/* Science Positions */
.mapIcon16.rank-scientist {
background-position: -128px -128px;
}
.mapIcon16.rank-geneticist {
background-position: -128px -128px;
}
.mapIcon16.rank-roboticist {
background-position: -128px -128px;
}
.mapIcon16.rank-xenobiologist {
background-position: -128px -128px;
}
/* Security Positions */
.mapIcon16.rank-warden {
background-position: -112px -128px;
}
.mapIcon16.rank-detective {
background-position: -112px -128px;
}
.mapIcon16.rank-securityofficer {
background-position: -112px -128px;
}