Merge commit '6037fbd' into master-pulls

This commit is contained in:
C. Guy Yarvin 2017-12-01 15:15:32 -08:00
commit f6502a2de5

View File

@ -80,16 +80,12 @@
=+ myr=(clan:title our) =+ myr=(clan:title our)
?: ?=($pawn myr) ?: ?=($pawn myr)
[[%base %talk] [%base %dojo] ~] [[%base %talk] [%base %dojo] ~]
?: ?=($earl myr)
[[%home %dojo] ~]
[[%home %talk] [%home %dojo] ~] [[%home %talk] [%home %dojo] ~]
:: ::
++ deft-fish :: default connects ++ deft-fish :: default connects
|= our/ship |= our/ship
%- ~(gas in *(set gill:gall)) %- ~(gas in *(set gill:gall))
^- (list gill:gall) ^- (list gill:gall)
?: ?=($earl (clan:title our))
[[(sein:title our) %talk] [our %dojo] ~]
[[our %talk] [our %dojo] ~] [[our %talk] [our %dojo] ~]
:: ::
++ drum-make :: initial part ++ drum-make :: initial part