-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
returning COs + capital contributions for returning COs #120
Open
mtigas
wants to merge
1
commit into
master
Choose a base branch
from
mtigas/revenge
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,6 +106,10 @@ Corporate Overlords may also vote to remove a peer from the organization if any | |
|
||
The removal of a corporate overlord can be nominated during a plotting session and the vote must pass as defined in Section 5. | ||
|
||
### Revenge of the Corporate Overlords | ||
|
||
A former Corporate Overlord who previously left BIFFUD through one of the *voluntary* methods described under "**Removing Corporate Overlords**" (as opposed to removal via a vote of Corporate Overlords, or removal via breach of other rules in this Operating Agreement), may return to the company anew only via the full ritual described in "**Adding Corporate Overlords**." | ||
|
||
### Hibernating Corporate Overlords | ||
A Corporate Overlord can go into hibernation. Hibernation does not remove their ownership of BIFFUD or their entitlement to profit share, but their role as a voting member of the Hive is temporarily revoked until they attend a plotting session. | ||
|
||
|
@@ -270,6 +274,10 @@ Overlords have three months to cough up the extra dough. | |
|
||
Failure to contribute in a timely manner shall result in revocation of Corporate Overlord status. | ||
|
||
A former Corporate Overlord, returning to BIFFUD as described in Section 2 -> | ||
"**Revenge of the Corporate Overlords**," may have the capital contribution | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd be open to this waiving just being automatic -- in fact, it probably should be! We do need to make explicit what the equity stake of the CO is (both after leaving and coming back). I'll need to research how this actually is supposed to work. |
||
requirement waived via a vote of the Hive Mind. | ||
|
||
### Third Party Contributions | ||
Third parties can give money to BIFFUD as a non-deductible donation or grant. | ||
Money donated in this way will be allocated according to the terms agreed upon by the Overmind, Treasure Goblin, and the third party. Donations do not come | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's worth making explicit that they don't need to re-make their capital contribution.
EDIT: oh, I didn't read the entire PR lol