From 7df0181e60ee70971f86d47c810d4c970a61f186 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Tue, 7 Feb 2012 16:53:03 +0200 Subject: [PATCH] Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity --- baystation12.dme | 3 +- code/defines/obj/weapon.dm | 48 +++++++++---------- code/defines/procs/helpers.dm | 4 +- code/game/jobs/job_controller.dm | 8 ++-- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- code/game/machinery/computer/id.dm | 12 ++--- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/objects/closets/secure/personal.dm | 10 ++-- code/game/objects/devices/PDA/PDA.dm | 14 +++--- code/game/objects/items/weapons/cards_ids.dm | 4 +- code/game/response_team.dm | 2 +- code/game/supplyshuttle.dm | 4 +- code/modules/admin/verbs/debug.dm | 16 +++---- code/modules/admin/verbs/onlyone.dm | 2 +- code/modules/admin/verbs/striketeam.dm | 2 +- .../admin/verbs/striketeam_syndicate.dm | 2 +- code/modules/clothing/glasses/hud.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 14 +++--- code/modules/mob/living/silicon/pai/hud.dm | 2 +- 25 files changed, 83 insertions(+), 82 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 3d325141d4c..e179fa09ade 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -518,9 +518,10 @@ #include "code\game\machinery\computer\crew.dm" #include "code\game\machinery\computer\explosive.dm" #include "code\game\machinery\computer\hologram.dm" +#include "code\game\machinery\computer\id.dm" #include "code\game\machinery\computer\lockdown.dm" #include "code\game\machinery\computer\medical.dm" -#include "code\game\machinery\computer\Operating.dm" +#include "code\game\machinery\computer\operating.dm" #include "code\game\machinery\computer\power.dm" #include "code\game\machinery\computer\robot.dm" #include "code\game\machinery\computer\security.dm" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 324e5705c3b..91512755fcc 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -430,7 +430,7 @@ /obj/item/weapon/card/data name = "data disk" - desc = "A disk of data." + desc = "A disk with data." icon_state = "data" var/function = "storage" var/data = "null" @@ -450,7 +450,7 @@ icon_state = "id" item_state = "card-id" var/access = list() - var/registered = null + var/registered_name = null // The name registered on the card var/assignment = null var/obj/item/weapon/photo/PHOTO = null var/over_jumpsuit = 1 // If set to 0, it won't display on top of the mob's jumpsuit @@ -458,10 +458,30 @@ /obj/item/weapon/card/id/gold name = "identification card" - desc = "A golden card which shows power and might." + desc = "A golden identification card." icon_state = "gold" item_state = "gold_id" +/obj/item/weapon/card/id/captains_spare + name = "Captain's spare ID" + icon_state = "gold" + item_state = "gold_id" + registered_name = "Captain" + assignment = "Captain" + New() + access = get_access("Captain") + ..() + +/obj/item/weapon/card/id/centcom + name = "CentCom ID" + desc = "An ID straight from Cent. Com." + icon_state = "centcom" + registered_name = "Central Command" + assignment = "General" + New() + access = get_all_centcom_access() + ..() + /obj/item/weapon/card/id/syndicate name = "agent card" desc = "Shhhhh." @@ -471,30 +491,10 @@ /obj/item/weapon/card/id/syndicate_command name = "Syndicate ID card" desc = "An ID straight from the Syndicate." - registered = "Syndicate" + registered_name = "Syndicate" assignment = "Syndicate Overlord" access = list(access_syndicate) -/obj/item/weapon/card/id/captains_spare - name = "Captain's spare ID" - desc = "The spare ID of the High Lord himself." - icon_state = "gold" - item_state = "gold_id" - registered = "Captain" - assignment = "Captain" - New() - access = get_access("Captain") - ..() - -/obj/item/weapon/card/id/centcom - name = "CentCom ID" - desc = "An ID straight from Cent. Com." - icon_state = "centcom" - registered = "Central Command" - assignment = "General" - New() - access = get_all_centcom_access() - ..() /obj/item/weapon/cleaner desc = "Space Cleaner!" diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index b85669488ee..6ee01b884fc 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -685,7 +685,7 @@ Turf and target are seperate in case you want to teleport some distance from a t M.real_name = newname M.name = newname -/proc/clname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea +/*/proc/clname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea var/randomname = pick(clown_names) var/newname = input(M,"You are the clown. Would you like to change your name to something else?", "Name change",randomname) var/oldname = M.real_name @@ -725,7 +725,7 @@ Turf and target are seperate in case you want to teleport some distance from a t if(id.registered == oldname) id.registered = newname id.name = "[id.registered]'s ID Card ([id.assignment])" - break + break*/ /proc/ionnum() return "[pick("!","@","#","$","%","^","&","*")][pick(pick("!","@","#","$","%","^","&","*"))][pick(pick("!","@","#","$","%","^","&","*"))][pick(pick("!","@","#","$","%","^","&","*"))]" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 162ce911d77..0ffb81b43e4 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -250,9 +250,9 @@ var/global/datum/controller/occupations/job_master else C = new /obj/item/weapon/card/id(H) if(C) - C.registered = H.real_name + C.registered_name = H.real_name C.assignment = rank - C.name = "[C.registered]'s ID Card ([C.assignment])" + C.name = "[C.registered_name]'s ID Card ([C.assignment])" C.access = get_access(C.assignment) H.equip_if_possible(C, H.slot_wear_id) if(!H.equip_if_possible(new /obj/item/weapon/pen(H), H.slot_r_store)) @@ -264,9 +264,9 @@ var/global/datum/controller/occupations/job_master pda.ownjob = H.wear_id.assignment pda.name = "PDA-[H.real_name] ([pda.ownjob])" - if(rank == "Clown") + /*if(rank == "Clown") spawn(1) - clname(H) + clname(H)*/ return 1 diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 709730ed5d1..8f2872dba9d 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -640,7 +640,7 @@ Auto Patrol: []"}, var/obj/item/device/pda/pda = perp:wear_id id = pda.id if (id) - perpname = id.registered + perpname = id.registered_name else var/obj/item/device/pda/pda = perp:wear_id perpname = pda.owner diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 406fa150b4a..61338d73778 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -616,7 +616,7 @@ Auto Patrol: []"}, var/obj/item/device/pda/pda = perp:wear_id id = pda.id if(id) - perpname = id.registered + perpname = id.registered_name else var/obj/item/device/pda/pda = perp:wear_id perpname = pda.owner diff --git a/code/game/machinery/computer/id.dm b/code/game/machinery/computer/id.dm index 04b8af4123f..05cc6749c91 100644 --- a/code/game/machinery/computer/id.dm +++ b/code/game/machinery/computer/id.dm @@ -66,8 +66,8 @@ target_name = modify.name else target_name = "--------" - if(modify && modify.registered) - target_owner = modify.registered + if(modify && modify.registered_name) + target_owner = modify.registered_name else target_owner = "--------" if(modify && modify.assignment) @@ -171,8 +171,8 @@ switch(href_list["choice"]) if ("modify") if (modify) - data_core.manifest_modify(modify.registered, modify.assignment) - modify.name = text("[modify.registered]'s ID Card ([modify.assignment])") + data_core.manifest_modify(modify.registered_name, modify.assignment) + modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])") if(ishuman(usr)) modify.loc = usr.loc if(!usr.get_active_hand()) @@ -237,7 +237,7 @@ var/t2 = modify //var/t1 = input(usr, "What name?", "ID computer", null) as text if ((authenticated && modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf))) - modify.registered = href_list["reg"] + modify.registered_name = href_list["reg"] if ("mode") mode = text2num(href_list["mode_target"]) if ("print") @@ -252,6 +252,6 @@ P.name = "paper - 'Crew Manifest'" printing = null if (modify) - modify.name = text("[modify.registered]'s ID Card ([modify.assignment])") + modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])") updateUsrDialog() return \ No newline at end of file diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 1de06d1091a..d490f45f4ba 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -155,7 +155,7 @@ src.active1 = null src.active2 = null if (src.check_access(src.scan)) - src.authenticated = src.scan.registered + src.authenticated = src.scan.registered_name src.rank = src.scan.assignment src.screen = 1 if (src.authenticated) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 9f7643b738b..f92aeae669d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -221,7 +221,7 @@ What a mess.*/ active1 = null active2 = null if(check_access(scan)) - authenticated = scan.registered + authenticated = scan.registered_name rank = scan.assignment screen = 1 //RECORD FUNCTIONS diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 08ce5b2a9c6..50bd35d0c9d 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -73,7 +73,7 @@ I = pda.id if (I && src.check_access(I)) src.locked = 0 - src.last_configurator = I:registered + src.last_configurator = I:registered_name if (locked) return diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 7949cbae652..12b8856cbea 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -427,7 +427,7 @@ Neutralize All Unidentified Life Signs: []
"}, var/obj/item/device/pda/pda = perp:wear_id id = pda.id if (id) - perpname = id.registered + perpname = id.registered_name else var/obj/item/device/pda/pda = perp:wear_id perpname = pda.owner diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 0fe117fb052..ea8c3f2ff36 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -308,7 +308,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if (istype(O, /obj/item/weapon/card/id)) if(src.screen == 9) var/obj/item/weapon/card/id/T = O - src.msgVerified = text("Verified by [T.registered] ([T.assignment])") + src.msgVerified = text("Verified by [T.registered_name] ([T.assignment])") src.updateUsrDialog() if(src.screen == 10) var/obj/item/weapon/card/id/ID = O diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm index c3d09c48bcc..031626c44ee 100644 --- a/code/game/objects/closets/secure/personal.dm +++ b/code/game/objects/closets/secure/personal.dm @@ -27,17 +27,17 @@ user << "\red It appears to be broken." return var/obj/item/weapon/card/id/I = W - if(!I || !I.registered) return - if(src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered))) + if(!I || !I.registered_name) return + if(src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered_name))) //they can open all lockers, or nobody owns this, or they own this locker src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked else src.icon_state = src.icon_closed if(!src.registered) - src.registered = I.registered - src.desc = "Owned by [I.registered]." - src.name = "Personal Closet - [I.registered]" + src.registered = I.registered_name + src.desc = "Owned by [I.registered_name]." + src.name = "Personal Closet - [I.registered_name]" else user << "\red Access Denied" else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 19c2ffd581b..03015c01ca9 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -168,7 +168,7 @@ if (0) dat += "

PERSONAL DATA ASSISTANT v.1.2

" dat += "Owner: [owner], [ownjob]
" - dat += text("ID: []
", src, (id ? "[id.registered], [id.assignment]" : "----------")) + dat += text("ID: []
", src, (id ? "[id.registered_name], [id.assignment]" : "----------")) dat += "Station Time: [round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]"//:[world.time / 100 % 6][world.time / 100 % 10]" dat += "

" @@ -656,7 +656,7 @@ id = I else var/obj/item/weapon/card/I = user.equipped() - if (istype(I, /obj/item/weapon/card/id) && I:registered) + if (istype(I, /obj/item/weapon/card/id) && I:registered_name) if(id)//Get id and replace it. user.drop_item() I.loc = src @@ -679,9 +679,9 @@ if (C:radio) C:radio.hostpda = src - else if (istype(C, /obj/item/weapon/card/id) && C:registered) + else if (istype(C, /obj/item/weapon/card/id) && C:registered_name) if(!owner) - owner = C:registered + owner = C:registered_name ownjob = C:assignment name = "PDA-[owner] ([ownjob])" user << "\blue Card scanned." @@ -694,11 +694,11 @@ if(input=="Insert") id_check(user, 2) else - if(!(owner == C:registered)) + if(!(owner == C:registered_name)) user << "\blue Name on card does not match registered name. Please try again." - else if((owner == C:registered) && (ownjob == C:assignment)) + else if((owner == C:registered_name) && (ownjob == C:assignment)) user << "\blue Rank is up to date." - else if((owner == C:registered) && (ownjob != C:assignment)) + else if((owner == C:registered_name) && (ownjob != C:assignment)) ownjob = C:assignment name = "PDA-[owner] ([ownjob])" user << "\blue Rank updated." diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 14566b53fb7..56068843af4 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -45,9 +45,9 @@ FINGERPRINT CARD return /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) - src.registered = input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name) + src.registered_name = input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name) src.assignment = input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant") - src.name = "[src.registered]'s ID Card ([src.assignment])" + src.name = "[src.registered_name]'s ID Card ([src.assignment])" user << "\blue You successfully forge the ID card." /obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 47460b894f6..f9238d5f67a 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -241,7 +241,7 @@ proc/trigger_armed_response_team() W.access = get_access("Head of Personnel") W.assignment = "Emergency Response Team" W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)//Let's add their alloted CentCom access. - W.registered = real_name + W.registered_name = real_name equip_if_possible(W, slot_wear_id) return 1 \ No newline at end of file diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index e3d27b1256b..d4bae07087a 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -317,8 +317,8 @@ var/list/supply_groups = new() reqform.info += "

[station_name] Supply Requisition Form

" if (istype(usr:wear_id, /obj/item/weapon/card/id)) - if(usr:wear_id.registered) - idname = usr:wear_id.registered + if(usr:wear_id.registered_name) + idname = usr:wear_id.registered_name if(usr:wear_id.assignment) idrank = usr:wear_id.assignment if (istype(usr:wear_id, /obj/item/device/pda)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2c3aa31f76e..8e7b58020b3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -448,9 +448,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] has granted [M.key] full access.") id.icon_state = "gold" id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() - id.registered = H.real_name + id.registered_name = H.real_name id.assignment = "Captain" - id.name = "[id.registered]'s ID Card ([id.assignment])" + id.name = "[id.registered_name]'s ID Card ([id.assignment])" H.equip_if_possible(id, H.slot_wear_id) H.update_clothing() else @@ -610,7 +610,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.name = "[M.real_name]'s ID Card" W.access = get_all_accesses() W.assignment = "Tunnel Clown!" - W.registered = M.real_name + W.registered_name = M.real_name M.equip_if_possible(W, M.slot_wear_id) var/obj/item/weapon/fireaxe/fire_axe = new(M) @@ -669,7 +669,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.name = "[M.real_name]'s ID Card" W.access = get_all_accesses() W.assignment = "Reaper" - W.registered = M.real_name + W.registered_name = M.real_name M.equip_if_possible(W, M.slot_wear_id) if("death commando")//Was looking to add this for a while. @@ -707,7 +707,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.access = get_all_accesses() W.access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer") W.assignment = "CentCom Review Official" - W.registered = M.real_name + W.registered_name = M.real_name W.over_jumpsuit = 0 M.equip_if_possible(W, M.slot_wear_id) @@ -732,7 +732,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.access = get_all_accesses() W.access += get_all_centcom_access() W.assignment = "CentCom Commanding Officer" - W.registered = M.real_name + W.registered_name = M.real_name W.over_jumpsuit = 0 M.equip_if_possible(W, M.slot_wear_id) @@ -755,7 +755,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.access = get_all_accesses() W.access += get_all_centcom_access() W.assignment = "Special Operations Officer" - W.registered = M.real_name + W.registered_name = M.real_name M.equip_if_possible(W, M.slot_wear_id) if("blue wizard") @@ -809,7 +809,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.access = get_all_accesses() W.access += get_all_centcom_access() W.assignment = "Admiral" - W.registered = M.real_name + W.registered_name = M.real_name M.equip_if_possible(W, M.slot_wear_id) M.update_clothing() diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 6849c5d7bf2..90c43b6c4e8 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -48,7 +48,7 @@ W.access = get_all_accesses() W.access += get_all_centcom_access() W.assignment = "Highlander" - W.registered = H.real_name + W.registered_name = H.real_name H.equip_if_possible(W, H.slot_wear_id) message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 2a89b07d9ea..405fc5bb814 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -183,7 +183,7 @@ var/global/sent_strike_team = 0 W.access = get_all_accesses()//They get full station access. W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)//Let's add their alloted CentCom access. W.assignment = "Death Commando" - W.registered = real_name + W.registered_name = real_name equip_if_possible(W, slot_wear_id) resistances += "alien_embryo" diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index 1fc2a4bbdec..eccd7ea42af 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -186,7 +186,7 @@ var/global/sent_syndicate_strike_team = 0 W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members. W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)//Let's add their forged CentCom access and syndicate access. W.assignment = "Syndicate Commando" - W.registered = real_name + W.registered_name = real_name equip_if_possible(W, slot_wear_id) resistances += "alien_embryo" diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 0126dce7d93..c0ff7c13c50 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -82,7 +82,7 @@ C.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]") var/perpname = "wot" if(istype(perp.wear_id,/obj/item/weapon/card/id)) - perpname = perp.wear_id:registered + perpname = perp.wear_id:registered_name else if(istype(perp.wear_id,/obj/item/device/pda)) var/obj/item/device/pda/tempPda = perp.wear_id perpname = tempPda.owner diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ea52c8b1cae..cd1dda3af28 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -86,7 +86,7 @@ var/obj/item/device/pda/pda = src:wear_id id = pda.owner else - id = src.wear_id.registered + id = src.wear_id.registered_name if (src.wear_id.PHOTO) photo = 1 if (id != src.real_name && in_range(src, usr) && prob(10)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 003e72341d4..868af0cb68f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1067,8 +1067,8 @@ if (wear_id) if (istype(wear_id, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/id = wear_id - if (id.registered) - name = id.registered + if (id.registered_name) + name = id.registered_name else name = "Unknown" else if (istype(wear_id, /obj/item/device/pda)) @@ -1083,8 +1083,8 @@ if (wear_id) if (istype(wear_id, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/id = wear_id - if (id.registered != real_name) - name = "[real_name] (as [id.registered])" + if (id.registered_name != real_name) + name = "[real_name] (as [id.registered_name])" else if (istype(wear_id, /obj/item/device/pda)) @@ -2209,11 +2209,11 @@ It can still be worn/put on as normal. var/obj/item/weapon/card/id/id = wear_id if (istype(pda)) if (pda.id) - . = pda.id.registered + . = pda.id.registered_name else . = pda.owner else if (istype(id)) - . = id.registered + . = id.registered_name else return if_no_id return @@ -2226,7 +2226,7 @@ It can still be worn/put on as normal. if (istype(pda)) . = pda.owner else if (istype(id)) - . = id.registered + . = id.registered_name else return if_no_id return diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm index 4f664e0b4ab..974c041116a 100644 --- a/code/modules/mob/living/silicon/pai/hud.dm +++ b/code/modules/mob/living/silicon/pai/hud.dm @@ -13,7 +13,7 @@ client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]") var/perpname = "wot" if(istype(perp.wear_id,/obj/item/weapon/card/id)) - perpname = perp.wear_id:registered + perpname = perp.wear_id:registered_name else if(istype(perp.wear_id,/obj/item/device/pda)) var/obj/item/device/pda/tempPda = perp.wear_id perpname = tempPda.owner