Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675

[MIRROR] Fixed cyborgs not getting their names at round start
2018-07-01 09:24:46 -05:00
parent 0029919b80 cdd285f5c7
commit 605f7a1bf6
7 changed files with 6 additions and 17 deletions
@@ -195,7 +195,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/safety = 0

 	while(loop && safety < 5)
-		if(C && C.prefs.custom_names[role] && !safety)
+		if(C && C.prefs.custom_names[role] && !safety && (!jobban_isbanned(src, "appearance")))
 			newname = C.prefs.custom_names[role]
 		else
 			switch(role)