From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Fri, 7 Aug 2015 14:37:38 +0000 (+0100)
Subject: Merge branch 'master' of /home/wiki/playersguide/PlayersGuide
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~nmamery/git?a=commitdiff_plain;h=75da1a9c9fee01a69b4c6ff3e5f368c3c8299388;p=PlayersGuide.git

Merge branch 'master' of /home/wiki/playersguide/PlayersGuide

Conflicts:
	The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
---

75da1a9c9fee01a69b4c6ff3e5f368c3c8299388
diff --cc The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
index 08bc94a,789938f..c21a379
--- a/The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
+++ b/The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
@@@ -2,10 -2,10 +2,14 @@@
  
  ----
  
+ Logrus can only be taken if you have at least 2 points of Bad Stuff. See [[the note|Notes_on_Powers#logrus]]. 
+ 
+ ----
+ 
 +[[Logrus.png]]
 +
 +----
 +
  **Basic Logrus Mastery (25)** (Automatic Shape Shift, Chaosian Grandparent)
  
  : The Chaosian with this has walked the Logrus and recovered from the