Merge master into 1939 branch #496
Merged
Conversation
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
attitude of superiority
Co-authored-by: odinlake <[email protected]>
Co-authored-by: odinlake <[email protected]>
* renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * merged destiny list --------- Co-authored-by: Mikael Onsjö <[email protected]>
Co-authored-by: paul-sheridan <[email protected]>
Co-authored-by: odinlake <[email protected]>
* snobbishness => attitude of superiority * snobbishness * fix workflow branch name * improved 'hoaxes in society' theme * dummy change to trigger merge * dummy change to trigger merge * dummy change to trigger merge * merge proposed themes, with python-totolo (#421) Co-authored-by: odinlake <[email protected]> * telepathic ability * wicked/virtuous married couple split up * curiosity * malicious hoaxes in society * merge proposed themes, with python-totolo (#422) Co-authored-by: odinlake <[email protected]> * coping with someone who is comporting themself above their station * coping with humiliation -> embarrassment * self-driving vehicle * coping with someone who is comporting themself above their station * merge proposed themes, with python-totolo (#428) Co-authored-by: odinlake <[email protected]> * theme in story fixes * proposed theme * merge proposed themes, with python-totolo (#432) Co-authored-by: paul-sheridan <[email protected]> * defined theme * proposed new theme * fix workflow bug * prejudice against those less well off than one's self * merge proposed themes, with python-totolo (#438) Co-authored-by: odinlake <[email protected]> * worked on prejudice themes * updated theme descriptions * coping with senility * various social class prejudices in society * republic vs empire * deprecate elitism * democracy vs. autocracy * democracy vs. autocracy * democracy vs. autocracy * merge proposed themes, with python-totolo (#444) Co-authored-by: odinlake <[email protected]> * reparented 'the merits of autocracy' * coping with the defeat of one's people * bloodsports * coping with a maniacal leader * too much television is bad for society * merge proposed themes, with python-totolo (#448) Co-authored-by: odinlake <[email protected]> * minor update * minor update * love is blind * merge proposed themes, with python-totolo (#450) Co-authored-by: odinlake <[email protected]> * specialized certain 'human nature' themes * comrades in arms * merge proposed themes, with python-totolo (#456) Co-authored-by: odinlake <[email protected]> * sex work * coma * merge proposed themes, with python-totolo (#457) Co-authored-by: odinlake <[email protected]> * matchmaking * merge proposed themes, with python-totolo (#460) Co-authored-by: odinlake <[email protected]> * improved 'what if I were trapped in a work of fiction' theme * merge proposed themes, with python-totolo (#462) Co-authored-by: paul-sheridan <[email protected]> * to tell the truth vs. to offer a comforting lie * merge proposed themes, with python-totolo (#465) Co-authored-by: odinlake <[email protected]> * renamed 'telling the truth vs. offering a comforting lie' to 'to tell the truth vs. to offer a comforting lie' * merge proposed themes, with python-totolo (#467) * deleted duplicate theme entry * American Civil War => civil war * what civilian life is like in times of war * child's need to be loved * life in British colonial India is gone and life in Victorian Britain modified * life in late modern India * coping with heartbreak {yay or nay?} * romantic courtship vs. flirtation {TBD} * merge proposed themes, with python-totolo (#475) Co-authored-by: odinlake <[email protected]> * the -> their in "coping with heartbreak" --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odinlake <[email protected]> Co-authored-by: paul-sheridan <[email protected]>
Co-authored-by: odinlake <[email protected]>
* Dev stories: life in late modern India (#472) * renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * merged destiny list --------- Co-authored-by: Mikael Onsjö <[email protected]> * reformat with python-totolo (#474) Co-authored-by: paul-sheridan <[email protected]> * Dev themes (#477) * snobbishness => attitude of superiority * snobbishness * fix workflow branch name * improved 'hoaxes in society' theme * dummy change to trigger merge * dummy change to trigger merge * dummy change to trigger merge * merge proposed themes, with python-totolo (#421) Co-authored-by: odinlake <[email protected]> * telepathic ability * wicked/virtuous married couple split up * curiosity * malicious hoaxes in society * merge proposed themes, with python-totolo (#422) Co-authored-by: odinlake <[email protected]> * coping with someone who is comporting themself above their station * coping with humiliation -> embarrassment * self-driving vehicle * coping with someone who is comporting themself above their station * merge proposed themes, with python-totolo (#428) Co-authored-by: odinlake <[email protected]> * theme in story fixes * proposed theme * merge proposed themes, with python-totolo (#432) Co-authored-by: paul-sheridan <[email protected]> * defined theme * proposed new theme * fix workflow bug * prejudice against those less well off than one's self * merge proposed themes, with python-totolo (#438) Co-authored-by: odinlake <[email protected]> * worked on prejudice themes * updated theme descriptions * coping with senility * various social class prejudices in society * republic vs empire * deprecate elitism * democracy vs. autocracy * democracy vs. autocracy * democracy vs. autocracy * merge proposed themes, with python-totolo (#444) Co-authored-by: odinlake <[email protected]> * reparented 'the merits of autocracy' * coping with the defeat of one's people * bloodsports * coping with a maniacal leader * too much television is bad for society * merge proposed themes, with python-totolo (#448) Co-authored-by: odinlake <[email protected]> * minor update * minor update * love is blind * merge proposed themes, with python-totolo (#450) Co-authored-by: odinlake <[email protected]> * specialized certain 'human nature' themes * comrades in arms * merge proposed themes, with python-totolo (#456) Co-authored-by: odinlake <[email protected]> * sex work * coma * merge proposed themes, with python-totolo (#457) Co-authored-by: odinlake <[email protected]> * matchmaking * merge proposed themes, with python-totolo (#460) Co-authored-by: odinlake <[email protected]> * improved 'what if I were trapped in a work of fiction' theme * merge proposed themes, with python-totolo (#462) Co-authored-by: paul-sheridan <[email protected]> * to tell the truth vs. to offer a comforting lie * merge proposed themes, with python-totolo (#465) Co-authored-by: odinlake <[email protected]> * renamed 'telling the truth vs. offering a comforting lie' to 'to tell the truth vs. to offer a comforting lie' * merge proposed themes, with python-totolo (#467) * deleted duplicate theme entry * American Civil War => civil war * what civilian life is like in times of war * child's need to be loved * life in British colonial India is gone and life in Victorian Britain modified * life in late modern India * coping with heartbreak {yay or nay?} * romantic courtship vs. flirtation {TBD} * merge proposed themes, with python-totolo (#475) Co-authored-by: odinlake <[email protected]> * the -> their in "coping with heartbreak" --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odinlake <[email protected]> Co-authored-by: paul-sheridan <[email protected]> --------- Co-authored-by: Paul Sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: odinlake <[email protected]>
* renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * master -> devstories (#480) * Dev stories: life in late modern India (#472) * renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * merged destiny list --------- Co-authored-by: Mikael Onsjö <[email protected]> * reformat with python-totolo (#474) Co-authored-by: paul-sheridan <[email protected]> * Dev themes (#477) * snobbishness => attitude of superiority * snobbishness * fix workflow branch name * improved 'hoaxes in society' theme * dummy change to trigger merge * dummy change to trigger merge * dummy change to trigger merge * merge proposed themes, with python-totolo (#421) Co-authored-by: odinlake <[email protected]> * telepathic ability * wicked/virtuous married couple split up * curiosity * malicious hoaxes in society * merge proposed themes, with python-totolo (#422) Co-authored-by: odinlake <[email protected]> * coping with someone who is comporting themself above their station * coping with humiliation -> embarrassment * self-driving vehicle * coping with someone who is comporting themself above their station * merge proposed themes, with python-totolo (#428) Co-authored-by: odinlake <[email protected]> * theme in story fixes * proposed theme * merge proposed themes, with python-totolo (#432) Co-authored-by: paul-sheridan <[email protected]> * defined theme * proposed new theme * fix workflow bug * prejudice against those less well off than one's self * merge proposed themes, with python-totolo (#438) Co-authored-by: odinlake <[email protected]> * worked on prejudice themes * updated theme descriptions * coping with senility * various social class prejudices in society * republic vs empire * deprecate elitism * democracy vs. autocracy * democracy vs. autocracy * democracy vs. autocracy * merge proposed themes, with python-totolo (#444) Co-authored-by: odinlake <[email protected]> * reparented 'the merits of autocracy' * coping with the defeat of one's people * bloodsports * coping with a maniacal leader * too much television is bad for society * merge proposed themes, with python-totolo (#448) Co-authored-by: odinlake <[email protected]> * minor update * minor update * love is blind * merge proposed themes, with python-totolo (#450) Co-authored-by: odinlake <[email protected]> * specialized certain 'human nature' themes * comrades in arms * merge proposed themes, with python-totolo (#456) Co-authored-by: odinlake <[email protected]> * sex work * coma * merge proposed themes, with python-totolo (#457) Co-authored-by: odinlake <[email protected]> * matchmaking * merge proposed themes, with python-totolo (#460) Co-authored-by: odinlake <[email protected]> * improved 'what if I were trapped in a work of fiction' theme * merge proposed themes, with python-totolo (#462) Co-authored-by: paul-sheridan <[email protected]> * to tell the truth vs. to offer a comforting lie * merge proposed themes, with python-totolo (#465) Co-authored-by: odinlake <[email protected]> * renamed 'telling the truth vs. offering a comforting lie' to 'to tell the truth vs. to offer a comforting lie' * merge proposed themes, with python-totolo (#467) * deleted duplicate theme entry * American Civil War => civil war * what civilian life is like in times of war * child's need to be loved * life in British colonial India is gone and life in Victorian Britain modified * life in late modern India * coping with heartbreak {yay or nay?} * romantic courtship vs. flirtation {TBD} * merge proposed themes, with python-totolo (#475) Co-authored-by: odinlake <[email protected]> * the -> their in "coping with heartbreak" --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odinlake <[email protected]> Co-authored-by: paul-sheridan <[email protected]> --------- Co-authored-by: Paul Sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: odinlake <[email protected]> --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: odinlake <[email protected]>
* renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * master -> devstories (#480) * Dev stories: life in late modern India (#472) * renamed 'hoaxes in society' to 'malicious hoaxs in society' * various updates * minor fixes * replaced 'coping with humiliation' with 'embarrassment' * tz1959e3x24: To Serve Man - telepathy is hinted at * tz1959e4x05 Mute: Ilse could at least to some extent read minds or hear thoughts * misc updates to story files * various fixes * theme change * minor update * minor update * minor update * minor updates * added 'coma' to various stories * updated 'what if I were trapped in a work of fiction' usages * 'to tell the truth vs. to offer a comforting lie' updates * typo fixes * added 'aliens eating people' as appropriate * Replaced 'what civilian life is like in times of war' by 'civilians suffering in war' * replaced 'life in British colonial India' by 'life in late modern India' + improved text * merged destiny list --------- Co-authored-by: Mikael Onsjö <[email protected]> * reformat with python-totolo (#474) Co-authored-by: paul-sheridan <[email protected]> * Dev themes (#477) * snobbishness => attitude of superiority * snobbishness * fix workflow branch name * improved 'hoaxes in society' theme * dummy change to trigger merge * dummy change to trigger merge * dummy change to trigger merge * merge proposed themes, with python-totolo (#421) Co-authored-by: odinlake <[email protected]> * telepathic ability * wicked/virtuous married couple split up * curiosity * malicious hoaxes in society * merge proposed themes, with python-totolo (#422) Co-authored-by: odinlake <[email protected]> * coping with someone who is comporting themself above their station * coping with humiliation -> embarrassment * self-driving vehicle * coping with someone who is comporting themself above their station * merge proposed themes, with python-totolo (#428) Co-authored-by: odinlake <[email protected]> * theme in story fixes * proposed theme * merge proposed themes, with python-totolo (#432) Co-authored-by: paul-sheridan <[email protected]> * defined theme * proposed new theme * fix workflow bug * prejudice against those less well off than one's self * merge proposed themes, with python-totolo (#438) Co-authored-by: odinlake <[email protected]> * worked on prejudice themes * updated theme descriptions * coping with senility * various social class prejudices in society * republic vs empire * deprecate elitism * democracy vs. autocracy * democracy vs. autocracy * democracy vs. autocracy * merge proposed themes, with python-totolo (#444) Co-authored-by: odinlake <[email protected]> * reparented 'the merits of autocracy' * coping with the defeat of one's people * bloodsports * coping with a maniacal leader * too much television is bad for society * merge proposed themes, with python-totolo (#448) Co-authored-by: odinlake <[email protected]> * minor update * minor update * love is blind * merge proposed themes, with python-totolo (#450) Co-authored-by: odinlake <[email protected]> * specialized certain 'human nature' themes * comrades in arms * merge proposed themes, with python-totolo (#456) Co-authored-by: odinlake <[email protected]> * sex work * coma * merge proposed themes, with python-totolo (#457) Co-authored-by: odinlake <[email protected]> * matchmaking * merge proposed themes, with python-totolo (#460) Co-authored-by: odinlake <[email protected]> * improved 'what if I were trapped in a work of fiction' theme * merge proposed themes, with python-totolo (#462) Co-authored-by: paul-sheridan <[email protected]> * to tell the truth vs. to offer a comforting lie * merge proposed themes, with python-totolo (#465) Co-authored-by: odinlake <[email protected]> * renamed 'telling the truth vs. offering a comforting lie' to 'to tell the truth vs. to offer a comforting lie' * merge proposed themes, with python-totolo (#467) * deleted duplicate theme entry * American Civil War => civil war * what civilian life is like in times of war * child's need to be loved * life in British colonial India is gone and life in Victorian Britain modified * life in late modern India * coping with heartbreak {yay or nay?} * romantic courtship vs. flirtation {TBD} * merge proposed themes, with python-totolo (#475) Co-authored-by: odinlake <[email protected]> * the -> their in "coping with heartbreak" --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odinlake <[email protected]> Co-authored-by: paul-sheridan <[email protected]> --------- Co-authored-by: Paul Sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: odinlake <[email protected]> --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: odinlake <[email protected]>
* snobbishness => attitude of superiority * snobbishness * fix workflow branch name * improved 'hoaxes in society' theme * dummy change to trigger merge * dummy change to trigger merge * dummy change to trigger merge * merge proposed themes, with python-totolo (#421) Co-authored-by: odinlake <[email protected]> * telepathic ability * wicked/virtuous married couple split up * curiosity * malicious hoaxes in society * merge proposed themes, with python-totolo (#422) Co-authored-by: odinlake <[email protected]> * coping with someone who is comporting themself above their station * coping with humiliation -> embarrassment * self-driving vehicle * coping with someone who is comporting themself above their station * merge proposed themes, with python-totolo (#428) Co-authored-by: odinlake <[email protected]> * theme in story fixes * proposed theme * merge proposed themes, with python-totolo (#432) Co-authored-by: paul-sheridan <[email protected]> * defined theme * proposed new theme * fix workflow bug * prejudice against those less well off than one's self * merge proposed themes, with python-totolo (#438) Co-authored-by: odinlake <[email protected]> * worked on prejudice themes * updated theme descriptions * coping with senility * various social class prejudices in society * republic vs empire * deprecate elitism * democracy vs. autocracy * democracy vs. autocracy * democracy vs. autocracy * merge proposed themes, with python-totolo (#444) Co-authored-by: odinlake <[email protected]> * reparented 'the merits of autocracy' * coping with the defeat of one's people * bloodsports * coping with a maniacal leader * too much television is bad for society * merge proposed themes, with python-totolo (#448) Co-authored-by: odinlake <[email protected]> * minor update * minor update * love is blind * merge proposed themes, with python-totolo (#450) Co-authored-by: odinlake <[email protected]> * specialized certain 'human nature' themes * comrades in arms * merge proposed themes, with python-totolo (#456) Co-authored-by: odinlake <[email protected]> * sex work * coma * merge proposed themes, with python-totolo (#457) Co-authored-by: odinlake <[email protected]> * matchmaking * merge proposed themes, with python-totolo (#460) Co-authored-by: odinlake <[email protected]> * improved 'what if I were trapped in a work of fiction' theme * merge proposed themes, with python-totolo (#462) Co-authored-by: paul-sheridan <[email protected]> * to tell the truth vs. to offer a comforting lie * merge proposed themes, with python-totolo (#465) Co-authored-by: odinlake <[email protected]> * renamed 'telling the truth vs. offering a comforting lie' to 'to tell the truth vs. to offer a comforting lie' * merge proposed themes, with python-totolo (#467) * deleted duplicate theme entry * American Civil War => civil war * what civilian life is like in times of war * child's need to be loved * life in British colonial India is gone and life in Victorian Britain modified * life in late modern India * coping with heartbreak {yay or nay?} * romantic courtship vs. flirtation {TBD} * merge proposed themes, with python-totolo (#475) Co-authored-by: odinlake <[email protected]> * the -> their in "coping with heartbreak" * hallucination of a non-existing person * merge proposed themes, with python-totolo (#479) Co-authored-by: odinlake <[email protected]> --------- Co-authored-by: paul-sheridan <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odinlake <[email protected]> Co-authored-by: paul-sheridan <[email protected]>
Dev stories
update from master
This reverts commit 1213fd8.
Dev stories
merge proposed themes => primary themes
sync master <-> dev themes
sync master <-> dev themes
reformat with python-totolo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.