Skip to content
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.

Sign up for GitHub

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

Jump to bottom

some patrol fixes #125

Merged
merged 1 commit into from
May 25, 2024
Merged

some patrol fixes #125

merged 1 commit into from
May 25, 2024

Conversation

ReigningMonarch
Copy link

half fixed patrols bc I'm slow and lazy f u github hi cofer

@ReigningMonarch
some patrol fixes
19242a1 
half fixed patrols bc I'm slow and lazy
@sedgestripe sedgestripe merged commit 7e71147 into sedgestripe:LifeGen-dev May 25, 2024
7 checks passed
Honeycase added a commit to Honeycase/lifegen-honey that referenced this pull request Jun 14, 2024
@Honeycase
Squashed commit of the following:
eda01c4 
commit fd538474c5de536db47bd87f6c0a9a34fa0bb9e6
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Wed Jun 12 11:27:50 2024 -0500

    tag fix

commit 1551b820c668686513d260bd141a40392d7127b9
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Tue Jun 11 21:05:19 2024 -0500

    Update crush.json

commit fc7a086f771ce99333898da338ffd3bdedb1bb74
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue Jun 11 00:04:32 2024 -0500

    tag typos

commit 979486ad298c22de495f9162dd71bdbcf2c4e2c5
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue Jun 11 00:03:33 2024 -0500

    tag typo

commit aad23558557f8cf71fec8ba216d0cf3a21f0ecf0
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 10 16:09:48 2024 -0500

    mediator.json prn tagged by e

commit 1ab21ffd388aeb0012d0824ffb6a562e108f7c76
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 17:02:41 2024 -0400

    missing verb tag

commit 996149b8fa78455cfb274ae60edecabd240b217e
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:58:36 2024 -0400

    missed pronoun tagging

commit 30cf27bb2b4dd6862e75fbf99d23ad7ff95efa79
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:50:48 2024 -0400

    add missing /CAP

commit fb623cbcc27faaff05cfb0f2a3c464ac54737aa9
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:45:44 2024 -0400

    fix pronoun tagging

commit 79a5accb71dd65017884ed3f3c8d09a2e257f403
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:39:29 2024 -0400

    missing /CAP

commit 2a377eaaf6497854e7dc2bc31c37e42ef227ca80
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:38:54 2024 -0400

    fix tagging

commit c6990e8591b98e45041243883e97c67695803ca1
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:36:37 2024 -0400

    missing clan_has_kits tag

commit 8e1c1a1c64f8c06c894e48e30b3f65608f55288d
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:24:48 2024 -0400

    tag assertive_tonewborn3

commit 25b831923b16515d696713df889dc460483a9d58
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:23:55 2024 -0400

    pronoun tagging

commit 9db856e2202b8d906aa728f6117989b90c8bdf3e
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:22:10 2024 -0400

    fix pronuon

commit cb0874afa0ccdfa4d0c6ad355b6e0e48e472a8ca
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Mon Jun 10 16:15:25 2024 -0400

    switch 'could' to 'can'

commit e302e5bfe892fde719ac44388eb137e3a7709c4e
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 10 14:55:43 2024 -0500

    missed prn tag

commit 5f5d2ebb090ce65fa01932ccd02630a9963ee73d
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 10 14:53:59 2024 -0500

    wrong prn tag

commit a543d30321907a1df5655ebde8caff3dbd9ccfb7
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 20:28:20 2024 -0500

    missed verb tag

commit 30d79697db5af51225d62c681401170e495b3ee6
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 20:09:22 2024 -0500

    typo

commit b39ebc15327f4fe96cf97ed82381538f00ee64f1
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 20:08:28 2024 -0500

    tag fix

commit 735f028d1ba27c036839ba982d8eb6c234541c82
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:35:11 2024 -0500

    verb tga auauugh

commit cf173c432c42d0f94b8b0acecd541a6bd3293dcd
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:34:21 2024 -0500

    missed prn tag

commit 45b7a421d0891a527c5e23456e83dfb29ac91621
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:32:46 2024 -0500

    missed prn tag

commit 84625c8b696629676cdcdecbeb0ae8a7c30500fc
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:30:59 2024 -0500

    missed verb tag

commit 84e21a8544cffd201d8c15661ef9f4106e96b132
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:26:51 2024 -0500

    missed prn tags

commit 9e1a7598d9325d0c5fa2e13679f82d16f287cd02
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 19:14:58 2024 -0500

    missed prn tags

commit 47028ce1919b7ddc8575815528cb2fd5761e954e
Merge: 188403ab2 efc463765
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 19:06:44 2024 -0500

    Merge pull request #144 from jaysoleson/LifeGen-dev

    favourites filter fixes

commit efc4637650817c906978d384d8dd275418738b75
Merge: c3960cf7c 188403ab2
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 18:25:33 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit c3960cf7c99515ddab8b73a5e5e29aa50c0a5170
Author: Jay <jayolesonbz@gmail.com>
Date:   Sun Jun 9 18:25:17 2024 -0500

    your_cat event filter added

commit 188403ab2f7064f78e01e5d45883a5a7160398c0
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 17:02:20 2024 -0500

    pronoun load fix (? idk)

commit 66eaec7149e2e1037da9586edae18c967395e379
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 16:41:12 2024 -0500

    wrong prn tag

commit 72dd975a4c79860c8b384a4be3f7cdbc643c28ae
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 15:35:34 2024 -0500

    Edited pronouns

commit 21f2723e28b76a521319211b942609737ef5a10f
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 15:32:58 2024 -0500

    Edited pronouns

commit 617e17cb1a7d969311ed8fbe74e6b9cbc2e198c7
Merge: 1e357588c 530cc14e2
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:31:13 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 1e357588c3ad45b0fe19763dbf677e569e3ba3d7
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:31:08 2024 -0500

    Update ceremonies.json

commit 530cc14e26b5a031819091d1542f4bebb2414459
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 15:28:15 2024 -0500

    Edited pronouns and verbs

commit 6cd371d198791d6b27f2400d9d2a50a427b3474c
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:26:54 2024 -0500

    assign skill

commit 10a4b23df8f71f97661ac1637132f45a40b57b42
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 15:16:47 2024 -0500

    Edited pronouns

commit 43aff24eb8d73c2f8bb81d7c71509090de2985cd
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:12:18 2024 -0500

    Update general_no_kit.json

commit 058d3ec204d41d5bcf841d0f17b184ab311e2f30
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:11:35 2024 -0500

    attempt to fix skill and remove test

commit 3aa6cc922a32c3a466ff7d38bd78fe905973d3ce
Merge: b881fe79f f4d757237
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 15:10:02 2024 -0500

    Merge pull request #143 from jaysoleson/LifeGen-dev

    New favourites system, parent/sib pronouns, content

commit b881fe79fcd27cb342f6b0123cf52e8bd43cbb4c
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 15:08:20 2024 -0500

    Edited pronouns

commit 7d5ebe905cc6ed22cc6b48abe23da1c705d2d28a
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 14:58:30 2024 -0500

    Update deputy.json

commit c9b5aa0edbd7cb4129e115ee62818e3f4ead3217
Merge: 74b9e4474 34a54c647
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 14:55:23 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 74b9e447455f832b72e5d507306ab863e19c27c8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 14:55:16 2024 -0500

    changes

commit 34a54c647b664af1d1ed747e8acc03c6c30cf5b8
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 14:50:37 2024 -0500

    Edited pronouns

commit 562573ab489aedf84d9afdb475f30cb464c4e5f0
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 14:26:17 2024 -0500

    Added pronouns

commit 879362ac283f30d6960d6ac2eb74df0f3a94da5f
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 14:18:16 2024 -0500

    Added pronouns

commit c16a03553fb71eda68c0a58abbdb801721bf9729
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 14:17:24 2024 -0500

    no repeating events

commit f40c475a1312edbe6151681b4e93e036d905c86c
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 14:11:16 2024 -0500

    Fixed non-ascii characters

commit 43b44c48a300f3d1014c6e89be5b1a0a0f2ee666
Author: patel0 <42725058+patel0@users.noreply.github.com>
Date:   Sun Jun 9 14:06:57 2024 -0500

    Added dialogue to dicts

commit f4d757237e56e6194eeec9e5d2e00754c6027ae9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 01:38:58 2024 -0500

    button position fix

commit 5cd73f3b1a239664013dabac631b065c18c378b4
Merge: 9586012f4 b3d4a78e2
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 01:38:18 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit b3d4a78e2d6fdf7cc017bd482ff4171b0294e7e9
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun Jun 9 00:41:53 2024 -0500

    fix

commit 314ce7ffa7545422f9033da5ea3c46ddb32c4b37
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 9 00:20:50 2024 -0500

    missed prn tags

commit 33466bc33f0364b8f86ffeb9e73d76b1f77e837c
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun Jun 9 01:02:58 2024 -0400

    remove duplicate dialogue

commit 0371b500956fe4242ce957e4846b7d8dcc25615b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:46:13 2024 -0500

    missed prn tags

commit 83f29478c67bb6a2d02776737177431189f81fd2
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:42:18 2024 -0500

    parent prn tags

commit b04872a2b40b6d470519f6e500e5a500322b0c55
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:38:18 2024 -0500

    missed prn tags

commit eab0db80ea2bdc5c1b593d5d9add60223af61087
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:34:47 2024 -0500

    missed prn tag

commit 9586012f47cf27787cbc2ae2dd4475309e512ef7
Merge: e3652579e cfb6e1f7b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:15:40 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit cfb6e1f7b516d94fd932b137588e5ec017720e1b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:15:20 2024 -0500

    more meow error dialogue

commit b353431bbae096bd6e5cdefe42c4c361eca6ba0a
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun Jun 9 00:08:54 2024 -0400

    fix cool_AJ2

commit 35fc39d100f99ca79e5c666c41e6ee41e9ba52f0
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 23:06:31 2024 -0500

    meow error dialogue

commit 1fac1477cf63a10a425096b02e357ca6dd27a395
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:53:13 2024 -0500

    typo

commit 18eccfe5b869a340e0b5cb66ed1dbaf6fc8e7314
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:49:42 2024 -0500

    typo/fix

commit 2b1e6102578cbe2ca853b0774d83799e7ee82ce7
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:42:41 2024 -0500

    dupe removed

commit 40715f8c69b75b5f19e38ff30438845a6a25fa8c
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:40:12 2024 -0500

    missed prn tags

commit e3652579e4691b9a9fe1b5718e181121ae15ee34
Merge: 06207dc5d bd77fc037
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:34:51 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit bd77fc037ea641572f7df012354eedaa461d6507
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:34:01 2024 -0500

    missed prn tag

commit 5d55836ad2dc845d67b6cf3a03d8eb52dcf8014e
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 22:33:28 2024 -0500

    wrong prn tag

commit c928f3cfe3a78aedd41993550dc8df7caa9c8120
Merge: 3b18ca9c7 d1949feea
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 16:00:59 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 3b18ca9c7338a8a0a7a7034fdeb91ada3120e508
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 16:00:54 2024 -0500

    fix tags

commit e243e039ee6227385a63cc152bfd9a8b04eba4bd
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 15:36:02 2024 -0500

    fixes

commit d1949feea20c497e2896f753deb4e1fdb451b4b3
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 14:10:37 2024 -0500

    tag typo

commit c89c43254e6e9cd561cb967faef7ec68466a88bd
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 14:06:34 2024 -0500

    missed prn tag

commit 194e2f893ff4844fbe8d255df90f1bd8c404a48b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 14:01:16 2024 -0500

    typo

commit 06207dc5def98381154bd6bbe94347683adc2530
Merge: fec786f51 bc2057d9c
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 13:58:38 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit c6d797d24bf6b6a06947a20424f0875b87d0bac1
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:58:46 2024 -0500

    Update events.py

commit bc2057d9cbecf344e32474f1795c374966ab4584
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:49:42 2024 -0500

    Update TalkScreen.py

commit c377d6d336dfb865dfaa41f9782e75cc0a212ebb
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:36:31 2024 -0500

    Update TalkScreen.py

commit 90c4d572d45f65535fb6be10ba459c7b4b32f1dc
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:34:40 2024 -0500

    Update TalkScreen.py

commit 5c509e4d84085f9ea097c71643a27eeae844ad20
Merge: eedb3c9e3 2bddf3672
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:32:37 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit eedb3c9e32da49d65596ca712cf097f17f0a4d38
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat Jun 8 12:32:09 2024 -0500

    Update TalkScreen.py

commit fec786f5125532725faf1ec8c5dc9b5c8ec4f881
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:43:55 2024 -0500

    oopsie fix

commit 194282c18066ae5b273791ee5f5fd94b49f3b7b6
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:36:36 2024 -0500

    i thought i got rid of that already tf

commit a70315bbb72a825b5be966bb69fb8a0f9f714ac2
Merge: f30b9df9a d61db9100
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:34:45 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev

commit f30b9df9ab84a1c0ca2dc1926309dfffcda4c81e
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:34:36 2024 -0500

    pronoun stuff commented back out

commit d61db91000bf0e1f6fc4ba28aef7869a050f9678
Merge: a0be17545 2bddf3672
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 11:24:08 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit a0be17545fe43397f9487ffedfd1829d4fceaf13
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:23:43 2024 -0500

    parent/sib pronouns

commit 3058c4c4fd83e1e165ea9d5e8fe6fa48c14daec1
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 11:03:45 2024 -0500

    conflicts ?

commit 2bddf36720d1b4386698862676a98929ac67b63f
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 10:57:28 2024 -0500

    wrong prn tag

commit 673a617df6ae960d09ec8c467bee34360d287d43
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 10:44:24 2024 -0500

    missed pronouns

commit 39827c04383c6132fd3076074fd95ad485c079d8
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 8 10:34:46 2024 -0500

    typo

commit c9d1289d65e571bd44da16430a99c0e0710f6c00
Merge: ae85a9ad9 93d4850e6
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat Jun 8 10:28:46 2024 -0500

    wee

commit 93d4850e63118f0c55a75e531ee6b2d2222ef26f
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri Jun 7 23:57:12 2024 -0500

    various fixes

commit 1dabc663c5d188bdbed96a07c7bb6ca4fad212c8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri Jun 7 23:46:46 2024 -0500

    various fixes

commit f0da11dc0b979f5420ff5acbc64118dd970fe4a7
Merge: 4f1f10604 f451ab87f
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri Jun 7 23:04:41 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit ae85a9ad96d1afdb6ff5ea4ae424f30e49c251d7
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri Jun 7 22:20:31 2024 -0500

    buttons in both jsons

commit ab223336b384bbabaaaf87c3f80361f7bdd75150
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri Jun 7 22:19:38 2024 -0500

    cleanup

commit db17e9455943dccd7acf6d1f4ad7dcef54719adf
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri Jun 7 22:14:45 2024 -0500

    new favourites system, some content

commit f451ab87f7089dda49491606232f0ac246608680
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri Jun 7 16:28:46 2024 -0500

    tpyo

commit 4f1f106041526546c7ed5962b75b4d1e2b1a6ee6
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 22:44:34 2024 -0500

    Update TalkScreen.py

commit 06fc7168901210c5205bdce1b8566b5a620dfc9c
Merge: e81fe7fbf 9164098cd
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 22:42:19 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit e81fe7fbfe0e8af57ad4544ff5efb5ddacaea530
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 22:42:00 2024 -0500

    updates

commit 9164098cdcf5f17df2c2942831557666105033a9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 21:29:29 2024 -0500

    typo ?

commit 543ed58a892b98c6779269ba38b2a5b59341b0a1
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 21:14:18 2024 -0500

    typo removed

commit bee0450b0823af3a8c6652a0b9631b62e1bece99
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 21:13:51 2024 -0500

    Update TalkScreen.py

commit fdabbed6394186a98cc5e87c035fdb7cac1e94a1
Merge: 2b70a0713 64aab80df
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 21:13:33 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 64aab80df146841f0e8f57b3d8631a5d3e08c467
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 21:10:27 2024 -0500

    crash fix oops :P

commit 863cafd7b1be06d6955469ed9a69fc4e5312f9a6
Merge: 6b521cec8 495891523
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 20:58:39 2024 -0500

    Merge pull request #141 from sedgestripe/dialogue_pronountagging

    Dialogue pronountagging

commit 495891523ab171e0e4c1889fa14cfabc1b66059b
Merge: a56576c3c 6b521cec8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 20:58:30 2024 -0500

    Merge branch 'LifeGen-dev' into dialogue_pronountagging

commit 2b70a07138554f120b08f7360031cb524362d16b
Merge: 35a2805a5 6b521cec8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 20:01:04 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 35a2805a5585f69a075a638e7e47db29870947be
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 20:01:00 2024 -0500

    Update TalkScreen.py

commit 6b521cec89d396f48e95a836857bcaf854bf5f48
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 19:17:26 2024 -0500

    age constraint for littertest

commit 709b6c13421a7151c607f11e31d84c3fa010a48b
Merge: 5943397b5 4192436b2
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 19:09:30 2024 -0500

    Merge pull request #140 from jaysoleson/LifeGen-dev

    trainee/df mate moving on bugfix

commit 4192436b29d3a9738d735bf1f5c9a3e7fbe0758e
Merge: ad2c0cfb9 5943397b5
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 19:08:40 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit ad2c0cfb9e0cba585f112ad45b6ae2e016e39c3a
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 19:07:09 2024 -0500

    trainee/df mate moving on bugfix

commit 5943397b5a3675d1d383771b5b427aa87d0e543f
Merge: 1096e0457 16a639031
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:56:03 2024 -0500

    Merge pull request #139 from ReigningMonarch/LifeGen-dev

    Gen events + typo

commit 16a639031dfbdda7b1eb547c278054e21f07860b
Author: Reign <155932891+ReigningMonarch@users.noreply.github.com>
Date:   Thu Jun 6 19:47:20 2024 -0400

    Gen events + typo

    general no kit events + deputy typo fix

commit 1096e0457e533b0ba0e7ef5974c9c8ffcc621dee
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:39:40 2024 -0500

    actual crash fix aauhg

commit e93920791387c07a376606d5aca3ec93224da799
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:37:56 2024 -0500

    actual crash fix

commit f931c52b92dc78584b05a55d1ecb524cd1c5a2cc
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:34:07 2024 -0500

    event crash fix

commit 1cd52e00a847f214e6571639f929b0049f93f1e9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:22:09 2024 -0500

    test removed

commit c7be1f7edd0d29336dbe7436d38da87f0d5bd0bd
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:21:57 2024 -0500

    test removed i need ot be killed

commit 73d9c996398fa257f51f37029fe0205f63b13a05
Merge: 239b5a1d2 fe51550c9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 18:17:44 2024 -0500

    Merge pull request #137 from jaysoleson/LifeGen-dev

    Bug Fixes

commit fe51550c9c4d2bcf8e52fcf22d6011ee0a8cbd01
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 18:15:31 2024 -0500

    debug removed kill me

commit b5438300209d00b30587fc2e1275ebd7758e0cf2
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 18:14:48 2024 -0500

    general_no_kit_events, dfkit event text bug

commit 239b5a1d212da11fed8a72529bf750a05abda137
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu Jun 6 17:51:52 2024 -0500

    debug removed oooooops

commit 89acf25d0fea6972a58bbb03c2bec4cb44014347
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 16:20:13 2024 -0500

    Update valentines.json

commit b30a9596a7fda0397964375f587c017525eb3f79
Merge: ba7c7cb98 633bd1c38
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 14:18:55 2024 -0500

    Merge pull request #136 from jaysoleson/LifeGen-dev

    New DF cat stuff for rei, new wild acc sheets, fixes

commit ba7c7cb98fbf6c9c565626cc288cf4004c00b4f2
Merge: 7d028b561 3db5b7a01
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 14:18:26 2024 -0500

    Merge pull request #133 from ebutbetter/LifeGen-dev

    leader profile button overlap fix take 2

commit a56576c3c35e6c9f5434041b13f75080a5e08d30
Merge: a74ff8940 7c159df71
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu Jun 6 14:18:07 2024 -0500

    Merge pull request #132 from Honeycase/patch-1

    Update queen's apprentice.json

commit 633bd1c38ae384f5b0ec9c6ee8c480bbb59cd4b4
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 13:52:37 2024 -0500

    stray pixel in shell pack

commit 56c01557d128936d9982601568461577e18a536c
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 13:50:55 2024 -0500

    inventory bugfix, duped accs renames

commit a1b0bc9cc22dddfea4f10f656debabe6cafb221a
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 13:15:00 2024 -0500

    debug oopsie fix

commit 1e2799c79df0728ce4293d361ca71c3c64f62cfb
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu Jun 6 13:10:44 2024 -0500

    new df cat stuff for rei, new wild sprite sheets (still bugged)

commit 3db5b7a01025b9295f5f77bd83b097af98b8391f
Merge: 9c9b04c86 7d028b561
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Tue Jun 4 16:18:00 2024 -0400

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit a74ff8940337045443c4fb4f1007136173a8144b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:47:00 2024 -0500

    nursery_activities tagged by e

commit 0d4cf51004bfbfaaec576fd45cdf2ee2197efadb
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:46:05 2024 -0500

    mate_lifegen.json tagged by e

commit 58d9c79b1b1075ffbb89eff488c479b96fb2248d
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:45:22 2024 -0500

    events.json tagged by e

commit ba60cc8cae3b57201493ddc7181a70658bc754ed
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:44:19 2024 -0500

    df.json events tagged by e

commit 2520f473ac6b5f6b3815a16e6977a93447790abf
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:43:22 2024 -0500

    ceremonies.json tagged by e

commit c289973a675d2b254f4765212dbf2a38c12b0401
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:42:14 2024 -0500

    general no kit finished by e!

commit 7d028b561729d1aca537fc8f8250174568da8bbc
Merge: 1cdad5a6e 658b00cce
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 17:11:36 2024 -0500

    Merge pull request #135 from jaysoleson/LifeGen-dev

    forgiven ceremony + df mentor/app tag fixes

commit 658b00cceadb5167cc86626f1be3d77ad31d10cd
Author: Jay <jayolesonbz@gmail.com>
Date:   Mon Jun 3 17:08:05 2024 -0500

    df apprentice tag fix

commit 89383fd9bc91274971d02c99c1fe630adbb396d3
Author: Jay <jayolesonbz@gmail.com>
Date:   Mon Jun 3 17:06:50 2024 -0500

    df mentor tag fix

commit bca28c32c31305a220611398e6fff2cd4f18fecb
Author: Jay <jayolesonbz@gmail.com>
Date:   Mon Jun 3 17:04:43 2024 -0500

    forgiven ceremony text sort of fix

commit 1cdad5a6eb03abf85266c797e835aa7b8233dc69
Merge: 02623ef20 587018741
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 15:07:27 2024 -0500

    Merge pull request #134 from ReigningMonarch/LifeGen-dev

    some events

commit 58701874139cc2abf7c986e851746dc5aadff62a
Author: Reign <155932891+ReigningMonarch@users.noreply.github.com>
Date:   Mon Jun 3 16:02:30 2024 -0400

    events

    exiled, elder, dep, app events

commit 9c9b04c8663f263423aae1eb3515014e6ee25e59
Merge: d63ad98c1 02623ef20
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Mon Jun 3 15:29:09 2024 -0400

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit 02623ef209585ba1efa30a88487cc71295bcbe04
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon Jun 3 10:19:43 2024 -0500

    prevent switching to SC/DF outsider cats

commit 514236c2de6958b397fba157c5f62eb602d299c8
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun Jun 2 22:32:45 2024 -0500

    shunned patrol fix

commit d63ad98c16d06e59ebc9d0696066cdff7928c657
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Sun Jun 2 21:34:24 2024 -0400

    dialogue-bug fix

commit 52dc3559dfd092bfd91d42cb4c58c9b089c72e26
Merge: 9f88f833c 87775196d
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Sat Jun 1 22:44:37 2024 -0400

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit 87775196dd6b0809fa340695bb60ca2fb7eb4c07
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 21:31:20 2024 -0500

    ghost/STAR skill cat talk btn fix

commit 61a933bfd60f7be7b0a89df76783921284e2f653
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 20:43:27 2024 -0500

    typo

commit 5e81ac75c2122b9ff183d075e0cde23b8f15ac44
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 19:35:33 2024 -0500

    typo

commit 3663e43136731cbc80acce0b878e4055f7e7a034
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 19:35:03 2024 -0500

    typo

commit 55c6452aa2677b127a3ddd5873b311093ec0d3fa
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 19:33:18 2024 -0500

    duped dialogue removed

commit a1d87b386e3e7f880692bb031b41e665b3e46b4c
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 19:30:50 2024 -0500

    typo

commit 792cd1bee240ee714efc5410c9f6a770be2b1079
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:41:12 2024 -0500

    crash fix

commit 840863860cdc79afadddec5d4234d468ba8342db
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:29:31 2024 -0500

    debug print removed

commit deec0ef3b6adc3c3106401bb95c89cb765d1656f
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:26:53 2024 -0500

    df general tagged by e

commit f741b8c1cb4fad94b9aea438333e5793a0cc8f54
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:25:59 2024 -0500

    sc medicine cat json tagged by e

commit 8ca94b11fe4cc61be82454dce717aee153895727
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:24:43 2024 -0500

    sc mediator.json tagged by e

commit 4d23cd46d27f30413e2d57ffcd57a5ab49a91375
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:24:09 2024 -0500

    sc leader.json tagged by e

commit c2af8dc21612e00196ec9a19f0ddf01f02c65b07
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:20:59 2024 -0500

    sc general tagged by e

commit 3a99e996dbf298615e7ab3f3ccb23b42a11fbb35
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:20:23 2024 -0500

    sc app json tagged by e

commit 665d2f0023f2b0d2ca181686edcdcfe8f218ded9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:19:32 2024 -0500

    affair.json tagged by e

commit 22285a98b84b7c440771f703a081d8231a86d64d
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:18:58 2024 -0500

    warrior.json tagged by e

commit 2c567a585d20b6c429319791094c46b8e3a0a0d3
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:18:27 2024 -0500

    queen.json tagged by e

commit 9656fdd47c8f28c55bdefa41a2e1f71a931a96f3
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:17:28 2024 -0500

    medcat json tagged by e

commit 4284bca2657b3e37e1c74edc66a522276adb6b5d
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:15:06 2024 -0500

    medcat app json tagged by e

commit 881278086868e59c80e6c0db73da9e3c569caaa7
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:14:16 2024 -0500

    mediator.json tagged by e

commit f691c8b764aef36665c60882c177f1979ced483d
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:12:58 2024 -0500

    mediator app json tagged by e

commit 34d2da45c03621797cbe48a9d329e2758ff00b1a
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:12:17 2024 -0500

    leader.json tagged by e

commit 78d33db4293b15c527c862b2864751a0bb665591
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:11:28 2024 -0500

    kitten.json tagged by e

commit 0a8878670e434c286782abbb586e209fcb002076
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:10:45 2024 -0500

    elder.json tagged by e

commit 73342bc54188624228051b348a87bf0d2edf3972
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:08:58 2024 -0500

    deputy.json tagged by e

commit 932c7b2006d6014547bbcf83adf901ced2e43381
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:08:24 2024 -0500

    apprentice.json tagged by e

commit 56f2f635e246b292ef2144c66c4ee9faed8f85a7
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:07:23 2024 -0500

    tag fix

commit 584da08a0dbbc7ea41398634ac2335aea2be5328
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sat Jun 1 18:00:08 2024 -0500

    tag fix

commit 9f88f833c713a00a22be917aa272f5fbcebd6cd3
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Sat Jun 1 15:45:53 2024 -0400

    Leader profile button overlap fix

commit e2eb71f9ea4397432aa25e99ffdd5413cc2d4084
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Sat Jun 1 15:34:31 2024 -0400

    leader ceremony+talk button overlap fix

commit be1cedd0be3d6420f1abf11e47ce613f9ce8999b
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 14:59:13 2024 -0400

    pronoun tagging

commit a4fc1cba693b7e4fb99750678c053a0d005d0344
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 14:43:59 2024 -0400

    reorganize

commit a705fab34d87e52cb3084e697ee0e0d0a6f36707
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 14:28:17 2024 -0400

    reorganize

commit a1487759723c54a0e8557425504eefed7365b4e6
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 14:13:02 2024 -0400

    pronoun tagging

commit ff988916b02fc4166db2cb52115a2d6d8ffbadc2
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 13:28:25 2024 -0400

    add non-mates

commit 3f1329264385633505d6e2212432ba8d1582e801
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 13:27:43 2024 -0400

    remove duplicate dialogue

commit 8918485d36318f9b3b9d0d0a7f0ac4b26aa0ff2f
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 13:27:03 2024 -0400

    fix

commit 7c159df7153278b22ba76afdde12fe1af5e9d031
Author: Honeycase <157860472+Honeycase@users.noreply.github.com>
Date:   Sat Jun 1 12:21:50 2024 -0500

    Update queen's apprentice.json

    Alligator skin boots

commit 5256eaf17cbd17143dfb37762932d7f342e4636d
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat Jun 1 13:21:50 2024 -0400

    remove duplicate dialogue

commit 1b398b40dc101d3faf362995b35aebf77651ac4f
Merge: 59b909088 baa53c5b5
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 31 22:48:32 2024 -0500

    Merge pull request #131 from jaysoleson/LifeGen-dev

    shunned apprentice ceremony fix + dialogue errors + crash fix

commit baa53c5b59fa17a9f4ccd9f006bb3598b7d2f89f
Merge: 765859401 3dbf2e419
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 31 22:17:28 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev

commit 7658594019b9200e292434c255229d4ebd70d59e
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 31 22:17:19 2024 -0500

    choose reborn tab crash fix

commit 3dbf2e41950b0190cd8d5af8d473ea008ac7c31a
Merge: b1d2d0b85 59b909088
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri May 31 21:51:51 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit 59b90908844c0e3217dbf31a5780b6e95b588f57
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Fri May 31 19:42:52 2024 -0400

    add some moon events

commit b1d2d0b8564c9e23a6c8be537e98e88cc9027d31
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 31 00:23:23 2024 -0500

    fixes from dev-bugs

commit 8268b6e35b3c7d5e1dc5acfb62d8f54ce21ddbb8
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri May 31 00:22:41 2024 -0500

    dialogue bugfix

commit fb0819906baf1e70c046c799c8fa227d2738d426
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri May 31 00:22:10 2024 -0500

    tagged new meow error fix

commit 7d4cb98aa0697525113bd24ef93601b69ea32be1
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu May 30 23:34:41 2024 -0500

    shunned app ceremony fix

commit acde0899255f8bdfa51a4ee1f4fbdc747f7b1040
Merge: 4f1e7f72f a654aefdf
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Thu May 30 22:13:54 2024 -0500

    Merge pull request #130 from ebutbetter/LifeGen-dev

    #dev-bugs fixes

commit a5b7602a4fde4dc65cc927404539c1a583cdd6c8
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu May 30 21:53:24 2024 -0500

    removed accidental pronouns in dev OOPS

commit 001746fdc6d0243318874daa148e3eac1d60afa4
Merge: 0ed9cb441 10188e152
Author: Jay <jayolesonbz@gmail.com>
Date:   Thu May 30 21:50:34 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev

commit 10188e152a4dbd218650a3903bb7789b1dd8419c
Merge: ad6095a9e 4f1e7f72f
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Thu May 30 21:46:56 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit ad6095a9e1eef816c8d4c259d5e8243ba288e59f
Merge: 1645d3d2b 80c82c3fe
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Wed May 29 15:39:27 2024 -0500

    Merge branch 'dialogue_pronountagging' into LifeGen-dev

commit a654aefdf5056901971017c90a0fc42e87cdfb1b
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Wed May 29 14:43:24 2024 -0400

    Update general_you_kit.json

commit 197e59b7d4724ca427a06ee010bb76d8bf1041e7
Author: ebutbetter <151376431+ebutbetter@users.noreply.github.com>
Date:   Wed May 29 00:25:25 2024 -0400

    #dev-bugs fixes

commit 2b932084e2339e9d99c87014c1e8631dec123e3f
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:59:36 2024 -0500

    warrior.json fully tagged by e

commit e5f266e7b22d8c2a0e2fc5cb0a5b947a98de533e
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:59:02 2024 -0500

    medcatapp json fully tagged by e

commit 74d26d7ec2c77a073396536e05c62916a101cd32
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:55:40 2024 -0500

    mediator apprentice.json fully tagged by e

commit ca62d797966fa33a0dfc0c38d7b60fb364d28b1b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:55:00 2024 -0500

    leader.json fully tagged by e

commit 5061037265b29ff9e5f3da9d0cb872b6ea1aca10
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:54:20 2024 -0500

    kitten.json fully tagged by e

commit 0b2ffd407288ab43faf8ddb3289f3fa99acd810e
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:52:47 2024 -0500

    general_no_newborn fully tagged by e

commit 8083b2bc8aeb7a1bb5a2e9d5619522a62dffe060
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:49:52 2024 -0500

    general_no_kit 6k-12k by e

commit dadd3b04326de7da84fb52f7de30ca49ebdb456b
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Tue May 28 14:46:55 2024 -0500

    flirt.json fully tagged by e

commit 94bc466f1705d12618df69c16c171e3ecc63fbcb
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon May 27 23:11:52 2024 -0500

    newborn.json fully tagged

commit 5b5a5ae0a393f55fb7a58e32a2567451347fadec
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon May 27 23:11:07 2024 -0500

    dialogue moved from wrong file

commit 4f1e7f72f69ae9511449ae42a9999f4c4aa7ae5e
Merge: 867e3fa17 b6afc93e7
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Mon May 27 16:18:18 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 867e3fa178112193b6e7e1307b177060af75d6c2
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Mon May 27 16:18:00 2024 -0500

    Update df.json

commit b6afc93e7e134bddd3909e72f602d2d4e929a666
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Mon May 27 15:50:17 2024 -0500

    formatting fix

commit e50b469867bb929684b9f643da63f5f1b2fc73dd
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun May 26 21:42:30 2024 -0500

    various fixes

commit a4af9cbeb480b49d6523f1c460cf2a202b064575
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 14:26:20 2024 -0500

    elder.json fully tagged

commit 2481a9387e7b11cff2a9e43fddb128af1eb8d80f
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 14:06:25 2024 -0500

    deputy.json fully tagged

commit f2cf44bd190444fb5932e7df5b29b940b49b911b
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun May 26 13:33:52 2024 -0500

    Update TalkScreen.py

commit 4cbac5a5a11bfcf7b1540c5240623b75dba4ece2
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun May 26 13:30:18 2024 -0500

    Update TalkScreen.py

commit a593ae2a349d9b281e7c3e612810975013bf07a5
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 13:27:34 2024 -0500

    fully tagged

commit d78e63beed2797f68d72835adb672365bdce47a8
Merge: 7389bf68e c7bb0b00b
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun May 26 13:27:16 2024 -0500

    Merge branch 'dialogue_pronountagging' of https://github.com/sedgestripe/clangen into dialogue_pronountagging

commit c7bb0b00bc4b87e41f10249e23f57998647cdbd9
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 13:27:05 2024 -0500

    fully tagged

commit 7389bf68e2f7f6441cb3de5f6b759223c41c9f88
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sun May 26 13:26:54 2024 -0500

    Update general_you_kit.json

commit 0f6d5e82c38b7bfb4e92e75f6f8f310a70be5ceb
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 13:26:34 2024 -0500

    fully tagged

commit ecbd23f1088f0fd1e3ec92e2ed789ecbe62f2ce7
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Sun May 26 13:26:04 2024 -0500

    dialogue tagged 1-5800

commit 4585c2769603691aa9909482808736bfe8b1f9f1
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 13:20:32 2024 -0400

    pronoun tagging

commit f70883993025ccff30a2b5f3ae49a528d87cac5d
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 13:19:01 2024 -0400

    pronoun tagging

commit 5dd15a8297fc7f66fbe229ca232b4192d10dd52d
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 13:18:45 2024 -0400

    undo pronoun tagging lmao

commit 77f16a1642309b32a1a28b978db44201e1e1dae4
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 13:15:58 2024 -0400

    pronoun tagging

commit b4e0b0fc9fdf2d288a0eae72d7edb42bd5aaccfe
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 13:03:51 2024 -0400

    pronoun tagging

commit cfe675f36d133dc565ac38334152e9214bfa49ff
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 12:50:09 2024 -0400

    pronoun tagging

commit 238b43bb1fce8135092daa7defb3a4eda5875d2f
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 12:41:49 2024 -0400

    pronoun tagging

commit e4f1b8153929398a2129510f8c292ab992177a3d
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 12:35:18 2024 -0400

    pronoun tagging

commit 93dbb5c16df4fd00f89b089cdcc3b3327ffed893
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 12:19:38 2024 -0400

    removing duplicate dialogue

commit 004d2b8c60707331ada0d5bd58bf36e7e16be436
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 12:01:56 2024 -0400

    retag

commit 3eeebdc37c0780a131877c9e8f4c473d73ada377
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sun May 26 11:57:26 2024 -0400

    add general dialogue

commit 2821f21c0efeb9a40ec78c7a7fe7b9cd921b1248
Merge: 19f6ff079 cdeb0ee61
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 21:56:59 2024 -0500

    Merge pull request #129 from sedgestripe/Lifegen-dev-chibi

    Fix for playing as faded cat bug.

commit 19f6ff0790a2d3812bd57323083d8f6e6b94a7ca
Merge: da07a5b3e 9776d35e4
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 21:56:25 2024 -0500

    Merge pull request #128 from Honeycase/LifeGen-dev

    Fixing the formerly backstory tags

commit da07a5b3e8178d2ec15a555fe13169fc1b4ba5bf
Merge: 286fc8905 1645d3d2b
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 21:55:53 2024 -0500

    Merge pull request #127 from jaysoleson/LifeGen-dev

    Meow Errors + Forgiven Tags

commit cdeb0ee61845377729cc8664cbc1bf8abfe2aaa8
Author: ChibiGalaxies <trixiethecloudiewolf@gmail.com>
Date:   Sun May 26 01:23:29 2024 +0100

    Fix for playing as faded cat bug.

commit 286fc8905e36afac02a3925e3842dfe329245d09
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 18:06:31 2024 -0500

    add events

commit 0ed9cb44195bacbbdb2aa2ebdc5b9e1164449f67
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 16:32:44 2024 -0500

    abbrev fix

commit 1645d3d2bf4dce35a14af9cfe136a4d65f1228bb
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 15:00:24 2024 -0500

    pronoun fixes

commit e2c43d3ccb96a56620e475574f54aab162199434
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat May 25 15:40:12 2024 -0400

    pronoun tagging finish

commit 70ad5f303b4c359ad28137b216f03aacb543beda
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 14:35:27 2024 -0500

    wrong tag

commit 9776d35e4bd60743b575bdd58621543105297d25
Author: Honeycase <terraaz13@gmail.com>
Date:   Sat May 25 14:23:45 2024 -0500

    Fixing old backstory tags

    Whoever did this and failed to tell the rest of the team + change flirt/insult/checker.py 's, I'm out for blood. Kidding. Am I?

commit 21ae0534f6f73992f7a81c2be579610177c3207e
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat May 25 15:18:08 2024 -0400

    pronoun tagging

commit c6f1239de254dacc6338973c8ed3bef173f441b5
Merge: 675b12afa 8b80722a9
Author: Honeycase <157860472+Honeycase@users.noreply.github.com>
Date:   Sat May 25 14:10:11 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit 8fe1595a10c525df04e65b1df33029ec6e753e03
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 13:28:01 2024 -0500

    forgiven tags update

commit 0e90371efdba4a6559d09e876a0886407ba6a7a6
Merge: 396992b71 8b80722a9
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 12:50:52 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev

commit 396992b710928942dd6417a4f08276c603978db2
Merge: bd8833ca0 8bcb64ea8
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 12:45:00 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev

commit bd8833ca0e5dacb5142aef12db5d8ad36839521f
Author: Jay <jayolesonbz@gmail.com>
Date:   Sat May 25 12:44:58 2024 -0500

    some meow errors + minor fixes

commit 8b80722a9238b13a8abab51087976a960e9f9214
Merge: bd1424b5b c09a3c709
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 12:25:18 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit bd1424b5b4181f703d243f31cd2dd75268b38ba6
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 12:22:49 2024 -0500

    fix leader faith

commit c09a3c7091cfde152ec818e6d71614598f1ab076
Merge: 1c2cdc931 8bcb64ea8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 11:59:47 2024 -0500

    Merge pull request #126 from jaysoleson/LifeGen-dev

    New Dates + Patrol Art

commit 1c2cdc931ae1e7e80a924477bcd6e55ce32ea27b
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Sat May 25 11:58:11 2024 -0500

    various fixes

commit 8bcb64ea8442d980eaf675806e547edab9c8c55d
Merge: deb941e95 280cca5f0
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri May 24 23:51:59 2024 -0500

    Merge branch 'LifeGen-dev' into LifeGen-dev

commit 280cca5f06d6542c34d262a4d3142af94981b9c0
Merge: 0f3e3def1 7e71147ce
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 23:37:21 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 0f3e3def1f2259115ba18ade7ea508a0ae526e73
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 23:23:44 2024 -0500

    Update patrol.py

commit 7e71147ce03be1f60bad30e3b3e64be369636157
Merge: 852d3ecd3 19242a11d
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 23:19:22 2024 -0500

    Merge pull request #125 from ReigningMonarch/LifeGen-dev

    some patrol fixes

commit 852d3ecd3ca7b40a3b0071c574e4c9aa1ff04a8e
Author: anjojin <141890587+anjojin@users.noreply.github.com>
Date:   Sat May 25 00:17:14 2024 -0400

    fix bug

commit 5c062035df4b2d5b9434733acfb905aab5abecf0
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 23:16:32 2024 -0500

    Update cats.py

commit deb941e95df04dab25e6138364778a353c2d5ffc
Merge: cec14be01 fa68c262e
Author: Jay <144476842+jaysoleson@users.noreply.github.com>
Date:   Fri May 24 23:06:09 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit cec14be01a31600cebdd03f3d1c973b8dac2e664
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 24 23:05:49 2024 -0500

    new dates, new jay patrol art

commit fa68c262ed26cc625339c3bd42392e8f7d3c6148
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:57:20 2024 -0500

    Update events.py

commit a70456169536e36c2473e0e2db82e1c1ead75a58
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:49:03 2024 -0500

    Update ProfileScreen.py

commit 3fc5c5a58b2d9a5c89cf02195e9b8fb830533722
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:48:31 2024 -0500

    no faith checkbox

commit d8d23bced34360b453366d29a1c477f1192218ac
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:30:38 2024 -0500

    update faith display

commit 3661f15d272e339a19517c981a6547b3c9762841
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:19:13 2024 -0500

    fix acc generation

commit 1ddf5c50db0f8a2c7a48f837425ceed2f2aacf68
Merge: 80697f0a6 d4b8b3a35
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:14:05 2024 -0500

    Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev

commit 80697f0a6d245ce060d499c55e604f359c86ea80
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 22:13:56 2024 -0500

    faith levels and patrol fixes

commit 19242a11df20e02658b033c40cdc01971c145817
Author: Reign <155932891+ReigningMonarch@users.noreply.github.com>
Date:   Fri May 24 22:03:18 2024 -0400

    some patrol fixes

    half fixed patrols bc I'm slow and lazy

commit d4b8b3a35f0770f7364415fba6c620be7407dcac
Merge: d11927645 d45a0a9f8
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 20:47:33 2024 -0500

    Merge pull request #123 from Honeycase/honey-does-stuff

    queen.json clean up

commit d11927645f95a19e1006de94323f800bd3527153
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 19:11:56 2024 -0500

    Update DFPatrolScreen.py

commit f4e59974d72bbc7393d493e5eb6e6c1d9d6a592e
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 19:09:53 2024 -0500

    patrol fixes

commit 66232613d4de6c2d6e11ba59c1bf6b7364c5f1fe
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 18:45:49 2024 -0500

    Update TalkScreen.py

commit 936516cb3cc2a807d46a3744466855b7c6b02bec
Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com>
Date:   Fri May 24 18:45:11 2024 -0500

    update with multi character and connecting dialogue

commit 80c82c3fed95299e93564176617474cb7e5986b1
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 24 18:19:36 2024 -0500

    general_no_kit lines 1-4k

commit 675b12afa404a9a3a1b829e3e5cfe0c87625a177
Merge: f3d08b209 15989572f
Author: Honeycase <157860472+Honeycase@users.noreply.github.com>
Date:   Fri May 24 14:26:37 2024 -0500

    Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev

commit f3d08b20922a9883f6bf30192772a73accfeb5ad
Author: Honeycase <terraaz13@gmail.com>
Date:   Fri May 24 10:02:04 2024 -0500

    Rewording patrol outcome

commit c6ae63386342b4cff914bc13510034f2d0cb1354
Author: Jay <jayolesonbz@gmail.com>
Date:   Fri May 24 02:23:44 2024 -0500

    pronouns
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ReigningMonarch @sedgestripe