Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/defines/obj/computer.dm

@@ -85,28 +85,9 @@
 	name = "Master Air Control"
 
 
-/obj/machinery/computer/card
-	name = "Identification Computer"
-	desc = "You can use this to change ID's."
-	icon_state = "id"
-	circuit = "/obj/item/weapon/circuitboard/card"
-	var/obj/item/weapon/card/id/scan = null
-	var/obj/item/weapon/card/id/modify = null
-	var/authenticated = 0.0
-	var/mode = 0.0
-	var/printing = null
-	req_access = list(access_change_ids)
-
-
-/obj/machinery/computer/card/centcom
-	name = "CentCom Identification Computer"
-	circuit = "/obj/item/weapon/circuitboard/card/centcom"
-	req_access = list(access_cent_captain)
-
-
 /obj/machinery/computer/dna
 	name = "DNA operations computer"
-	desc = "A Computer used to advanced DNA stuff."
+	desc = "A computer used for advanced DNA operations."
 	icon_state = "dna"
 	var/obj/item/weapon/card/data/scan = null
 	var/obj/item/weapon/card/data/modify = null

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("!","@","#","$","%","^","&","*"))]"