Merge resolution.

This commit is contained in:
Zuhayr
2013-07-31 19:21:58 -07:00
9 changed files with 19 additions and 8 deletions
+1 -1
View File
@@ -389,7 +389,7 @@ var/list/sacrificed = list()
var/chose_name = 0
for(var/obj/item/weapon/paper/P in this_rune.loc)
if(P.info)
D.real_name = copytext(P.info, 1, MAX_NAME_LEN)
D.real_name = copytext(P.info, findtext(P.info,">")+1, findtext(P.info,"<",2) )
chose_name = 1
break
if(!chose_name)