Merge pull request #4241 from Belsima/name(name)

Stops people showing up as (as ID name)
This commit is contained in:
Anewbe
2017-11-22 14:44:58 -06:00
committed by GitHub

View File

@@ -330,7 +330,7 @@
return get_id_name("Unknown") //Likewise for hats return get_id_name("Unknown") //Likewise for hats
var/face_name = get_face_name() var/face_name = get_face_name()
var/id_name = get_id_name("") var/id_name = get_id_name("")
if(id_name && (id_name != face_name)) if((face_name == "Unknown") && id_name && (id_name != face_name))
return "[face_name] (as [id_name])" return "[face_name] (as [id_name])"
return face_name return face_name
@@ -1581,4 +1581,4 @@
if(istype(vr_holder.loc, /obj/machinery/vr_sleeper)) if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
var/obj/machinery/vr_sleeper/V = vr_holder.loc var/obj/machinery/vr_sleeper/V = vr_holder.loc
V.go_out() V.go_out()