From: Zavier Date: Sat, 17 Oct 2015 21:11:14 +0000 (+0100) Subject: (no commit message) X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~jdamery/git?a=commitdiff_plain;h=c4942fe283192133361599dfb2a52d7be5136665;p=ArtibusWiki.git --- diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn index ac64698b..ee846805 100644 --- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn +++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn @@ -19,18 +19,24 @@ There is normally a butterfly flitting around somewhere if Alexios is in residen | +1 | Opulent | | +1 | | | +1 | +2 | +1 | | | | | | -1 | Missing Equipment (Perdo, Longevity Rituals)| | -1 | | | | | | | | | | <<<<<<< HEAD +<<<<<<< HEAD | 0 | Superior Equipment | +1 | +2 | +1 | | | | | | | | +1 | | 0 | Magical Superior Heating | | | | | +1 | +1| | | | +1 | | | 0 |Studio | | | | | | +1 | | | | | | | 0 |Familiar | +5 | | +3 | | | | | | | | | |   ||||||||||||| ======= +======= +>>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa | 0 | Superior Equipment | +1 | +2 | +1 | | | | | | | | +1 | | 0 | Magical Superior Heating | | | | | +1 | +1| | | | +1 | | | 0 |Studio | | | | | | +1 | | | | | | | 0 |Familiar | +6 | | +3 | | | | | | | | | |   ||||||||||| +<<<<<<< HEAD >>>>>>> 62bb47f74e439324755ee1d7e5b2ec0eb2321b0b +======= +>>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa | +2 | **Totals** | +5 | +2 | +5 | | +2 | +8 | +4 | +5 | +1 | +1 | +1 |