Fixed radios not working if you have a PDA in your wear_id slot.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@597 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-12-12 21:33:43 +00:00
parent 2a7bbec0a7
commit 20cbb1b800
3 changed files with 13 additions and 8 deletions
+3 -1
View File
@@ -1063,7 +1063,9 @@ Code:
if(emptyHand)
src.id.DblClick()
src.id = null
if(!istype(src.id.loc, /obj/item/device/pda))
src.id = null
// src.id.loc = src.loc
// else if (istype(src.loc, /turf)) src.id.loc = src.loc
else
+5 -4
View File
@@ -147,12 +147,13 @@ Frequency:
if (istype(M, /mob/living/carbon))
if (M:wear_id)
var/obj/item/weapon/card/id/id
var/id
if (istype(M:wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = M:wear_id
id = pda.id
else id = M:wear_id
if (id.assignment) eqjobname = M:wear_id:assignment
if (pda.id) id = pda.id.assignment
else id = pda.ownjob
else id = M:wear_id.assignment
if (id) eqjobname = id
else eqjobname = "No job"
else
eqjobname = "No id"