Merge branch 'master' into upstream-merge-31913

2017-10-23 01:25:35 -04:00
parent 513dfc7821 5bce9bc2b0
commit 4dc2ac3d94
32 changed files with 275 additions and 392 deletions
@@ -376,8 +376,6 @@
 		if(!transfer_after)
 			mind.active = FALSE
 		mind.transfer_to(R)
-		if(mind.special_role)
-			R.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
 	else if(transfer_after)
 		R.key = key