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 += "