-
Notifications
You must be signed in to change notification settings - Fork 683
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
Typos #8928
Merged
Merged
Typos #8928
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
Member
Booplicate
commented
Feb 26, 2022
•
edited by multimokia
Loading
edited by multimokia
Booplicate
added
bug
awaiting dlg review
dialogue needs to be reviewed
awaiting testing
code needs to be tested
awaiting code review
someone needs to check for syntax/logic/indentation errors
labels
Feb 26, 2022
Closed
Closed
multimokia
previously approved these changes
Jun 19, 2022
Legendkiller21
previously approved these changes
Jun 20, 2022
multimokia
previously approved these changes
Jun 20, 2022
`str` is primitive and can be allocated/deallocated by python at any time. `is` cannot be used because the instance might be different, even if the value is same. Values for `MODE_BAD_CHESS` and `MODE_960` had been swapped before.
Booplicate
dismissed stale reviews from multimokia and Legendkiller21
via
July 14, 2022 14:23
e010f95
jmwall24
approved these changes
Jul 17, 2022
Legendkiller21
approved these changes
Jul 17, 2022
multimokia
approved these changes
Jul 17, 2022
jmwall24
removed
awaiting dlg review
dialogue needs to be reviewed
awaiting testing
code needs to be tested
awaiting code review
someone needs to check for syntax/logic/indentation errors
labels
Jul 17, 2022
KiRyX112
added a commit
to KiRyX112/MonikaModDev
that referenced
this pull request
Jul 20, 2022
commit a81cea3c27d51db75b64e584d5720889ff008485 Merge: dd2351172 0a7922522 Author: potato <[email protected]> Date: Sun Jul 17 19:15:46 2022 -0500 Merge brat nch 'pre-master' commit 0a7922522bf010dc4435bc2aa98ca9b7e65abaf4 Merge: 7150e7c64 ff0da9c0f Author: ThePotatoGuy <[email protected]> Date: Sun Jul 17 19:13:57 2022 -0500 Merge pull request #9233 from Booplicate/more_wr_fixes More wr fixes commit dd2351172228f037e1f881935865e257ea287933 Author: potato <[email protected]> Date: Sun Jul 17 19:01:25 2022 -0500 version change commit 7150e7c642332be014bf5428bf81887f245a0401 Merge: 7b9c0d396 e393f8c4f Author: John W <[email protected]> Date: Sun Jul 17 19:54:22 2022 -0400 Merge pull request #8928 from Booplicate/typos Typos commit e393f8c4fb67ee03bec1c227366e50a99e324f6e Author: Totally a booplicate <[email protected]> Date: Mon Jul 18 02:17:00 2022 +0300 fix invalid formatting param commit f0e3a83bdf6a0df74ed49e7d351d0345224b4e5c Merge: e010f95cb 7b9c0d396 Author: John W <[email protected]> Date: Sun Jul 17 19:03:51 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 7b9c0d396ba3a2369ac78a9a5b21d5c86fb7febc Merge: ac6bb6fc9 757c784aa Author: ThePotatoGuy <[email protected]> Date: Sun Jul 17 18:01:14 2022 -0500 Merge pull request #9271 from Booplicate/NoU NOU EnHaNcEmEnT commit e010f95cb1bbc3db1e71cc82d39e4116704f1638 Author: Totally a booplicate <[email protected]> Date: Thu Jul 14 17:19:33 2022 +0300 fix typo + fix `is` check with str `str` is primitive and can be allocated/deallocated by python at any time. `is` cannot be used because the instance might be different, even if the value is same. Values for `MODE_BAD_CHESS` and `MODE_960` had been swapped before. commit 757c784aa79ea1be4e0b3f134c01507f32bbb2e2 Author: Totally a booplicate <[email protected]> Date: Fri Jul 8 22:39:54 2022 +0300 This only works for +2s commit c6219e7a61b12945789a74a23a1a76285cded8ac Author: Totally a booplicate <[email protected]> Date: Wed Jul 6 18:04:24 2022 +0300 increase dealing delay to 0.3, but deal 2 cards at once commit be5f28e1b95e72d62bc8ce917271cb9c1e3ebfc6 Author: Totally a booplicate <[email protected]> Date: Wed Jul 6 16:48:08 2022 +0300 improve dlg flow + random calls cleanup commit 3ea2fbc8cc8cb1e4e3fd0465faf6905fdd7355ca Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 22:42:34 2022 +0300 add new sfx commit 695c579c0eee0b4bcb303f370819b7d48b42ddfb Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 22:42:07 2022 +0300 further improvements to sfx sfx for _update_drawpile + a few fixes commit 51beaa8e2a67a89166ab6630245adb314490d350 Author: multimokia <[email protected]> Date: Tue Jul 5 01:28:51 2022 -0400 smol dialogue things commit 0a4df35c340392f7f020756b0798be44ac2e06b2 Author: multimokia <[email protected]> Date: Tue Jul 5 01:13:50 2022 -0400 smol quip thing commit 082511365b442cd5e8b07b5b6c7138c405cd61e2 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:34:09 2022 +0300 fix crash commit 8a8f0b8126f95d2e61d7d5374f8c89874afa7ab6 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:15:14 2022 +0300 handle help when colour is None commit 07165bae82924d329b45fca224b3641ea526e026 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:13:07 2022 +0300 hopefully better sfx commit c2f400cf4959d86b4c429818831fe5907e5fe73e Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:40:33 2022 +0300 please, stop commit 4f2932e16ac43e150a3b1894af9b9e7f11bc08ea Merge: b735109c2 92654f8e3 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:37:36 2022 +0300 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into NoU commit b735109c21a290648f0ed0e42a9718073116052b Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:36:54 2022 +0300 forgot this commit a0189fa63b0aaf6dd311bb6f617ea853b594543e Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 02:56:19 2022 +0300 update sfx system commit 92654f8e36cd7a31f81e72f732d15989e0b32ce6 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 02:56:19 2022 +0300 avoid playing sound when smooth False commit cb036a6a6546aebdbcd7b7f11d9d951f351174dd Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 01:27:04 2022 +0300 add 0.05 sec to pause commit 0fb476d1c1f4edcd51c50726120c442174287a6a Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 01:26:04 2022 +0300 improve sfx commit e66c5daa0d13df5a6e08c784397e6472d1a8bc50 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 00:45:49 2022 +0300 add sfx Thanks to Kenney Vleugels commit 1b6da6bfe97887cff188ed2e5d4281142ed2b218 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 00:45:03 2022 +0300 implement sounds commit 0479b01617ebf546829c42fc3df1bd362816ae6f Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 23:34:05 2022 +0300 smol commit 7557f676d3142efa3fc3c6c16b78caecbfcfd2d8 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 21:59:06 2022 +0300 added more typos commit 9419b8371f16e0d3053c26283f8870b352fdc7b1 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:53:50 2022 +0300 Moni is a bit more agressive 20% to play more aggressively commit 63dbf9e5e0378e86f677d9a528bbdd91b52f62b5 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:10:44 2022 +0300 resize the desk commit ef9d67999595134e41056c2509cd4d8fb0490d9c Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:10:36 2022 +0300 space fix + update ui commit f5ff985c562e59a8694be737f9b15e5dea6242c3 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:53:21 2022 +0300 make card bases empty this should further improve accessibility for dragging commit e9ad4f47b121a2b581821971d72eabcd4e3cfbce Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:33:31 2022 +0300 DRY all the way another inner func to remove duplicated condition commit d875f1d8363676f78ed25032802f733a53d70304 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:01:53 2022 +0300 better wording commit f2a2cfe4a546bd3ed73e643e201a3ef440c837d0 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:51:08 2022 +0300 Smarter advice commit 5995c6b4c583dd5dd880874fc24d0912007326de Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:43:02 2022 +0300 avoid spoilers in logs commit 066b73b85f14fba36721d37fdb3985a5412e34da Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:36:32 2022 +0300 allow to early skip if you have max cards Example: you need to play red 5 but from all your `HAND_CARDS_LIMIT` cards you only have yellow and green and no 5 You have to draw a card before skipping, but you cant draw more - you're over limit. commit 637199f25e6fd09031da6e5347739c8f55b55f03 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:31:09 2022 +0300 only let draw cards if below the limit commit 72913ff16d2b3faf4c4497404fe07f3b11910b4b Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:26:06 2022 +0300 fix `should_draw_cards` reset on card limit if you drew only few of the required cards, you could still get non-zero `should_draw_cards`, and then get a reaction from Moni telling you shouldn't draw more, but it was already a next turn! commit ec7871296c0bb5e01c32cfbed5a2315e59e09709 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:37:04 2022 +0300 better UI + screen code cleanup commit ec25a599815e8e5056875fafbd469dca3143ca86 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:14:27 2022 +0300 pretend you didn't see this pls commit c19c6f35d60ccc2f9638b2b8708397ed19c2e480 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:10:57 2022 +0300 Update zz_dump.rpy commit bba9f04e93bed53bb40b75485df14c8c06cf1c8b Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 03:49:44 2022 +0300 a few spicy quips commit 7b04ef19cabd6cbddcc8274406b7966a5bb1b102 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 02:43:24 2022 +0300 more accessors commit 415d0be90e281ada12ead22dc9b74078fe007918 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 02:33:40 2022 +0300 WIP: help system commit 9aea31cfc665699372e091b8f9bce6268520df11 Author: multimokia <[email protected]> Date: Sun Jul 3 17:59:21 2022 -0400 unfortunate might feel better here commit 1816df8edb14ac17acf95d79170b41d7fdd88f11 Author: multimokia <[email protected]> Date: Sun Jul 3 17:55:42 2022 -0400 easy doesn't feel correct here commit cad8df4c1cfd1fcb9ff6871c1e2ce83ea254c1e3 Merge: 68840a6a2 bf853185b Author: multimokia <[email protected]> Date: Sun Jul 3 17:53:32 2022 -0400 Merge branch 'NoU' of github.com:Booplicate/MonikaModDev into pr/Booplicate/9271 commit 68840a6a202b3e82c023955869150052f0cdd802 Author: multimokia <[email protected]> Date: Sun Jul 3 17:53:23 2022 -0400 more quips commit bf853185ba852424904d3a99d8af79d5780a4fad Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 00:13:28 2022 +0300 not wcc reaction if moni won commit a72ec31dd397a6b7975c2f9d7a5bf3cf25f103d3 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:53:56 2022 +0300 better naming commit 12e18c777d289ae29e3aac51754fef5381fa4e4b Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:52:53 2022 +0300 improve accessibility can play cards with double clicks commit dff5c489267b3bb0b339c8b4bf6316eefe5ce4f1 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:16:54 2022 +0300 improve drag by reducing aircraft speed commit c543c25b226b3fac9c6490854229cde4936d72fa Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 20:09:40 2022 +0300 no wcc reacts for wd4 commit 7ce446a016e48694cebc0293dc1524557b828c9a Merge: 1445c7c0e e161c1ca2 Author: multimokia <[email protected]> Date: Sun Jul 3 12:38:57 2022 -0400 Merge branch 'NoU' of github.com:Booplicate/MonikaModDev into pr/Booplicate/9271 commit e161c1ca2c1497fe8b9aa882dd857bcb3a4148f9 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:57:00 2022 +0300 make some methods semi-private commit 1445c7c0ec0afa7bb33d77a2091b00803cd361ab Author: multimokia <[email protected]> Date: Sun Jul 3 11:54:53 2022 -0400 another quip commit ec5a53519c9e71996c7cf0e82e37e8245f7d4ab4 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:32:38 2022 +0300 quips stuff commit 887276fc9c92231d50e540d93599d350f6d6b872 Merge: ba0585351 ab42a582f Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:01:52 2022 +0300 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into NoU commit ba0585351d64173cccdd01090e4ac6f961caa941 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:01:49 2022 +0300 less panic moni commit ab42a582f0c245e1da30408ac577d8d3fc27d8bf Author: multimokia <[email protected]> Date: Sat Jul 2 23:20:15 2022 -0400 smol grammar thing commit 5c91f7e8efbf37d47f84e5eee536159b7ce20e78 Author: multimokia <[email protected]> Date: Sat Jul 2 22:43:44 2022 -0400 another quip change commit b907e6c254021286cdeb89895e8686e2ebc40750 Author: multimokia <[email protected]> Date: Sat Jul 2 22:06:39 2022 -0400 tweak color change quips commit 7415bd319bc670c5eed9e2e854d2ec83e3f84488 Author: multimokia <[email protected]> Date: Sat Jul 2 22:05:25 2022 -0400 smol dlg things commit 1ad1cf693eb8e1933a2200e1c50c2417a2d721c8 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 04:55:21 2022 +0300 rename chances_to_be_shown to tier commit 415536b746a6f41c6900916e594188f25c05b5d0 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 03:16:28 2022 +0300 clean up some logic commit 12de62fd848c83d81e412d25ff59554af86f27fe Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 02:57:40 2022 +0300 compat with dict + better repr commit 59dcccb1de5ae298ad3ae34759fc66d48e1606e9 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 02:14:18 2022 +0300 Implement `_NOUReaction` commit 3aae0a9ec8f797680372f0b5c185b9f909527fc3 Author: Totally a booplicate <[email protected]> Date: Fri Jul 1 23:54:19 2022 +0300 few fixes Improved repr Card class got dynamic value property Private classes are semi-private now for easier testing and maintenance Better classes naming commit 41b6bded54beab09f1b534706ff451e7da278878 Author: Totally a booplicate <[email protected]> Date: Fri Jul 1 23:27:46 2022 +0300 Legendary sanity check commit 45ffc33e3b6db8f3cff783a1a8c84db4342261b3 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 18:41:07 2022 +0300 dont stack chances commit 9460969c2f50f2d2064252d0638143d72b1fd12a Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:29:45 2022 +0300 few more fixes commit 96556b59f10ce522579c901437d27e0203d40a12 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:06:01 2022 +0300 add sanity check commit a21a7c2ec4b6b7d363b1650a436a1a751f0b5aad Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:04:38 2022 +0300 Monika can suggest to play nou commit 79eb292e9df9d557078ce315ebe833c49b9119e8 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 03:35:57 2022 +0300 add interact callback to `DeskSpriteSwitch` commit 3843c1d70355a4f642491b37555a718dc62ec5fc Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:58:33 2022 +0300 add `update_house_rules` commit c0213b65ed28b7dae4f58b11e0ea53e5e7eacd80 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:52:10 2022 +0300 few other changes commit 527afb3953fd49bdfc490978b427a8587bb047ac Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:32:51 2022 +0300 handle `stackable_d2` commit 991ff24cce93f7cfeb12dde099568dde8120993f Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:28:21 2022 +0300 handle `starting_cards` commit 6b6482e6bde6dcffce72fca3128e7bce5f759ae3 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:11:18 2022 +0300 handle `unrestricted_wd4` commit 85f7bbfd7e599cac7d61c210aec7190a9a1db9e8 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:08:08 2022 +0300 add `reverse_house_rule` commit 1f3003c3f5eb4cf7539bc81c3983513934a0dd99 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:59:40 2022 +0300 handle `points_to_win` commit 9699c728524cc2e9fb95d9382b2cc7ddd8a65cc6 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:49:40 2022 +0300 add accessors commit ecf964b1b8aa8537dc7c5277179a9555b8af0f22 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:37:53 2022 +0300 fix indents commit d9a343f6a97e0cbfb78a5ef50fab6e86ae164187 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:37:28 2022 +0300 sanity check commit 654a101ea2bf3525f04a55b9a4d42ab51aecdbcc Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:19:44 2022 +0300 only for +2 or +4 commit 11cc3b4e2a63c52693f70cc5ae6418334dcbe7d1 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 04:44:03 2022 +0300 more quips commit ac6bb6fc93468c3381564b1569b766514c04b08f Author: potato <[email protected]> Date: Wed Jun 22 00:06:57 2022 -0500 update ver commit 277444fd87edbf215205d892ded04f01c604bc63 Merge: 1b71c15a6 844591c2d Author: ThePotatoGuy <[email protected]> Date: Wed Jun 22 00:01:29 2022 -0500 Merge pull request #9260 from Booplicate/NoU NOU fixes commit 844591c2dd3425b6b1c0ecd249a476dc3e630696 Author: John W <[email protected]> Date: Tue Jun 21 21:10:27 2022 -0400 edits commit ede99e93c2489dcc20e4aba5365ae34a10cfa4a4 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 03:10:51 2022 +0300 propagate `smooth` allows to call `__update_drawpile` and `shuffle_drawpile` w/p pauses and new contexts commit 6b64c20aef8e8e6218bb91ef6114188dba715c45 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 02:14:42 2022 +0300 fix wrong index commit ad70544dda40b79d3f20d36d8511bf953087a2af Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 01:44:37 2022 +0300 show chibi commit f980377d13ea79d8a60e1ad936cbcc010e1e1eca Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:12:00 2022 +0300 actually, more rules commit 6f24916d5502aefbd67a6f1dc9a85c739ecf73b6 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:10:09 2022 +0300 fix old code commit aa07184ca3f33893cd646a08140c4c4b82404dd1 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:04:52 2022 +0300 add a hint commit a497a375e6eb734abed45c3eec7461f1ba73e803 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 19:00:42 2022 +0300 better pen art Co-Authored-By: Briar Young <[email protected]> commit ceef8c6b47437bca32cf4c8b24a7daf8dd51b30e Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:54:15 2022 +0300 guardrail with forcing faceup to `False` Idk if the issue was there, but this won't hurt commit a72f6c5b71eed84f6319b7d5c9c78651f6674157 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:42:43 2022 +0300 reset wild cards colours commit 438f490a11f22cd04a02363766094c9bd210fd17 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:30:18 2022 +0300 update drawpile if drew the last card commit 4023aaa5cb56d51ca53919dfbeeb28d2f2fab784 Author: John W <[email protected]> Date: Sun Jun 19 20:24:44 2022 -0400 space commit aec33438f8afa5533f5bc968d02c323f10ec62bb Merge: a6265893a 1b71c15a6 Author: John W <[email protected]> Date: Sun Jun 19 19:31:08 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 1b71c15a6c92af1379e05a0fbab7594cffde57e2 Merge: 803bea9b4 aacb090c6 Author: John W <[email protected]> Date: Sun Jun 19 19:24:43 2022 -0400 Merge pull request #9188 from ThePotatoGuy/more-retro-bows More retro ribbons from Retrolovania commit aacb090c6739cf21a7ba928aa43df9048704f1bc Author: John W <[email protected]> Date: Sun Jun 19 19:21:14 2022 -0400 G to g commit 803bea9b4ae4b4f966f1e11e4f0f3df477f0ccf9 Merge: 47c0bd954 4f8b0c25a Author: ThePotatoGuy <[email protected]> Date: Sun Jun 19 13:03:00 2022 -0500 Merge pull request #9242 from jmwall24/settings-change Settings word change commit 98c8088f1826deb84c45c221f29f57b41bf645e9 Merge: 250481341 689ea9d68 Author: potato <[email protected]> Date: Sun Jun 19 13:01:07 2022 -0500 Merge branch 'more-retro-bows' of github.com:ThePotatoGuy/MonikaModDev into more-retro-bows commit 2504813411c4ac74d72bca057ae76c69ce7f7d85 Author: potato <[email protected]> Date: Sun Jun 19 13:00:26 2022 -0500 rename sgb with green descriptor commit 47c0bd9548ac2006752131a0b4344cd466cf40dc Merge: 88f35dcfb a85681302 Author: ThePotatoGuy <[email protected]> Date: Sun Jun 19 12:56:05 2022 -0500 Merge pull request #9142 from ThePotatoGuy/chess-actions-dict-fix set chess actions dict to defaultdict commit 4f8b0c25a8a1280959b32cbf9d7bb3328c3f06ae Author: John W <[email protected]> Date: Thu Jun 16 19:05:30 2022 -0400 Detect commit a8568130215c01989c4b1d629354fc8b64bb7eb5 Author: Totally a booplicate <[email protected]> Date: Tue Jun 14 03:59:47 2022 +0300 clarify what keys are used commit a6265893a4c9427d84e80b9ddcc588e6355f68ec Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 06:01:23 2022 +0300 `sky` commit 47c4ea72e3862cfceea5997db3cdae15740861f2 Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:45:55 2022 +0300 `traveling` I hate traveling without my 2 Ls commit b46aef6737232360693d9f447936a809bd03550b Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:45:09 2022 +0300 comma commit ff0da9c0f3e74036c08dbb091d7e3065f059fa17 Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:01:59 2022 +0300 fix crash + better var names commit 956f2253f417c1b7bd887aa184364dcb8e4c1616 Author: John W <[email protected]> Date: Sun Jun 12 20:50:32 2022 -0400 inconsistency commit f4f5f2b0c9199c913b6fd79db5790ab47e84d0f6 Merge: 705826301 88f35dcfb Author: John W <[email protected]> Date: Sun Jun 12 20:47:56 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 689ea9d681ee85747a3f42f72d790a17de67834a Author: John W <[email protected]> Date: Sun Jun 12 20:13:22 2022 -0400 edits commit b0203ad8b441328d9612f775c2889affffe1abc9 Author: Legendkiller21 <[email protected]> Date: Sun Jun 5 01:10:55 2022 +0300 new thumbs commit 3ef0b9ab22487d689e6aa1fefc94759a84e943a3 Author: potato <[email protected]> Date: Sat Jun 4 15:56:53 2022 -0500 fixed gift name commit d21bac0d9b018778d021d06f28eed836d7fe9dbf Author: potato <[email protected]> Date: Sat Jun 4 15:51:30 2022 -0500 fixed up jsons, changed names to ribbons commit 65be0d64f217bd657df406ccb256bdbce7e64978 Merge: 81cc08fe9 88f35dcfb Author: potato <[email protected]> Date: Sat Jun 4 14:51:03 2022 -0500 Merge branch 'content' into chess-actions-dict-fix commit 88f35dcfbe1309c040208f2281d3221ff490f11a Author: potato <[email protected]> Date: Mon May 30 20:08:10 2022 -0500 version change commit 22f85f6613472d57583a809e17f444c6e1b987bb Merge: d1345e095 537173b53 Author: John W <[email protected]> Date: Mon May 30 20:53:24 2022 -0400 Merge pull request #5555 from Booplicate/NoU New card game to play with Monika [Warning:🍝inside] commit fb8e3f90a5994c98f91bf0d92882fceaa969de77 Author: potato <[email protected]> Date: Mon May 30 19:30:55 2022 -0500 Adding starter files Co-authored-by: Retrolovania <[email protected]> commit d1345e0953827f644f3f41f538dc9a93a3a27584 Merge: 53ecde9fc 6a63e00c1 Author: ThePotatoGuy <[email protected]> Date: Mon May 30 19:20:16 2022 -0500 Merge pull request #9186 from Monika-After-Story/pinkkimonospritepack [Spritepack] - Pink Kimono commit 53ecde9fcb05199bb338a171e3f039624a7925c0 Merge: 2409f2695 39dfea47a Author: ThePotatoGuy <[email protected]> Date: Mon May 30 19:15:50 2022 -0500 Merge pull request #9187 from Legendkiller21/thumbsfix Small thumb fix commit 6a63e00c1a691091751b76550038b30937e38b00 Author: Legendkiller21 <[email protected]> Date: Tue May 31 03:14:32 2022 +0300 thumb commit 39dfea47ae2e5dc0e2a293dd29c066714c32ebf4 Author: Legendkiller21 <[email protected]> Date: Tue May 31 03:01:59 2022 +0300 more thumbs commit e540defe063e4d78c9faaa423bb2a112b6c5eb52 Author: potato <[email protected]> Date: Mon May 30 19:00:52 2022 -0500 missing layer 10 here commit 2409f2695cf11a109ef2ea91e815001a3e6489eb Merge: 500f7e8b5 376d83cc9 Author: John W <[email protected]> Date: Mon May 30 20:00:31 2022 -0400 Merge pull request #9115 from kkrosie123/briaryoung-chokers [New Spritepacks] Chokers commit 537173b53f999080d3e91b0a2e328f561315e4bd Author: John W <[email protected]> Date: Mon May 30 19:55:36 2022 -0400 prompt back commit e9195e66ea6606994e6da6300ed9d40c6e71daa3 Author: lunulae <[email protected]> Date: Mon May 30 18:44:08 2022 -0500 resized commit 61cd7dcd35116dc9117813363dd576848896e926 Author: lunulae <[email protected]> Date: Mon May 30 18:28:19 2022 -0500 whoops, forgot an entire folder commit 500f7e8b5c3462d187b85fd3467010ca7dd698e6 Merge: 7b1f8186a 261cae3ce Author: ThePotatoGuy <[email protected]> Date: Mon May 30 18:26:11 2022 -0500 Merge pull request #9172 from kkrosie123/briaryoung-button-up-flowered [New Outfit] Button Up (Flowered) commit 376d83cc96f62d4723778ee7644bfeeb7a125edd Merge: 1f78cc0ef ad8b0ed0f Author: potato <[email protected]> Date: Mon May 30 18:25:21 2022 -0500 Merge branch 'briaryoung-chokers' of https://github.com/kkrosie123/MonikaModDev into briaryoung-chokers commit 1f78cc0ef211d9ad51f47095f04a9c518829cb14 Author: potato <[email protected]> Date: Mon May 30 18:25:05 2022 -0500 priority adjust commit 7b1f8186a5322d5007d08bd5e26bdb70c408a3d7 Merge: 7263b836c 6ae944c23 Author: ThePotatoGuy <[email protected]> Date: Mon May 30 18:10:46 2022 -0500 Merge pull request #8940 from kkrosie123/dress-dark-blue-sparkle [New Spritepack] Dress (Dark blue, sparkly) commit 252bd2c64e5679f4eab81356ff4eed60b5229c87 Author: lunulae <[email protected]> Date: Mon May 30 15:37:04 2022 -0500 add sprites commit 261cae3ce271a5c9f346a7af005ff965d9c924dd Author: lunulae <[email protected]> Date: Mon May 30 15:28:34 2022 -0500 downtiedstrand update commit 66dab7a683da1683c90287c369c0d11d0d69b029 Author: lunulae <[email protected]> Date: Mon May 30 01:40:21 2022 -0500 removing bare-shoulders exprop commit 0d733d4bf6b95fc5bb3fe331e8057cb7811b14a0 Author: multimokia <[email protected]> Date: Sun May 29 22:13:35 2022 -0400 less formal wording for must commit 8b20855da0244ed3bf069608fb8a0a581daa1764 Author: Totally a booplicate <[email protected]> Date: Mon May 30 03:02:03 2022 +0300 how did this got reverted commit aceae24feaa346ad0f7bcf9ca600852b1f013866 Author: Totally a booplicate <[email protected]> Date: Mon May 30 02:52:28 2022 +0300 should use `random.random` smh commit 7c16f974d05b50a28894d2aeeaf8b0a3737ecc51 Author: Totally a booplicate <[email protected]> Date: Mon May 30 02:30:53 2022 +0300 some things commit 127cb99906d89a7e0a92313a4a71dc63ef9bc583 Author: John W <[email protected]> Date: Sun May 29 18:52:00 2022 -0400 smol commit 7263b836c6c37e24620b82ef527c184264a1ca11 Merge: c0662d981 78754f881 Author: John W <[email protected]> Date: Sun May 29 18:36:53 2022 -0400 Merge pull request #9039 from kkrosie123/bralette-red-ruffles-spritepack [New Spritepack] Bralette (Red, Ruffles) commit c0662d981e0508ae3033755db3ef4f07e965a7e1 Merge: e9ec4c0bf 2af91a461 Author: ThePotatoGuy <[email protected]> Date: Sun May 29 17:34:52 2022 -0500 Merge pull request #9177 from kkrosie123/tshirts-jurassic [New Spritepack] Jurassic T-Shirts commit ca2fd6d92f859d495d957c9ae086801c905b385c Merge: 09bdbc999 f99416d2c Author: John W <[email protected]> Date: Sun May 29 18:33:24 2022 -0400 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into pr/5555 commit 09bdbc999de1fada4ce1bdb7da7aabbed9c54288 Author: John W <[email protected]> Date: Sun May 29 18:33:09 2022 -0400 edits commit f99416d2c080ebdc9f6b8884821b78c3bfcee777 Author: Totally a booplicate <[email protected]> Date: Mon May 30 00:25:33 2022 +0300 `ever_won` is obsolete commit 2af91a46119e8277306ef98fdd74a09e4e76444c Author: John W <[email protected]> Date: Sat May 28 23:42:52 2022 -0400 hold onto your butts commit 78754f88146cd14b157b3f83063a257a4328ee29 Author: John W <[email protected]> Date: Sat May 28 22:28:19 2022 -0400 smol commit ad8b0ed0f53100b1d3396c48d07d480603bb5610 Author: Legendkiller21 <[email protected]> Date: Sun May 29 04:55:58 2022 +0300 thumbs commit ccb721db8a19b229e8b716c96bb595995a045f1a Author: Legendkiller21 <[email protected]> Date: Sun May 29 04:08:25 2022 +0300 thumbs commit 03a46089f0966a6a5292faab3a0787930f707471 Author: potato <[email protected]> Date: Sat May 28 17:51:46 2022 -0500 correct image name commit e9ec4c0bfa6aa6c490ba111162679cdd72cf119d Merge: 83ab6d01d eeaa91362 Author: ThePotatoGuy <[email protected]> Date: Sat May 28 17:36:08 2022 -0500 Merge pull request #8027 from ThePotatoGuy/clothes-json-outfit-req Add outfit options to sprite JSON commit c94e56e78d3c72b100977dfa249228908ff245ec Author: potato <[email protected]> Date: Sat May 28 17:30:50 2022 -0500 pack chokers into 1 pack commit 956c759731c3f4b5236e9b0bf6bb238c408adb60 Author: multimokia <[email protected]> Date: Sat May 28 17:02:03 2022 -0400 clean some mid-game quips commit 0c1ea45376a6e3182b5b747fdafa334f406e78f6 Merge: 285a57eb9 83ab6d01d Author: multimokia <[email protected]> Date: Sat May 28 16:39:23 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/Booplicate/5555 commit 1ba26287ae1da1d787f711360cc6df150f0f4971 Author: Briar Young <[email protected]> Date: Fri May 27 19:02:29 2022 -0500 art fix commit cca6d27e9ec5d64b18087f1a420a375b7ec4a461 Author: Briar Young <[email protected]> Date: Fri May 27 18:42:36 2022 -0500 name fix commit a3626395aa44361fe6cb27e7800997da0a717f65 Author: Briar Young <[email protected]> Date: Fri May 27 18:39:50 2022 -0500 attempt error fix commit fb945c0f06a581d2adef1a2fe31eded8eb55dee0 Author: Briar Young <[email protected]> Date: Fri May 27 18:34:35 2022 -0500 add jurassic park commit 5ee36f324f57745afa76c171ddc66ba774dd3a52 Author: Briar Young <[email protected]> Date: Fri May 27 18:23:43 2022 -0500 finish jurassic world commit 83ab6d01d9957e40ecead79522e006fd646d1e91 Merge: 82e742492 3e2858d85 Author: John W <[email protected]> Date: Fri May 27 18:15:20 2022 -0400 Merge pull request #7541 from lunulae/patch-33 [Mood] - feeling grateful ❤️ commit 81cc08fe95ef75dafac03902ae03a168d27d5cab Merge: 206a7ae87 82e742492 Author: potato <[email protected]> Date: Tue May 24 21:25:17 2022 -0500 Merge branch 'content' into chess-actions-dict-fix commit 82e742492c0d9eb5a7e9f5693bde696aaa15f6b0 Author: potato <[email protected]> Date: Tue May 24 21:13:31 2022 -0500 update script update commit f2e3d5e4cb7e94d92f01021776a086d0cde5a84c Merge: 4fc051022 022080b05 Author: ThePotatoGuy <[email protected]> Date: Tue May 24 17:18:55 2022 -0500 Merge pull request #8996 from Booplicate/mas_set_gender_cleanup Cleanup pronouns commit 4fc0510226b1fef0df7b89089fd1b7f3b064431f Merge: f178d7ef9 7cab84a4a Author: ThePotatoGuy <[email protected]> Date: Tue May 24 17:18:08 2022 -0500 Merge pull request #8929 from Booplicate/wet_monika Polish hair commit 022080b05f63821730f12b71f56f54e444d2fa01 Author: Totally a booplicate <[email protected]> Date: Tue May 24 19:17:07 2022 +0300 imagine a world w/o typos commit 46670c66285adb2eb6c2143a10cdd98d1818177c Author: Briar Young <[email protected]> Date: Mon May 23 16:55:59 2022 -0500 change the display name commit 8dbd740bb2d5dd5ea58c8d7e1e8e61c01523a21f Author: Briar Young <[email protected]> Date: Mon May 23 16:49:01 2022 -0500 add outfit i tested it, looks gud commit 3e2858d85872db3eee214bd78eb1c56380a1edcb Author: multimokia <[email protected]> Date: Mon May 23 15:04:13 2022 -0400 minor consistency fixes commit 59afa3ffb5c437d318ef5d150749ff6cd5edd455 Author: Briar Young <[email protected]> Date: Mon May 23 13:06:57 2022 -0500 they're all in commit a8c727703ab48d53c3facd1d0fce8af322b5006a Author: Briar Young <[email protected]> Date: Mon May 23 12:43:17 2022 -0500 add spiked star commit 552e07807e36800a128b58bb1155d37a6c519a40 Author: Briar Young <[email protected]> Date: Mon May 23 12:28:20 2022 -0500 add silk commit 7460c192fbfe50eaf1286651994e07f138ffe0fd Author: Briar Young <[email protected]> Date: Mon May 23 12:09:12 2022 -0500 fixed image names commit 59287e67f6b7e030913a9e0b464dea7678e0cd28 Author: Briar Young <[email protected]> Date: Mon May 23 08:18:16 2022 -0500 ruffles red commit 85e70cc5d65838384f96d3f8fc44cf2b18b2c2e7 Author: Briar Young <[email protected]> Date: Mon May 23 08:12:23 2022 -0500 inconsistent file name fix commit fbb759aa8fc0911a84f0f28e011ab2db31dc302c Author: Briar Young <[email protected]> Date: Mon May 23 08:05:59 2022 -0500 ribbon name fix commit f0d2d895631a4da20af5ed64d1cb59aa3e363a39 Author: Legendkiller21 <[email protected]> Date: Mon May 23 13:46:15 2022 +0300 new thumb commit 4a743da1a139aac2952762788a3095ec79da1843 Author: John W <[email protected]> Date: Sun May 22 14:59:39 2022 -0400 space commit 6c2c2bfd996b4e5e50b67bd8f323582e33450d83 Author: John W <[email protected]> Date: Sun May 22 14:57:09 2022 -0400 edits commit 0a3add2da0ebce5dc3a1d0bdf3672f3132e753db Merge: 3dc33e700 f178d7ef9 Author: John W <[email protected]> Date: Sun May 22 12:46:15 2022 -0400 Merge branch 'content' into pr/7541 commit 170306c9201c12e6368f65ac28f2b60e71d660a8 Author: potato <[email protected]> Date: Sat May 21 16:04:59 2022 -0500 fixed wrong folder structure commit eeaa91362db68e921151b705ca0b5fac2a965794 Author: potato <[email protected]> Date: Sat May 21 15:44:34 2022 -0500 okay now the merge issues are handled commit 153d71d149d4c0f2f8b04efc55568b84c50f5a6d Author: potato <[email protected]> Date: Sat May 21 15:40:17 2022 -0500 try fix here commit bfd6c43c6b8d232acc91dbdbb3a7af6660209031 Author: potato <[email protected]> Date: Sat May 21 15:34:33 2022 -0500 fix mege issue commit 439b801d3166fd15fd06cfca49dfe61783458d2d Merge: 9e9a999d1 f178d7ef9 Author: potato <[email protected]> Date: Sat May 21 15:33:53 2022 -0500 Merge branch 'content' into clothes-json-outfit-req commit f178d7ef95fd7a2ddb315f335a5e849579cfc54e Merge: 3b42d13e1 34b9db251 Author: ThePotatoGuy <[email protected]> Date: Sat May 21 15:23:02 2022 -0500 Merge pull request #8992 from WishStone-Dragon/master Fixed text display when gifting Just Monika thermos commit 3b42d13e16bdc3f1c09f35fbb0f54c7ae67bf510 Merge: cf223a306 766e83620 Author: ThePotatoGuy <[email protected]> Date: Sat May 21 13:33:00 2022 -0500 Merge pull request #7288 from Wingdinggaster656/Chess960-Things [Chess System Extension] Chess960 Things commit 206a7ae87244a5d55dc110f138acfd68ef0bad35 Author: potato <[email protected]> Date: Wed May 18 22:43:08 2022 -0500 dlg actions now uses a defaultdict commit cf223a3064eca53674ecd9331bf3b8816d6aa94d Merge: b25b66733 e3dd810fa Author: multimokia <[email protected]> Date: Sun May 15 14:14:41 2022 -0400 Merge pull request #9028 from Legendkiller21/consumablesCheck Check consumables topic commit e3dd810fa040e1174ca0f13d24ee7add1419517b Author: John W <[email protected]> Date: Sun May 15 14:04:48 2022 -0400 smol commit b25b66733b5cf2c4e00a021977e57ba084f4ad1d Merge: ca8bbd137 79893dbcd Author: John W <[email protected]> Date: Sun May 15 13:56:16 2022 -0400 Merge pull request #9030 from Monika-After-Story/hungryrework [Small Rework] - Hungry Mood commit 718b31696ffee38d0afaaf12bea75226112bf390 Author: Briar Young <[email protected]> Date: Mon May 9 21:50:55 2022 -0500 ribbon commit c655334801da1399b6edf309f4545ba55e498711 Author: Briar Young <[email protected]> Date: Mon May 9 21:42:55 2022 -0500 name fix glitter bead commit 0bcb2d3ee547a8bc89cd4a26cca91af4e2402747 Author: Briar Young <[email protected]> Date: Mon May 9 21:41:40 2022 -0500 add glitter bead commit 19d1ffa5420fca66f66d7fedf005e2ae6dfd0986 Author: Briar Young <[email protected]> Date: Mon May 9 21:34:56 2022 -0500 add emerald commit ecf83b2f18f7b015bab4129c7160613c088db7ef Author: Briar Young <[email protected]> Date: Mon May 9 21:25:57 2022 -0500 add daisy commit 1c3ebe758580854c6e774fc9dde1fe1d5224c376 Author: Briar Young <[email protected]> Date: Mon May 9 19:44:42 2022 -0500 add choker chain silver commit 29a0c5f303c52755ad95ad636c5751a4e3be3c19 Author: Briar Young <[email protected]> Date: Mon Apr 11 20:20:31 2022 -0500 add spritepack commit ca8bbd137b74187eef7b5c5d1359fe57ec24be22 Merge: 80e99f663 d1fed3008 Author: multimokia <[email protected]> Date: Sun Apr 10 23:38:33 2022 -0400 Merge pull request #8707 from ThePotatoGuy/topic-kt-esports Adding Esports topic commit 79893dbcd2cba14af5d6e357cb24634264c13d10 Author: multimokia <[email protected]> Date: Sun Apr 10 14:18:29 2022 -0400 one smol addition commit 80e99f6635d14ec28b6291fe1e51c94311b00369 Merge: 899222d8e 0dbee48b3 Author: multimokia <[email protected]> Date: Sun Apr 10 00:41:37 2022 -0400 Merge pull request #9036 from jmwall24/why-do-you-read-issue adjust commit 0dbee48b36d7d5c72b6c64b216d06e10a450e512 Author: John W <[email protected]> Date: Sat Apr 9 21:15:36 2022 -0400 adjust commit 705826301afdb469f3b5c4e1c96b4bd0d8a4f27e Author: Totally a booplicate <[email protected]> Date: Sun Apr 10 00:37:05 2022 +0300 fix false positive commit 4e3e1d0bc7690676775ddf6505c12550d9e0aed4 Author: Totally a booplicate <[email protected]> Date: Sat Apr 9 22:30:24 2022 +0300 Update zz_consumables.rpy commit 56bdf0154504487bc2e691bb1ee1ac921e006f4e Author: John W <[email protected]> Date: Fri Apr 8 21:09:55 2022 -0400 edits commit 19334e82840e296399f6b152f92bd50e1128e9db Author: Totally a booplicate <[email protected]> Date: Sat Apr 9 02:18:40 2022 +0300 req commit 3ce6da3a0c6123f20789826bdb990ebae9d1693e Author: lunulae <[email protected]> Date: Mon Apr 4 22:02:48 2022 -0700 I said "important" way too many times commit 351d87f8c3c373e5e5e169e492a9dd9ac638d7b3 Author: lunulae <[email protected]> Date: Mon Apr 4 21:57:56 2022 -0700 hungrymoodrework commit 961a0a25e0282f2252a80556913c66d8b5404066 Author: Legendkiller21 <[email protected]> Date: Mon Apr 4 19:47:00 2022 +0300 cons check topic commit 34b9db2513865068ac2fd333b1b4d5812ce3174d Merge: 2f67b02dd 0a9e69496 Author: WishStone <[email protected]> Date: Sun Mar 27 19:24:36 2022 -0700 Merge remote-tracking branch 'origin/master' # Conflicts: # Monika After Story/game/zz_reactions.rpy commit 0a9e6949641539d02135e21b717649db52fea99b Author: WishStone-Dragon <[email protected]> Date: Sun Mar 27 19:03:51 2022 -0700 Removed '.title' in favor of text edit Discovered that simply removing '.title' didn't have the expected result; as such, changed the grammar of the sentence. commit d1fed30087d8f4f66b65b5e12e4face627a261b3 Author: John W <[email protected]> Date: Sun Mar 27 14:39:24 2022 -0400 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 614d9f780b18337f75e133152a4ba9dff132c084 Merge: 9e6e67a7a 899222d8e Author: John W <[email protected]> Date: Sun Mar 27 14:22:05 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8707 commit 2f67b02dd565858808abd152b915d4fa17b90341 Author: WishStone <[email protected]> Date: Wed Mar 23 19:54:09 2022 -0700 Fixed a small text display issue in gifting the Just Monika thermos. commit 869582c8bb6c0b438e784e5ac22c0b2b97d47e6f Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 17:12:42 2022 +0300 smol commit 7c0ff749ad8e9ad74226ad6d83f17655190e89f2 Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 17:07:04 2022 +0300 add test because am lazy to test myself commit 138a001ae1523f3cdb3abe0f45f3baa2f5910e00 Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 16:37:22 2022 +0300 req commit 55c9b922448780deb446666fa24bb9065860133a Author: Totally a booplicate <[email protected]> Date: Mon Mar 21 16:34:54 2022 +0300 allow to pass in gender, safe map access commit e97dea80bec86241249bdb47368b7151276f0df8 Author: Totally a booplicate <[email protected]> Date: Mon Mar 21 15:58:55 2022 +0300 cleanup commit 59615ca3143b907a05a22c6ce580a6afb61937e9 Merge: 362441d8c 3f5b8b3cd Author: WishStone-Dragon <[email protected]> Date: Sat Mar 19 19:35:24 2022 -0700 Merge branch 'Monika-After-Story:master' into master commit 362441d8c33bb6519acf4e8f3c337cfa3c222f78 Author: WishStone <[email protected]> Date: Sat Mar 19 19:34:05 2022 -0700 Fixed a small text display issue in gifting the Just Monika thermos. commit 0c06aeeda5fb7f207972b4bb2492cabeb6834387 Author: Totally a booplicate <[email protected]> Date: Fri Mar 18 19:01:51 2022 +0300 use `classmethod` here commit 899222d8e184d0482e938fa46d99c129b5191684 Author: potato <[email protected]> Date: Tue Mar 8 21:20:37 2022 -0600 also update script commit 3de7cc5ddaeae299b93e40355774939d822b90fc Author: potato <[email protected]> Date: Tue Mar 8 21:15:45 2022 -0600 version change commit 897ce8929c80bc936bd83b95cc2c031e087adadd Merge: eb0be2232 180341f0b Author: multimokia <[email protected]> Date: Sun Mar 6 13:44:53 2022 -0500 Merge pull request #8710 from ThePotatoGuy/topic-kt-cupcakes adding favorite cupcake flavor topic commit 180341f0be3b0d4d0af2f323a3b5e9375b57abfc Merge: e48a3e6ef eb0be2232 Author: John W <[email protected]> Date: Sun Mar 6 13:40:45 2022 -0500 Merge remote-tracking branch 'upstream/content' into pr/8710 commit 3a0410c947938a0b2606a529816bc9381a6dde5c Merge: 5d471a632 ad623cd94 Author: lunulae <[email protected]> Date: Wed Mar 2 20:24:30 2022 -0600 Merge branch 'smallfix' into pr/8928 commit ad623cd94943a4b235b893af4b3c42eca8b47d82 Author: lunulae <[email protected]> Date: Wed Mar 2 20:21:48 2022 -0600 Update script-topics.rpy commit 943247bce4fa2db333fd4b169ec397b4f39cfa06 Author: lunulae <[email protected]> Date: Wed Mar 2 20:13:23 2022 -0600 clarification commit eb0be2232f01060d0d6eb117777b089ddb6befc1 Merge: f607010de 421c2d84f Author: multimokia <[email protected]> Date: Wed Mar 2 13:16:46 2022 -0500 Merge pull request #8709 from ThePotatoGuy/topic-kt-convention adding convention topic commit 6ae944c23f56cddf0ce9bdd1747691680e7bf5f7 Author: Briar Young <[email protected]> Date: Tue Mar 1 17:28:14 2022 -0600 less blurry thumbnail commit b545b81c8fcdba983d1b570e60117366c41ad4ca Author: Briar Young <[email protected]> Date: Mon Feb 28 21:30:20 2022 -0600 [New Spritepack] Dress (Dark blue, sparkly) This is one of many new, upcoming spritepacks for future updates. TODO: less blurry thumbnail commit e48a3e6ef5064bde014796a5fadcbb9cb0c6d6a4 Author: lunulae <[email protected]> Date: Mon Feb 28 18:08:52 2022 -0800 small grammar thing commit 421c2d84fe5b5e1501f364f209ea1ed621cf10ba Author: John W <[email protected]> Date: Sun Feb 27 22:14:16 2022 -0500 history again commit a414ff82ff4173c322a5ab225708f4e988bd2a36 Author: multimokia <[email protected]> Date: Sun Feb 27 20:08:12 2022 -0500 small edits commit 6a85b217080231b13373fd65ec69efcbf244c9ee Author: multimokia <[email protected]> Date: Sun Feb 27 19:44:04 2022 -0500 haha -> ahaha commit 7fbc0684d7a048c6f842d64765a2f9136636ebb4 Author: John W <[email protected]> Date: Sun Feb 27 19:41:47 2022 -0500 hist commit 0206475cb8503aab17afb285da3cd2275a5fc844 Author: John W <[email protected]> Date: Sun Feb 27 19:37:38 2022 -0500 update commit de49b4d3c5db6bbb8e266cee716633b8a2051809 Merge: fd64b4911 f607010de Author: John W <[email protected]> Date: Sun Feb 27 19:36:25 2022 -0500 Merge branch 'content' into pr/8709 commit fd64b49116023b73893ca21a1787b6a656d94fb3 Author: John W <[email protected]> Date: Sun Feb 27 19:35:53 2022 -0500 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 2e866d4439d1ad19557d6cced556e4a82316d5ab Author: John W <[email protected]> Date: Sun Feb 27 17:13:32 2022 -0500 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 9e9a999d1bf192f1389263bf6e119660ff1cdf3e Author: potato <[email protected]> Date: Sun Feb 27 13:51:14 2022 -0600 fix merge commit 7170d7ed14c53723f58f99ce52d878a3e8ce4a49 Merge: 91aa1032a f607010de Author: potato <[email protected]> Date: Sun Feb 27 13:47:12 2022 -0600 Merge branch 'content' into clothes-json-outfit-req commit 91aa1032ad4090c3b365a5a6c987d3994db94e7b Author: potato <[email protected]> Date: Sun Feb 27 13:30:54 2022 -0600 Revert "orcaramelo prog point changes" This reverts commit d4e0ac06743777dc63648a2941b0147084496005. commit 9e6e67a7a2d9b55e00e720fa5f3577c738345c3e Author: ThePotatoGuy <[email protected]> Date: Sat Feb 26 19:25:28 2022 -0600 Apply suggestions from code review Co-authored-by: multimokia <[email protected]> commit 7cab84a4abfbb18d068f8374e9f32bf3208916f9 Author: multimokia <[email protected]> Date: Sat Feb 26 16:11:18 2022 -0500 add mocca creds commit f607010de568f0778511a5f20fd2f8dfd5d6aa18 Merge: f85470950 bf9b644d0 Author: multimokia <[email protected]> Date: Sat Feb 26 13:27:00 2022 -0500 Merge pull request #8923 from KritRom/patch-1 Adding more bad nicknames. commit 196d99fdf3e562c3c4816d5efad6d4458f212a81 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:40:42 2022 +0300 polish hair Thanks Mocca commit bf9b644d0b778ed01d3f3dbd76ea68148ad26199 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:32:10 2022 +0300 Allow `brooke` commit 5d471a632b27bf7a07c8e6f975e95af06613cb43 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:18:04 2022 +0300 Damn tags commit 805c00b9a585c5c0119282c19fe8f02014e37c3a Author: Kris the artist <[email protected]> Date: Thu Feb 24 20:54:51 2022 +0530 Adding more bad nicknames. Adding a few more names to the bad nickname list. commit f8547095039e2ede111c5bf59210f3b6df7106cc Author: potato <[email protected]> Date: Mon Feb 21 22:03:54 2022 -0600 comma commit 11135574f06072983872b7e92968cca1474527d4 Author: potato <[email protected]> Date: Mon Feb 21 22:03:28 2022 -0600 version change and update script commit 623c48e89475d823402728d2c7e613f0f386aaee Merge: 5ae545084 ce44528ca Author: ThePotatoGuy <[email protected]> Date: Mon Feb 21 21:48:57 2022 -0600 Merge pull request #8902 from Booplicate/fix_brb_crash Fix undefined var commit ce44528ca41b3b3e3e177ac3de3e035e70768285 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 17:07:13 2022 +0300 fix undefined var commit 5ae545084132cbb882441b6de6913f29a2b681da Author: potato <[email protected]> Date: Sun Feb 20 21:09:50 2022 -0600 update scripts commit c382b0944e5b0fae6e7ebe0a89f08e578e2d08ca Author: potato <[email protected]> Date: Sun Feb 20 20:54:04 2022 -0600 ver change commit 25219ebea35415a3e19fd176d83c81fc8b05e0a7 Merge: 2fac14dc5 8db7a7ca0 Author: multimokia <[email protected]> Date: Sun Feb 20 21:48:12 2022 -0500 Merge pull request #6915 from Booplicate/wet_monika New greeting, new clothes and hair, and hair sprite adjustments commit 2fac14dc51a29270a3dc246cbb8702e3ec4dad66 Merge: d7dadc13b 535e7c608 Author: John W <[email protected]> Date: Sun Feb 20 20:47:22 2022 -0500 Merge pull request #7889 from jmwall24/922-fixes some 922 fixes commit d7dadc13bfe43c11459a23f001b3ac1f658e32a3 Merge: 77c1c23af ce9f93909 Author: multimokia <[email protected]> Date: Sun Feb 20 20:14:13 2022 -0500 Merge pull request #8619 from ThePotatoGuy/event-context Add Event List wrappers and Event Context ![aboom](https://cdn.discordapp.com/emojis/943239032211644477.gif?size=256&quality=lossless) commit ce9f939090e1598e86a3774b375ec996e4040f58 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 04:08:48 2022 +0300 Revert "smol" This reverts commit 0a73110920ecdc84a296329eb7e865ef924d7591. commit 535e7c60847635f81ea7a24e31a6fced82829d4b Merge: 9677df927 77c1c23af Author: John W <[email protected]> Date: Sun Feb 20 20:08:31 2022 -0500 Merge remote-tracking branch 'upstream/content' into 922-fixes commit 77c1c23aff31e3c18818aae2d661bcd18fdaee9b Merge: 1581373a2 6f12fa268 Author: John W <[email protected]> Date: Sun Feb 20 20:04:29 2022 -0500 Merge pull request #8542 from jmwall24/d25-fixes d25/nye fixes commit 0a73110920ecdc84a296329eb7e865ef924d7591 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 02:01:16 2022 +0300 smol `None` can be pickled safely commit ee43162c6ef5ca193cb51c478f22b476b7a5d3e6 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 16:35:01 2022 -0600 repr to isolatedflexprop Co-authored-by: Totally a booplicate <[email protected]> commit 86de4eb1261837a0a158e2bd414081d994cac340 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 16:34:20 2022 -0600 Apply suggestions from code review Co-authored-by: Totally a booplicate <[email protected]> commit 6f12fa2681e4242899aaa506cc396155eb374d55 Merge: 89d536dab 1581373a2 Author: multimokia <[email protected]> Date: Sun Feb 20 16:19:37 2022 -0500 Merge remote-tracking branch 'upstream/content' into pr/jmwall24/8542 commit 1581373a21ad0221ee01ce18fb7402b8453d309c Merge: a470f841a 34f385298 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 15:16:19 2022 -0600 Merge pull request #7576 from Booplicate/idle_disp_stuff New idle mode exps + fixes commit a10ce9304a85d8915fd904810e4bbfc514414ba0 Author: potato <[email protected]> Date: Sat Feb 19 23:16:41 2022 -0600 add test for mas evet contxt commit eb676aec4baa85e2a0aa9661cbff16f8416e05c6 Author: potato <[email protected]> Date: Sat Feb 19 23:04:05 2022 -0600 type checks with unit tests commit 8db7a7ca07afd2c528886d8fa63b53eae763c15c Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 07:26:56 2022 +0300 sanity check commit b51c32bb7aad50a7bd4471ee5d9adba11458a06e Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 07:19:02 2022 +0300 Implement proper accessors Because I got fed up of this direct access commit b185e6c078a5ec0ea1100524c7ff764e0e36e3e2 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:30:26 2022 +0300 wow who coded this commit 2506e02c8108895f0cfa404a9b7be3c52c6db93f Merge: f494f43ae c6b16d900 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:12:29 2022 +0300 Merge branch 'wet_monika' of https://github.com/Booplicate/MonikaModDev into wet_monika commit f494f43aed5da5db4f1b32330de15f0d7126173a Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:12:11 2022 +0300 the flower pin must glow wait, this isn't factorio commit e4012185b921467639a0d1cad8e64701645863a7 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 05:56:23 2022 +0300 limit to ~daytime commit c6b16d900755b9eb80f31c59be5b387a6f48438f Author: multimokia <[email protected]> Date: Sat Feb 19 21:54:24 2022 -0500 smol dialogue things commit 10bd1094bc59eba55f38e7a57a78e0dc479fa170 Merge: f8719a443 2a693bd0c Author: potato <[email protected]> Date: Sat Feb 19 20:34:34 2022 -0600 Merge branch 'event-context' of github.com:ThePotatoGuy/MonikaModDev into event-context commit 2a693bd0c396a7bdf43550619b980e66d67a3c33 Author: ThePotatoGuy <[email protected]> Date: Sat Feb 19 20:33:31 2022 -0600 super call getattribute Co-authored-by: Totally a booplicate <[email protected]> commit f8719a4437bb390ee20881e24c825eec0069bfb0 Author: potato <[email protected]> Date: Sat Feb 19 20:33:13 2022 -0600 use findevl commit 89d536dabec4eac473fb51c5e530da73c21fb977 Author: potato <[email protected]> Date: Sat Feb 19 20:19:07 2022 -0600 correct store all commit 34f385298c6cfae05ce0e43e10d74941d935c07c Author: multimokia <[email protected]> Date: Sat Feb 19 19:56:50 2022 -0500 bump to 10 commit 7564c74b76b2a395cd395fa52aa8f2c6cc83f85a Merge: c1e5c6c47 0c9fcf9c8 Author: potato <[email protected]> Date: Sat Feb 19 12:30:17 2022 -0600 Merge branch 'd25-fixes' of https://github.com/jmwall24/MonikaModDev into d25-fixes commit c1e5c6c47886b3d2eff605a609cd8691d37d19f0 Author: potato <[email protected]> Date: Sat Feb 19 12:30:07 2022 -0600 transfer this too commit 0c9fcf9c8d7f62236d53f93a8562ab392cf47204 Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 21:16:57 2022 +0300 fix `lookup_ot` commit 3c26e439b53aec5402e79e73f2c38d4a7a4d6639 Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 21:01:12 2022 +0300 Better exceptions commit b5c660315d74118340806e09f4555d7f9b372419 Merge: f753dd455 a470f841a Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 20:55:45 2022 +0300 Merge remote-tracking branch 'upstream/content' into wet_monika commit f753dd455fd020c05486707a51b7008a2319373a Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 20:55:18 2022 +0300 resolved todo commit 9677df927cf071518dcff8212b9e305db2a45e55 Merge: c9963669a a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:40:06 2022 -0600 Merge branch 'content' into 922-fixes commit 7b9c3f4ca65d6a88ba4c873425f00d8eb063ed99 Author: potato <[email protected]> Date: Sat Feb 19 11:38:38 2022 -0600 update script commit 68b2e06431e5affa10f54ad4f8084465801f3f9b Merge: 3ea1fb0d5 a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:32:24 2022 -0600 Merge branch 'content' into d25-fixes commit b9838cb92b7ca16162ea2f5ed18a7b71e3c040bd Merge: 88297d698 a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:27:27 2022 -0600 Merge branch 'content' into idle_disp_stuff commit 6f6df9bf90581dc9224161689d01c84da3d2f311 Author: potato <[email protected]> Date: Mon Feb 14 22:55:04 2022 -0600 add clothes to this commit 88bb6c47a3b659ae30939189439065834701ed66 Author: potato <[email protected]> Date: Sun Feb 13 23:58:16 2022 -0600 support delayed validation commit ba83fa3d28b19a7cbd09fc5316aff141adca9b91 Author: potato <[email protected]> Date: Sun Feb 13 23:05:54 2022 -0600 fixes commit c3827e8968753a9962671fff80fa2cff475f33eb Author: potato <[email protected]> Date: Sun Feb 13 23:00:09 2022 -0600 new years dress commit d4e0ac06743777dc63648a2941b0147084496005 Author: potato <[email protected]> Date: Sun Feb 13 15:46:28 2022 -0600 orcaramelo prog point changes commit c9c7d0c7f7c82e7254e0625b0a7c2893032352fe Author: potato <[email protected]> Date: Sun Feb 13 14:09:06 2022 -0600 none check here commit 884dcd7952859f34525ef3e4a015e94bf1d42fb2 Author: potato <[email protected]> Date: Sun Feb 13 00:22:29 2022 -0600 move built in outfit mode changes to sprite objects commit 5c2399dae975e410e7baec04d1ff0792c76b263e Author: potato <[email protected]> Date: Sat Feb 12 11:43:54 2022 -0600 moved clothes to after acs commit 3a84dba1d656c0c6277283040b91dfbda4c738c4 Author: potato <[email protected]> Date: Sat Feb 12 11:31:58 2022 -0600 adding logging commit 95d141f88262807713f677d7b0feed34b2464fdb Merge: bf5aac215 a470f841a Author: potato <[email protected]> Date: Sat Feb 12 11:22:24 2022 -0600 Merge branch 'content' into clothes-json-outfit-req commit 70a55d93532eb8ba94945b093f43fda835fab46c Author: ThePotatoGuy <[email protected]> Date: Fri Feb 11 23:04:48 2022 -0600 Apply suggestions from code review Co-authored-by: lunulae <[email protected]> commit 47f75360104a0bb28f68931a9b810a6e74918bb7 Author: potato <[email protected]> Date: Thu Feb 10 21:10:40 2022 -0600 forgot that commit 735cd5ddf56509e458302aabfe0469683d7f1ade Author: potato <[email protected]> Date: Thu Feb 10 21:09:06 2022 -0600 codes commit a0fb3a9f07bb816865c1236d8a606d336ba0fedc Author: potato <[email protected]> Date: Thu Feb 10 21:07:42 2022 -0600 codes commit 93fdc9085372e887941c0a92204474922bc64bc6 Author: potato <[email protected]> Date: Thu Feb 10 21:02:34 2022 -0600 codes commit 05d6020b2721f65d6670902b8960761a06060325 Author: potato <[email protected]> Date: Thu Feb 10 20:35:54 2022 -0600 use vars commit 54df31590cb0af8e5cef904b4917bbc64c8955c2 Author: potato <[email protected]> Date: Thu Feb 10 20:30:03 2022 -0600 adding cupcakes topic Co-authored-by: karrigantaylor <[email protected]> commit 0f0d4e8da9bd90e5fff91e3b94afecbe51ba7fb2 Author: potato <[email protected]> Date: Thu Feb 10 20:19:54 2022 -0600 adding convention topic Co-authored-by: karrigantaylor <[email protected]> commit 76496ebbe4092c24f7550ba46ba1aef93cabce4c Author: potato <[email protected]> Date: Thu Feb 10 19:58:41 2022 -0600 adding esports topic Co-authored-by: Karrigan Taylor <[email protected]> commit 3fcc8ce5088970494dd1184f66a576ffa0c0f076 Author: potato <[email protected]> Date: Mon Feb 7 22:53:03 2022 -0600 changes as suggested commit 898f145e66b3ade6b3174f6799bac849a2707f23 Author: potato <[email protected]> Date: Mon Feb 7 22:50:55 2022 -0600 fix commit 266931e1b723bae969fb35aba2813d2bf3a780a7 Author: potato <[email protected]> Date: Mon Feb 7 22:38:56 2022 -0600 remove reg felxprop commit 12846b775ee458e7459ebd8c188bb8a8232a04ac Merge: 8f20829d1 8597103ea Author: potato <[email protected]> Date: Mon Feb 7 22:14:08 2022 -0600 Merge branch 'event-context' of github.com:ThePotatoGuy/MonikaModDev into event-context commit 8597103ea65065220064c9ab141b5bb71eea28c4 Author: ThePotatoGuy <[email protected]> Date: Mon Feb 7 22:13:17 2022 -0600 Apply suggestions from code review Co-authored-by: Totally a booplicate <[email protected]> commit 8f20829d15b1bdacc945bc9ab132a5c54b91b87d Merge: dc3a6a39d a470f841a Author: potato <[email protected]> Date: Mon Feb 7 20:18:17 2022 -0600 Merge branch 'content' into event-context commit a470f841a6f8327cb7ae29e6de94cf38ae32f95a Author: potato <[email protected]> Date: Sun Feb 6 20:58:06 2022 -0600 update script commit 3f5b8b3cd2ec6e395f5f2095d7cc742157f2d721 Author: potato <[email protected]> Date: Sun Feb 6 19:13:56 2022 -0600 outfit mode check commit 4900ec89b0c41906c113e12be7940e377ef7103c Author: potato <[email protected]> Date: Sun Feb 6 18:55:24 2022 -0600 version change commit 6f83ae58f3a3a37ecccac86ed9561a8ca14ba36d Merge: 7d8143075 52651ac70 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 6 18:41:10 2022 -0600 Merge pull request #8594 from multimokia/typos 0.12.7 Typos commit 52651ac70222ae4ff3576a13d8dd3460bc5773e5 Author: John W <[email protected]> Date: Sun Feb 6 19:25:25 2022 -0500 smol (sorry) commit 11a2e38423e9093cc230de88a8b207ef9d703938 Merge: 1614c9dc2 7d8143075 Author: John W <[email protected]> Date: Sun Feb 6 19:01:07 2022 -0500 Merge branch 'content' into pr/8217 commit 7d81430753246962d2c47961de08b9b9c94f05d8 Merge: 5328269ef e4b09e313 Author: John W <[email protected]> Date: Sun Feb 6 19:00:15 2022 -0500 Merge pull request #8648 from jmwall24/f1422 f14 2022 commit e4b09e3132a8a495766be94f2b6df3f04f8d6467 Author: potato <[email protected]> Date: Sun Feb 6 16:10:58 2022 -0600 length too commit 70f6c268eea77bee07e8d1a2294a35406ae6862c Author: potato <[email protected]> Date: Sun Feb 6 16:05:47 2022 -0600 use validator commit c05eb711669da199a3b1904a77823c6ea2a49505 Author: potato <[email protected]> Date: Sun Feb 6 15:53:44 2022 -0600 use pdget and hide commit f345f8c3cb5116530077fa90e0ddecd85e6de93d Author: multimokia <[email protected]> Date: Sat Feb 5 21:13:27 2022 -0500 more unlocks commit 1614c9dc22d0719343cc9d96efa72eb88cfb7b9b Author: multimokia <[email protected]> Date: Sat Feb 5 20:41:58 2022 -0500 unnecessary step removed commit 59aa453ef005e01d04163d54ddb3483297fd3da5 Author: multimokia <[email protected]> Date: Sat Feb 5 20:39:23 2022 -0500 update steps commit ce2ef4ed2f8c4869eb9db93788cd1f15dcac13c4 Merge: 7f0d790c2 91c9c5e69 Author: multimokia <[email protected]> Date: Sat Feb 5 20:34:40 2022 -0500 Merge branch 'typos' of github.com:multimokia/MonikaModDev into typos commit 7f0d790c23deb9160f622cc152c957ae32b2a79f Merge: 1cf6fd3bc 5328269ef Author: multimokia <[email protected]> Date: Sat Feb 5 20:34:36 2022 -0500 Merge remote-tracking branch 'upstream/content' into typos commit 1407773a649bd0623571ed6cc5fcedcf89e6377d Merge: 50ef85395 5328269ef Author: multimokia <mu…
KiRyX112
added a commit
to KiRyX112/MonikaModDev
that referenced
this pull request
Oct 11, 2022
commit a81cea3c27d51db75b64e584d5720889ff008485 Merge: dd2351172 0a7922522 Author: potato <[email protected]> Date: Sun Jul 17 19:15:46 2022 -0500 Merge brat nch 'pre-master' commit 0a7922522bf010dc4435bc2aa98ca9b7e65abaf4 Merge: 7150e7c64 ff0da9c0f Author: ThePotatoGuy <[email protected]> Date: Sun Jul 17 19:13:57 2022 -0500 Merge pull request #9233 from Booplicate/more_wr_fixes More wr fixes commit dd2351172228f037e1f881935865e257ea287933 Author: potato <[email protected]> Date: Sun Jul 17 19:01:25 2022 -0500 version change commit 7150e7c642332be014bf5428bf81887f245a0401 Merge: 7b9c0d396 e393f8c4f Author: John W <[email protected]> Date: Sun Jul 17 19:54:22 2022 -0400 Merge pull request #8928 from Booplicate/typos Typos commit e393f8c4fb67ee03bec1c227366e50a99e324f6e Author: Totally a booplicate <[email protected]> Date: Mon Jul 18 02:17:00 2022 +0300 fix invalid formatting param commit f0e3a83bdf6a0df74ed49e7d351d0345224b4e5c Merge: e010f95cb 7b9c0d396 Author: John W <[email protected]> Date: Sun Jul 17 19:03:51 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 7b9c0d396ba3a2369ac78a9a5b21d5c86fb7febc Merge: ac6bb6fc9 757c784aa Author: ThePotatoGuy <[email protected]> Date: Sun Jul 17 18:01:14 2022 -0500 Merge pull request #9271 from Booplicate/NoU NOU EnHaNcEmEnT commit e010f95cb1bbc3db1e71cc82d39e4116704f1638 Author: Totally a booplicate <[email protected]> Date: Thu Jul 14 17:19:33 2022 +0300 fix typo + fix `is` check with str `str` is primitive and can be allocated/deallocated by python at any time. `is` cannot be used because the instance might be different, even if the value is same. Values for `MODE_BAD_CHESS` and `MODE_960` had been swapped before. commit 757c784aa79ea1be4e0b3f134c01507f32bbb2e2 Author: Totally a booplicate <[email protected]> Date: Fri Jul 8 22:39:54 2022 +0300 This only works for +2s commit c6219e7a61b12945789a74a23a1a76285cded8ac Author: Totally a booplicate <[email protected]> Date: Wed Jul 6 18:04:24 2022 +0300 increase dealing delay to 0.3, but deal 2 cards at once commit be5f28e1b95e72d62bc8ce917271cb9c1e3ebfc6 Author: Totally a booplicate <[email protected]> Date: Wed Jul 6 16:48:08 2022 +0300 improve dlg flow + random calls cleanup commit 3ea2fbc8cc8cb1e4e3fd0465faf6905fdd7355ca Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 22:42:34 2022 +0300 add new sfx commit 695c579c0eee0b4bcb303f370819b7d48b42ddfb Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 22:42:07 2022 +0300 further improvements to sfx sfx for _update_drawpile + a few fixes commit 51beaa8e2a67a89166ab6630245adb314490d350 Author: multimokia <[email protected]> Date: Tue Jul 5 01:28:51 2022 -0400 smol dialogue things commit 0a4df35c340392f7f020756b0798be44ac2e06b2 Author: multimokia <[email protected]> Date: Tue Jul 5 01:13:50 2022 -0400 smol quip thing commit 082511365b442cd5e8b07b5b6c7138c405cd61e2 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:34:09 2022 +0300 fix crash commit 8a8f0b8126f95d2e61d7d5374f8c89874afa7ab6 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:15:14 2022 +0300 handle help when colour is None commit 07165bae82924d329b45fca224b3641ea526e026 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 04:13:07 2022 +0300 hopefully better sfx commit c2f400cf4959d86b4c429818831fe5907e5fe73e Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:40:33 2022 +0300 please, stop commit 4f2932e16ac43e150a3b1894af9b9e7f11bc08ea Merge: b735109c2 92654f8e3 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:37:36 2022 +0300 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into NoU commit b735109c21a290648f0ed0e42a9718073116052b Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 03:36:54 2022 +0300 forgot this commit a0189fa63b0aaf6dd311bb6f617ea853b594543e Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 02:56:19 2022 +0300 update sfx system commit 92654f8e36cd7a31f81e72f732d15989e0b32ce6 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 02:56:19 2022 +0300 avoid playing sound when smooth False commit cb036a6a6546aebdbcd7b7f11d9d951f351174dd Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 01:27:04 2022 +0300 add 0.05 sec to pause commit 0fb476d1c1f4edcd51c50726120c442174287a6a Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 01:26:04 2022 +0300 improve sfx commit e66c5daa0d13df5a6e08c784397e6472d1a8bc50 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 00:45:49 2022 +0300 add sfx Thanks to Kenney Vleugels commit 1b6da6bfe97887cff188ed2e5d4281142ed2b218 Author: Totally a booplicate <[email protected]> Date: Tue Jul 5 00:45:03 2022 +0300 implement sounds commit 0479b01617ebf546829c42fc3df1bd362816ae6f Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 23:34:05 2022 +0300 smol commit 7557f676d3142efa3fc3c6c16b78caecbfcfd2d8 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 21:59:06 2022 +0300 added more typos commit 9419b8371f16e0d3053c26283f8870b352fdc7b1 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:53:50 2022 +0300 Moni is a bit more agressive 20% to play more aggressively commit 63dbf9e5e0378e86f677d9a528bbdd91b52f62b5 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:10:44 2022 +0300 resize the desk commit ef9d67999595134e41056c2509cd4d8fb0490d9c Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 19:10:36 2022 +0300 space fix + update ui commit f5ff985c562e59a8694be737f9b15e5dea6242c3 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:53:21 2022 +0300 make card bases empty this should further improve accessibility for dragging commit e9ad4f47b121a2b581821971d72eabcd4e3cfbce Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:33:31 2022 +0300 DRY all the way another inner func to remove duplicated condition commit d875f1d8363676f78ed25032802f733a53d70304 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 17:01:53 2022 +0300 better wording commit f2a2cfe4a546bd3ed73e643e201a3ef440c837d0 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:51:08 2022 +0300 Smarter advice commit 5995c6b4c583dd5dd880874fc24d0912007326de Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:43:02 2022 +0300 avoid spoilers in logs commit 066b73b85f14fba36721d37fdb3985a5412e34da Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:36:32 2022 +0300 allow to early skip if you have max cards Example: you need to play red 5 but from all your `HAND_CARDS_LIMIT` cards you only have yellow and green and no 5 You have to draw a card before skipping, but you cant draw more - you're over limit. commit 637199f25e6fd09031da6e5347739c8f55b55f03 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:31:09 2022 +0300 only let draw cards if below the limit commit 72913ff16d2b3faf4c4497404fe07f3b11910b4b Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 16:26:06 2022 +0300 fix `should_draw_cards` reset on card limit if you drew only few of the required cards, you could still get non-zero `should_draw_cards`, and then get a reaction from Moni telling you shouldn't draw more, but it was already a next turn! commit ec7871296c0bb5e01c32cfbed5a2315e59e09709 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:37:04 2022 +0300 better UI + screen code cleanup commit ec25a599815e8e5056875fafbd469dca3143ca86 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:14:27 2022 +0300 pretend you didn't see this pls commit c19c6f35d60ccc2f9638b2b8708397ed19c2e480 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 06:10:57 2022 +0300 Update zz_dump.rpy commit bba9f04e93bed53bb40b75485df14c8c06cf1c8b Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 03:49:44 2022 +0300 a few spicy quips commit 7b04ef19cabd6cbddcc8274406b7966a5bb1b102 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 02:43:24 2022 +0300 more accessors commit 415d0be90e281ada12ead22dc9b74078fe007918 Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 02:33:40 2022 +0300 WIP: help system commit 9aea31cfc665699372e091b8f9bce6268520df11 Author: multimokia <[email protected]> Date: Sun Jul 3 17:59:21 2022 -0400 unfortunate might feel better here commit 1816df8edb14ac17acf95d79170b41d7fdd88f11 Author: multimokia <[email protected]> Date: Sun Jul 3 17:55:42 2022 -0400 easy doesn't feel correct here commit cad8df4c1cfd1fcb9ff6871c1e2ce83ea254c1e3 Merge: 68840a6a2 bf853185b Author: multimokia <[email protected]> Date: Sun Jul 3 17:53:32 2022 -0400 Merge branch 'NoU' of github.com:Booplicate/MonikaModDev into pr/Booplicate/9271 commit 68840a6a202b3e82c023955869150052f0cdd802 Author: multimokia <[email protected]> Date: Sun Jul 3 17:53:23 2022 -0400 more quips commit bf853185ba852424904d3a99d8af79d5780a4fad Author: Totally a booplicate <[email protected]> Date: Mon Jul 4 00:13:28 2022 +0300 not wcc reaction if moni won commit a72ec31dd397a6b7975c2f9d7a5bf3cf25f103d3 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:53:56 2022 +0300 better naming commit 12e18c777d289ae29e3aac51754fef5381fa4e4b Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:52:53 2022 +0300 improve accessibility can play cards with double clicks commit dff5c489267b3bb0b339c8b4bf6316eefe5ce4f1 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 23:16:54 2022 +0300 improve drag by reducing aircraft speed commit c543c25b226b3fac9c6490854229cde4936d72fa Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 20:09:40 2022 +0300 no wcc reacts for wd4 commit 7ce446a016e48694cebc0293dc1524557b828c9a Merge: 1445c7c0e e161c1ca2 Author: multimokia <[email protected]> Date: Sun Jul 3 12:38:57 2022 -0400 Merge branch 'NoU' of github.com:Booplicate/MonikaModDev into pr/Booplicate/9271 commit e161c1ca2c1497fe8b9aa882dd857bcb3a4148f9 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:57:00 2022 +0300 make some methods semi-private commit 1445c7c0ec0afa7bb33d77a2091b00803cd361ab Author: multimokia <[email protected]> Date: Sun Jul 3 11:54:53 2022 -0400 another quip commit ec5a53519c9e71996c7cf0e82e37e8245f7d4ab4 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:32:38 2022 +0300 quips stuff commit 887276fc9c92231d50e540d93599d350f6d6b872 Merge: ba0585351 ab42a582f Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:01:52 2022 +0300 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into NoU commit ba0585351d64173cccdd01090e4ac6f961caa941 Author: Totally a booplicate <[email protected]> Date: Sun Jul 3 18:01:49 2022 +0300 less panic moni commit ab42a582f0c245e1da30408ac577d8d3fc27d8bf Author: multimokia <[email protected]> Date: Sat Jul 2 23:20:15 2022 -0400 smol grammar thing commit 5c91f7e8efbf37d47f84e5eee536159b7ce20e78 Author: multimokia <[email protected]> Date: Sat Jul 2 22:43:44 2022 -0400 another quip change commit b907e6c254021286cdeb89895e8686e2ebc40750 Author: multimokia <[email protected]> Date: Sat Jul 2 22:06:39 2022 -0400 tweak color change quips commit 7415bd319bc670c5eed9e2e854d2ec83e3f84488 Author: multimokia <[email protected]> Date: Sat Jul 2 22:05:25 2022 -0400 smol dlg things commit 1ad1cf693eb8e1933a2200e1c50c2417a2d721c8 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 04:55:21 2022 +0300 rename chances_to_be_shown to tier commit 415536b746a6f41c6900916e594188f25c05b5d0 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 03:16:28 2022 +0300 clean up some logic commit 12de62fd848c83d81e412d25ff59554af86f27fe Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 02:57:40 2022 +0300 compat with dict + better repr commit 59dcccb1de5ae298ad3ae34759fc66d48e1606e9 Author: Totally a booplicate <[email protected]> Date: Sat Jul 2 02:14:18 2022 +0300 Implement `_NOUReaction` commit 3aae0a9ec8f797680372f0b5c185b9f909527fc3 Author: Totally a booplicate <[email protected]> Date: Fri Jul 1 23:54:19 2022 +0300 few fixes Improved repr Card class got dynamic value property Private classes are semi-private now for easier testing and maintenance Better classes naming commit 41b6bded54beab09f1b534706ff451e7da278878 Author: Totally a booplicate <[email protected]> Date: Fri Jul 1 23:27:46 2022 +0300 Legendary sanity check commit 45ffc33e3b6db8f3cff783a1a8c84db4342261b3 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 18:41:07 2022 +0300 dont stack chances commit 9460969c2f50f2d2064252d0638143d72b1fd12a Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:29:45 2022 +0300 few more fixes commit 96556b59f10ce522579c901437d27e0203d40a12 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:06:01 2022 +0300 add sanity check commit a21a7c2ec4b6b7d363b1650a436a1a751f0b5aad Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 05:04:38 2022 +0300 Monika can suggest to play nou commit 79eb292e9df9d557078ce315ebe833c49b9119e8 Author: Totally a booplicate <[email protected]> Date: Fri Jun 24 03:35:57 2022 +0300 add interact callback to `DeskSpriteSwitch` commit 3843c1d70355a4f642491b37555a718dc62ec5fc Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:58:33 2022 +0300 add `update_house_rules` commit c0213b65ed28b7dae4f58b11e0ea53e5e7eacd80 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:52:10 2022 +0300 few other changes commit 527afb3953fd49bdfc490978b427a8587bb047ac Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:32:51 2022 +0300 handle `stackable_d2` commit 991ff24cce93f7cfeb12dde099568dde8120993f Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:28:21 2022 +0300 handle `starting_cards` commit 6b6482e6bde6dcffce72fca3128e7bce5f759ae3 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:11:18 2022 +0300 handle `unrestricted_wd4` commit 85f7bbfd7e599cac7d61c210aec7190a9a1db9e8 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 06:08:08 2022 +0300 add `reverse_house_rule` commit 1f3003c3f5eb4cf7539bc81c3983513934a0dd99 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:59:40 2022 +0300 handle `points_to_win` commit 9699c728524cc2e9fb95d9382b2cc7ddd8a65cc6 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:49:40 2022 +0300 add accessors commit ecf964b1b8aa8537dc7c5277179a9555b8af0f22 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:37:53 2022 +0300 fix indents commit d9a343f6a97e0cbfb78a5ef50fab6e86ae164187 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:37:28 2022 +0300 sanity check commit 654a101ea2bf3525f04a55b9a4d42ab51aecdbcc Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 05:19:44 2022 +0300 only for +2 or +4 commit 11cc3b4e2a63c52693f70cc5ae6418334dcbe7d1 Author: Totally a booplicate <[email protected]> Date: Thu Jun 23 04:44:03 2022 +0300 more quips commit ac6bb6fc93468c3381564b1569b766514c04b08f Author: potato <[email protected]> Date: Wed Jun 22 00:06:57 2022 -0500 update ver commit 277444fd87edbf215205d892ded04f01c604bc63 Merge: 1b71c15a6 844591c2d Author: ThePotatoGuy <[email protected]> Date: Wed Jun 22 00:01:29 2022 -0500 Merge pull request #9260 from Booplicate/NoU NOU fixes commit 844591c2dd3425b6b1c0ecd249a476dc3e630696 Author: John W <[email protected]> Date: Tue Jun 21 21:10:27 2022 -0400 edits commit ede99e93c2489dcc20e4aba5365ae34a10cfa4a4 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 03:10:51 2022 +0300 propagate `smooth` allows to call `__update_drawpile` and `shuffle_drawpile` w/p pauses and new contexts commit 6b64c20aef8e8e6218bb91ef6114188dba715c45 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 02:14:42 2022 +0300 fix wrong index commit ad70544dda40b79d3f20d36d8511bf953087a2af Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 01:44:37 2022 +0300 show chibi commit f980377d13ea79d8a60e1ad936cbcc010e1e1eca Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:12:00 2022 +0300 actually, more rules commit 6f24916d5502aefbd67a6f1dc9a85c739ecf73b6 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:10:09 2022 +0300 fix old code commit aa07184ca3f33893cd646a08140c4c4b82404dd1 Author: Totally a booplicate <[email protected]> Date: Wed Jun 22 00:04:52 2022 +0300 add a hint commit a497a375e6eb734abed45c3eec7461f1ba73e803 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 19:00:42 2022 +0300 better pen art Co-Authored-By: Briar Young <[email protected]> commit ceef8c6b47437bca32cf4c8b24a7daf8dd51b30e Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:54:15 2022 +0300 guardrail with forcing faceup to `False` Idk if the issue was there, but this won't hurt commit a72f6c5b71eed84f6319b7d5c9c78651f6674157 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:42:43 2022 +0300 reset wild cards colours commit 438f490a11f22cd04a02363766094c9bd210fd17 Author: Totally a booplicate <[email protected]> Date: Mon Jun 20 18:30:18 2022 +0300 update drawpile if drew the last card commit 4023aaa5cb56d51ca53919dfbeeb28d2f2fab784 Author: John W <[email protected]> Date: Sun Jun 19 20:24:44 2022 -0400 space commit aec33438f8afa5533f5bc968d02c323f10ec62bb Merge: a6265893a 1b71c15a6 Author: John W <[email protected]> Date: Sun Jun 19 19:31:08 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 1b71c15a6c92af1379e05a0fbab7594cffde57e2 Merge: 803bea9b4 aacb090c6 Author: John W <[email protected]> Date: Sun Jun 19 19:24:43 2022 -0400 Merge pull request #9188 from ThePotatoGuy/more-retro-bows More retro ribbons from Retrolovania commit aacb090c6739cf21a7ba928aa43df9048704f1bc Author: John W <[email protected]> Date: Sun Jun 19 19:21:14 2022 -0400 G to g commit 803bea9b4ae4b4f966f1e11e4f0f3df477f0ccf9 Merge: 47c0bd954 4f8b0c25a Author: ThePotatoGuy <[email protected]> Date: Sun Jun 19 13:03:00 2022 -0500 Merge pull request #9242 from jmwall24/settings-change Settings word change commit 98c8088f1826deb84c45c221f29f57b41bf645e9 Merge: 250481341 689ea9d68 Author: potato <[email protected]> Date: Sun Jun 19 13:01:07 2022 -0500 Merge branch 'more-retro-bows' of github.com:ThePotatoGuy/MonikaModDev into more-retro-bows commit 2504813411c4ac74d72bca057ae76c69ce7f7d85 Author: potato <[email protected]> Date: Sun Jun 19 13:00:26 2022 -0500 rename sgb with green descriptor commit 47c0bd9548ac2006752131a0b4344cd466cf40dc Merge: 88f35dcfb a85681302 Author: ThePotatoGuy <[email protected]> Date: Sun Jun 19 12:56:05 2022 -0500 Merge pull request #9142 from ThePotatoGuy/chess-actions-dict-fix set chess actions dict to defaultdict commit 4f8b0c25a8a1280959b32cbf9d7bb3328c3f06ae Author: John W <[email protected]> Date: Thu Jun 16 19:05:30 2022 -0400 Detect commit a8568130215c01989c4b1d629354fc8b64bb7eb5 Author: Totally a booplicate <[email protected]> Date: Tue Jun 14 03:59:47 2022 +0300 clarify what keys are used commit a6265893a4c9427d84e80b9ddcc588e6355f68ec Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 06:01:23 2022 +0300 `sky` commit 47c4ea72e3862cfceea5997db3cdae15740861f2 Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:45:55 2022 +0300 `traveling` I hate traveling without my 2 Ls commit b46aef6737232360693d9f447936a809bd03550b Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:45:09 2022 +0300 comma commit ff0da9c0f3e74036c08dbb091d7e3065f059fa17 Author: Totally a booplicate <[email protected]> Date: Mon Jun 13 05:01:59 2022 +0300 fix crash + better var names commit 956f2253f417c1b7bd887aa184364dcb8e4c1616 Author: John W <[email protected]> Date: Sun Jun 12 20:50:32 2022 -0400 inconsistency commit f4f5f2b0c9199c913b6fd79db5790ab47e84d0f6 Merge: 705826301 88f35dcfb Author: John W <[email protected]> Date: Sun Jun 12 20:47:56 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8928 commit 689ea9d681ee85747a3f42f72d790a17de67834a Author: John W <[email protected]> Date: Sun Jun 12 20:13:22 2022 -0400 edits commit b0203ad8b441328d9612f775c2889affffe1abc9 Author: Legendkiller21 <[email protected]> Date: Sun Jun 5 01:10:55 2022 +0300 new thumbs commit 3ef0b9ab22487d689e6aa1fefc94759a84e943a3 Author: potato <[email protected]> Date: Sat Jun 4 15:56:53 2022 -0500 fixed gift name commit d21bac0d9b018778d021d06f28eed836d7fe9dbf Author: potato <[email protected]> Date: Sat Jun 4 15:51:30 2022 -0500 fixed up jsons, changed names to ribbons commit 65be0d64f217bd657df406ccb256bdbce7e64978 Merge: 81cc08fe9 88f35dcfb Author: potato <[email protected]> Date: Sat Jun 4 14:51:03 2022 -0500 Merge branch 'content' into chess-actions-dict-fix commit 88f35dcfbe1309c040208f2281d3221ff490f11a Author: potato <[email protected]> Date: Mon May 30 20:08:10 2022 -0500 version change commit 22f85f6613472d57583a809e17f444c6e1b987bb Merge: d1345e095 537173b53 Author: John W <[email protected]> Date: Mon May 30 20:53:24 2022 -0400 Merge pull request #5555 from Booplicate/NoU New card game to play with Monika [Warning:🍝inside] commit fb8e3f90a5994c98f91bf0d92882fceaa969de77 Author: potato <[email protected]> Date: Mon May 30 19:30:55 2022 -0500 Adding starter files Co-authored-by: Retrolovania <[email protected]> commit d1345e0953827f644f3f41f538dc9a93a3a27584 Merge: 53ecde9fc 6a63e00c1 Author: ThePotatoGuy <[email protected]> Date: Mon May 30 19:20:16 2022 -0500 Merge pull request #9186 from Monika-After-Story/pinkkimonospritepack [Spritepack] - Pink Kimono commit 53ecde9fcb05199bb338a171e3f039624a7925c0 Merge: 2409f2695 39dfea47a Author: ThePotatoGuy <[email protected]> Date: Mon May 30 19:15:50 2022 -0500 Merge pull request #9187 from Legendkiller21/thumbsfix Small thumb fix commit 6a63e00c1a691091751b76550038b30937e38b00 Author: Legendkiller21 <[email protected]> Date: Tue May 31 03:14:32 2022 +0300 thumb commit 39dfea47ae2e5dc0e2a293dd29c066714c32ebf4 Author: Legendkiller21 <[email protected]> Date: Tue May 31 03:01:59 2022 +0300 more thumbs commit e540defe063e4d78c9faaa423bb2a112b6c5eb52 Author: potato <[email protected]> Date: Mon May 30 19:00:52 2022 -0500 missing layer 10 here commit 2409f2695cf11a109ef2ea91e815001a3e6489eb Merge: 500f7e8b5 376d83cc9 Author: John W <[email protected]> Date: Mon May 30 20:00:31 2022 -0400 Merge pull request #9115 from kkrosie123/briaryoung-chokers [New Spritepacks] Chokers commit 537173b53f999080d3e91b0a2e328f561315e4bd Author: John W <[email protected]> Date: Mon May 30 19:55:36 2022 -0400 prompt back commit e9195e66ea6606994e6da6300ed9d40c6e71daa3 Author: lunulae <[email protected]> Date: Mon May 30 18:44:08 2022 -0500 resized commit 61cd7dcd35116dc9117813363dd576848896e926 Author: lunulae <[email protected]> Date: Mon May 30 18:28:19 2022 -0500 whoops, forgot an entire folder commit 500f7e8b5c3462d187b85fd3467010ca7dd698e6 Merge: 7b1f8186a 261cae3ce Author: ThePotatoGuy <[email protected]> Date: Mon May 30 18:26:11 2022 -0500 Merge pull request #9172 from kkrosie123/briaryoung-button-up-flowered [New Outfit] Button Up (Flowered) commit 376d83cc96f62d4723778ee7644bfeeb7a125edd Merge: 1f78cc0ef ad8b0ed0f Author: potato <[email protected]> Date: Mon May 30 18:25:21 2022 -0500 Merge branch 'briaryoung-chokers' of https://github.com/kkrosie123/MonikaModDev into briaryoung-chokers commit 1f78cc0ef211d9ad51f47095f04a9c518829cb14 Author: potato <[email protected]> Date: Mon May 30 18:25:05 2022 -0500 priority adjust commit 7b1f8186a5322d5007d08bd5e26bdb70c408a3d7 Merge: 7263b836c 6ae944c23 Author: ThePotatoGuy <[email protected]> Date: Mon May 30 18:10:46 2022 -0500 Merge pull request #8940 from kkrosie123/dress-dark-blue-sparkle [New Spritepack] Dress (Dark blue, sparkly) commit 252bd2c64e5679f4eab81356ff4eed60b5229c87 Author: lunulae <[email protected]> Date: Mon May 30 15:37:04 2022 -0500 add sprites commit 261cae3ce271a5c9f346a7af005ff965d9c924dd Author: lunulae <[email protected]> Date: Mon May 30 15:28:34 2022 -0500 downtiedstrand update commit 66dab7a683da1683c90287c369c0d11d0d69b029 Author: lunulae <[email protected]> Date: Mon May 30 01:40:21 2022 -0500 removing bare-shoulders exprop commit 0d733d4bf6b95fc5bb3fe331e8057cb7811b14a0 Author: multimokia <[email protected]> Date: Sun May 29 22:13:35 2022 -0400 less formal wording for must commit 8b20855da0244ed3bf069608fb8a0a581daa1764 Author: Totally a booplicate <[email protected]> Date: Mon May 30 03:02:03 2022 +0300 how did this got reverted commit aceae24feaa346ad0f7bcf9ca600852b1f013866 Author: Totally a booplicate <[email protected]> Date: Mon May 30 02:52:28 2022 +0300 should use `random.random` smh commit 7c16f974d05b50a28894d2aeeaf8b0a3737ecc51 Author: Totally a booplicate <[email protected]> Date: Mon May 30 02:30:53 2022 +0300 some things commit 127cb99906d89a7e0a92313a4a71dc63ef9bc583 Author: John W <[email protected]> Date: Sun May 29 18:52:00 2022 -0400 smol commit 7263b836c6c37e24620b82ef527c184264a1ca11 Merge: c0662d981 78754f881 Author: John W <[email protected]> Date: Sun May 29 18:36:53 2022 -0400 Merge pull request #9039 from kkrosie123/bralette-red-ruffles-spritepack [New Spritepack] Bralette (Red, Ruffles) commit c0662d981e0508ae3033755db3ef4f07e965a7e1 Merge: e9ec4c0bf 2af91a461 Author: ThePotatoGuy <[email protected]> Date: Sun May 29 17:34:52 2022 -0500 Merge pull request #9177 from kkrosie123/tshirts-jurassic [New Spritepack] Jurassic T-Shirts commit ca2fd6d92f859d495d957c9ae086801c905b385c Merge: 09bdbc999 f99416d2c Author: John W <[email protected]> Date: Sun May 29 18:33:24 2022 -0400 Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into pr/5555 commit 09bdbc999de1fada4ce1bdb7da7aabbed9c54288 Author: John W <[email protected]> Date: Sun May 29 18:33:09 2022 -0400 edits commit f99416d2c080ebdc9f6b8884821b78c3bfcee777 Author: Totally a booplicate <[email protected]> Date: Mon May 30 00:25:33 2022 +0300 `ever_won` is obsolete commit 2af91a46119e8277306ef98fdd74a09e4e76444c Author: John W <[email protected]> Date: Sat May 28 23:42:52 2022 -0400 hold onto your butts commit 78754f88146cd14b157b3f83063a257a4328ee29 Author: John W <[email protected]> Date: Sat May 28 22:28:19 2022 -0400 smol commit ad8b0ed0f53100b1d3396c48d07d480603bb5610 Author: Legendkiller21 <[email protected]> Date: Sun May 29 04:55:58 2022 +0300 thumbs commit ccb721db8a19b229e8b716c96bb595995a045f1a Author: Legendkiller21 <[email protected]> Date: Sun May 29 04:08:25 2022 +0300 thumbs commit 03a46089f0966a6a5292faab3a0787930f707471 Author: potato <[email protected]> Date: Sat May 28 17:51:46 2022 -0500 correct image name commit e9ec4c0bfa6aa6c490ba111162679cdd72cf119d Merge: 83ab6d01d eeaa91362 Author: ThePotatoGuy <[email protected]> Date: Sat May 28 17:36:08 2022 -0500 Merge pull request #8027 from ThePotatoGuy/clothes-json-outfit-req Add outfit options to sprite JSON commit c94e56e78d3c72b100977dfa249228908ff245ec Author: potato <[email protected]> Date: Sat May 28 17:30:50 2022 -0500 pack chokers into 1 pack commit 956c759731c3f4b5236e9b0bf6bb238c408adb60 Author: multimokia <[email protected]> Date: Sat May 28 17:02:03 2022 -0400 clean some mid-game quips commit 0c1ea45376a6e3182b5b747fdafa334f406e78f6 Merge: 285a57eb9 83ab6d01d Author: multimokia <[email protected]> Date: Sat May 28 16:39:23 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/Booplicate/5555 commit 1ba26287ae1da1d787f711360cc6df150f0f4971 Author: Briar Young <[email protected]> Date: Fri May 27 19:02:29 2022 -0500 art fix commit cca6d27e9ec5d64b18087f1a420a375b7ec4a461 Author: Briar Young <[email protected]> Date: Fri May 27 18:42:36 2022 -0500 name fix commit a3626395aa44361fe6cb27e7800997da0a717f65 Author: Briar Young <[email protected]> Date: Fri May 27 18:39:50 2022 -0500 attempt error fix commit fb945c0f06a581d2adef1a2fe31eded8eb55dee0 Author: Briar Young <[email protected]> Date: Fri May 27 18:34:35 2022 -0500 add jurassic park commit 5ee36f324f57745afa76c171ddc66ba774dd3a52 Author: Briar Young <[email protected]> Date: Fri May 27 18:23:43 2022 -0500 finish jurassic world commit 83ab6d01d9957e40ecead79522e006fd646d1e91 Merge: 82e742492 3e2858d85 Author: John W <[email protected]> Date: Fri May 27 18:15:20 2022 -0400 Merge pull request #7541 from lunulae/patch-33 [Mood] - feeling grateful ❤️ commit 81cc08fe95ef75dafac03902ae03a168d27d5cab Merge: 206a7ae87 82e742492 Author: potato <[email protected]> Date: Tue May 24 21:25:17 2022 -0500 Merge branch 'content' into chess-actions-dict-fix commit 82e742492c0d9eb5a7e9f5693bde696aaa15f6b0 Author: potato <[email protected]> Date: Tue May 24 21:13:31 2022 -0500 update script update commit f2e3d5e4cb7e94d92f01021776a086d0cde5a84c Merge: 4fc051022 022080b05 Author: ThePotatoGuy <[email protected]> Date: Tue May 24 17:18:55 2022 -0500 Merge pull request #8996 from Booplicate/mas_set_gender_cleanup Cleanup pronouns commit 4fc0510226b1fef0df7b89089fd1b7f3b064431f Merge: f178d7ef9 7cab84a4a Author: ThePotatoGuy <[email protected]> Date: Tue May 24 17:18:08 2022 -0500 Merge pull request #8929 from Booplicate/wet_monika Polish hair commit 022080b05f63821730f12b71f56f54e444d2fa01 Author: Totally a booplicate <[email protected]> Date: Tue May 24 19:17:07 2022 +0300 imagine a world w/o typos commit 46670c66285adb2eb6c2143a10cdd98d1818177c Author: Briar Young <[email protected]> Date: Mon May 23 16:55:59 2022 -0500 change the display name commit 8dbd740bb2d5dd5ea58c8d7e1e8e61c01523a21f Author: Briar Young <[email protected]> Date: Mon May 23 16:49:01 2022 -0500 add outfit i tested it, looks gud commit 3e2858d85872db3eee214bd78eb1c56380a1edcb Author: multimokia <[email protected]> Date: Mon May 23 15:04:13 2022 -0400 minor consistency fixes commit 59afa3ffb5c437d318ef5d150749ff6cd5edd455 Author: Briar Young <[email protected]> Date: Mon May 23 13:06:57 2022 -0500 they're all in commit a8c727703ab48d53c3facd1d0fce8af322b5006a Author: Briar Young <[email protected]> Date: Mon May 23 12:43:17 2022 -0500 add spiked star commit 552e07807e36800a128b58bb1155d37a6c519a40 Author: Briar Young <[email protected]> Date: Mon May 23 12:28:20 2022 -0500 add silk commit 7460c192fbfe50eaf1286651994e07f138ffe0fd Author: Briar Young <[email protected]> Date: Mon May 23 12:09:12 2022 -0500 fixed image names commit 59287e67f6b7e030913a9e0b464dea7678e0cd28 Author: Briar Young <[email protected]> Date: Mon May 23 08:18:16 2022 -0500 ruffles red commit 85e70cc5d65838384f96d3f8fc44cf2b18b2c2e7 Author: Briar Young <[email protected]> Date: Mon May 23 08:12:23 2022 -0500 inconsistent file name fix commit fbb759aa8fc0911a84f0f28e011ab2db31dc302c Author: Briar Young <[email protected]> Date: Mon May 23 08:05:59 2022 -0500 ribbon name fix commit f0d2d895631a4da20af5ed64d1cb59aa3e363a39 Author: Legendkiller21 <[email protected]> Date: Mon May 23 13:46:15 2022 +0300 new thumb commit 4a743da1a139aac2952762788a3095ec79da1843 Author: John W <[email protected]> Date: Sun May 22 14:59:39 2022 -0400 space commit 6c2c2bfd996b4e5e50b67bd8f323582e33450d83 Author: John W <[email protected]> Date: Sun May 22 14:57:09 2022 -0400 edits commit 0a3add2da0ebce5dc3a1d0bdf3672f3132e753db Merge: 3dc33e700 f178d7ef9 Author: John W <[email protected]> Date: Sun May 22 12:46:15 2022 -0400 Merge branch 'content' into pr/7541 commit 170306c9201c12e6368f65ac28f2b60e71d660a8 Author: potato <[email protected]> Date: Sat May 21 16:04:59 2022 -0500 fixed wrong folder structure commit eeaa91362db68e921151b705ca0b5fac2a965794 Author: potato <[email protected]> Date: Sat May 21 15:44:34 2022 -0500 okay now the merge issues are handled commit 153d71d149d4c0f2f8b04efc55568b84c50f5a6d Author: potato <[email protected]> Date: Sat May 21 15:40:17 2022 -0500 try fix here commit bfd6c43c6b8d232acc91dbdbb3a7af6660209031 Author: potato <[email protected]> Date: Sat May 21 15:34:33 2022 -0500 fix mege issue commit 439b801d3166fd15fd06cfca49dfe61783458d2d Merge: 9e9a999d1 f178d7ef9 Author: potato <[email protected]> Date: Sat May 21 15:33:53 2022 -0500 Merge branch 'content' into clothes-json-outfit-req commit f178d7ef95fd7a2ddb315f335a5e849579cfc54e Merge: 3b42d13e1 34b9db251 Author: ThePotatoGuy <[email protected]> Date: Sat May 21 15:23:02 2022 -0500 Merge pull request #8992 from WishStone-Dragon/master Fixed text display when gifting Just Monika thermos commit 3b42d13e16bdc3f1c09f35fbb0f54c7ae67bf510 Merge: cf223a306 766e83620 Author: ThePotatoGuy <[email protected]> Date: Sat May 21 13:33:00 2022 -0500 Merge pull request #7288 from Wingdinggaster656/Chess960-Things [Chess System Extension] Chess960 Things commit 206a7ae87244a5d55dc110f138acfd68ef0bad35 Author: potato <[email protected]> Date: Wed May 18 22:43:08 2022 -0500 dlg actions now uses a defaultdict commit cf223a3064eca53674ecd9331bf3b8816d6aa94d Merge: b25b66733 e3dd810fa Author: multimokia <[email protected]> Date: Sun May 15 14:14:41 2022 -0400 Merge pull request #9028 from Legendkiller21/consumablesCheck Check consumables topic commit e3dd810fa040e1174ca0f13d24ee7add1419517b Author: John W <[email protected]> Date: Sun May 15 14:04:48 2022 -0400 smol commit b25b66733b5cf2c4e00a021977e57ba084f4ad1d Merge: ca8bbd137 79893dbcd Author: John W <[email protected]> Date: Sun May 15 13:56:16 2022 -0400 Merge pull request #9030 from Monika-After-Story/hungryrework [Small Rework] - Hungry Mood commit 718b31696ffee38d0afaaf12bea75226112bf390 Author: Briar Young <[email protected]> Date: Mon May 9 21:50:55 2022 -0500 ribbon commit c655334801da1399b6edf309f4545ba55e498711 Author: Briar Young <[email protected]> Date: Mon May 9 21:42:55 2022 -0500 name fix glitter bead commit 0bcb2d3ee547a8bc89cd4a26cca91af4e2402747 Author: Briar Young <[email protected]> Date: Mon May 9 21:41:40 2022 -0500 add glitter bead commit 19d1ffa5420fca66f66d7fedf005e2ae6dfd0986 Author: Briar Young <[email protected]> Date: Mon May 9 21:34:56 2022 -0500 add emerald commit ecf83b2f18f7b015bab4129c7160613c088db7ef Author: Briar Young <[email protected]> Date: Mon May 9 21:25:57 2022 -0500 add daisy commit 1c3ebe758580854c6e774fc9dde1fe1d5224c376 Author: Briar Young <[email protected]> Date: Mon May 9 19:44:42 2022 -0500 add choker chain silver commit 29a0c5f303c52755ad95ad636c5751a4e3be3c19 Author: Briar Young <[email protected]> Date: Mon Apr 11 20:20:31 2022 -0500 add spritepack commit ca8bbd137b74187eef7b5c5d1359fe57ec24be22 Merge: 80e99f663 d1fed3008 Author: multimokia <[email protected]> Date: Sun Apr 10 23:38:33 2022 -0400 Merge pull request #8707 from ThePotatoGuy/topic-kt-esports Adding Esports topic commit 79893dbcd2cba14af5d6e357cb24634264c13d10 Author: multimokia <[email protected]> Date: Sun Apr 10 14:18:29 2022 -0400 one smol addition commit 80e99f6635d14ec28b6291fe1e51c94311b00369 Merge: 899222d8e 0dbee48b3 Author: multimokia <[email protected]> Date: Sun Apr 10 00:41:37 2022 -0400 Merge pull request #9036 from jmwall24/why-do-you-read-issue adjust commit 0dbee48b36d7d5c72b6c64b216d06e10a450e512 Author: John W <[email protected]> Date: Sat Apr 9 21:15:36 2022 -0400 adjust commit 705826301afdb469f3b5c4e1c96b4bd0d8a4f27e Author: Totally a booplicate <[email protected]> Date: Sun Apr 10 00:37:05 2022 +0300 fix false positive commit 4e3e1d0bc7690676775ddf6505c12550d9e0aed4 Author: Totally a booplicate <[email protected]> Date: Sat Apr 9 22:30:24 2022 +0300 Update zz_consumables.rpy commit 56bdf0154504487bc2e691bb1ee1ac921e006f4e Author: John W <[email protected]> Date: Fri Apr 8 21:09:55 2022 -0400 edits commit 19334e82840e296399f6b152f92bd50e1128e9db Author: Totally a booplicate <[email protected]> Date: Sat Apr 9 02:18:40 2022 +0300 req commit 3ce6da3a0c6123f20789826bdb990ebae9d1693e Author: lunulae <[email protected]> Date: Mon Apr 4 22:02:48 2022 -0700 I said "important" way too many times commit 351d87f8c3c373e5e5e169e492a9dd9ac638d7b3 Author: lunulae <[email protected]> Date: Mon Apr 4 21:57:56 2022 -0700 hungrymoodrework commit 961a0a25e0282f2252a80556913c66d8b5404066 Author: Legendkiller21 <[email protected]> Date: Mon Apr 4 19:47:00 2022 +0300 cons check topic commit 34b9db2513865068ac2fd333b1b4d5812ce3174d Merge: 2f67b02dd 0a9e69496 Author: WishStone <[email protected]> Date: Sun Mar 27 19:24:36 2022 -0700 Merge remote-tracking branch 'origin/master' # Conflicts: # Monika After Story/game/zz_reactions.rpy commit 0a9e6949641539d02135e21b717649db52fea99b Author: WishStone-Dragon <[email protected]> Date: Sun Mar 27 19:03:51 2022 -0700 Removed '.title' in favor of text edit Discovered that simply removing '.title' didn't have the expected result; as such, changed the grammar of the sentence. commit d1fed30087d8f4f66b65b5e12e4face627a261b3 Author: John W <[email protected]> Date: Sun Mar 27 14:39:24 2022 -0400 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 614d9f780b18337f75e133152a4ba9dff132c084 Merge: 9e6e67a7a 899222d8e Author: John W <[email protected]> Date: Sun Mar 27 14:22:05 2022 -0400 Merge remote-tracking branch 'upstream/content' into pr/8707 commit 2f67b02dd565858808abd152b915d4fa17b90341 Author: WishStone <[email protected]> Date: Wed Mar 23 19:54:09 2022 -0700 Fixed a small text display issue in gifting the Just Monika thermos. commit 869582c8bb6c0b438e784e5ac22c0b2b97d47e6f Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 17:12:42 2022 +0300 smol commit 7c0ff749ad8e9ad74226ad6d83f17655190e89f2 Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 17:07:04 2022 +0300 add test because am lazy to test myself commit 138a001ae1523f3cdb3abe0f45f3baa2f5910e00 Author: Totally a booplicate <[email protected]> Date: Tue Mar 22 16:37:22 2022 +0300 req commit 55c9b922448780deb446666fa24bb9065860133a Author: Totally a booplicate <[email protected]> Date: Mon Mar 21 16:34:54 2022 +0300 allow to pass in gender, safe map access commit e97dea80bec86241249bdb47368b7151276f0df8 Author: Totally a booplicate <[email protected]> Date: Mon Mar 21 15:58:55 2022 +0300 cleanup commit 59615ca3143b907a05a22c6ce580a6afb61937e9 Merge: 362441d8c 3f5b8b3cd Author: WishStone-Dragon <[email protected]> Date: Sat Mar 19 19:35:24 2022 -0700 Merge branch 'Monika-After-Story:master' into master commit 362441d8c33bb6519acf4e8f3c337cfa3c222f78 Author: WishStone <[email protected]> Date: Sat Mar 19 19:34:05 2022 -0700 Fixed a small text display issue in gifting the Just Monika thermos. commit 0c06aeeda5fb7f207972b4bb2492cabeb6834387 Author: Totally a booplicate <[email protected]> Date: Fri Mar 18 19:01:51 2022 +0300 use `classmethod` here commit 899222d8e184d0482e938fa46d99c129b5191684 Author: potato <[email protected]> Date: Tue Mar 8 21:20:37 2022 -0600 also update script commit 3de7cc5ddaeae299b93e40355774939d822b90fc Author: potato <[email protected]> Date: Tue Mar 8 21:15:45 2022 -0600 version change commit 897ce8929c80bc936bd83b95cc2c031e087adadd Merge: eb0be2232 180341f0b Author: multimokia <[email protected]> Date: Sun Mar 6 13:44:53 2022 -0500 Merge pull request #8710 from ThePotatoGuy/topic-kt-cupcakes adding favorite cupcake flavor topic commit 180341f0be3b0d4d0af2f323a3b5e9375b57abfc Merge: e48a3e6ef eb0be2232 Author: John W <[email protected]> Date: Sun Mar 6 13:40:45 2022 -0500 Merge remote-tracking branch 'upstream/content' into pr/8710 commit 3a0410c947938a0b2606a529816bc9381a6dde5c Merge: 5d471a632 ad623cd94 Author: lunulae <[email protected]> Date: Wed Mar 2 20:24:30 2022 -0600 Merge branch 'smallfix' into pr/8928 commit ad623cd94943a4b235b893af4b3c42eca8b47d82 Author: lunulae <[email protected]> Date: Wed Mar 2 20:21:48 2022 -0600 Update script-topics.rpy commit 943247bce4fa2db333fd4b169ec397b4f39cfa06 Author: lunulae <[email protected]> Date: Wed Mar 2 20:13:23 2022 -0600 clarification commit eb0be2232f01060d0d6eb117777b089ddb6befc1 Merge: f607010de 421c2d84f Author: multimokia <[email protected]> Date: Wed Mar 2 13:16:46 2022 -0500 Merge pull request #8709 from ThePotatoGuy/topic-kt-convention adding convention topic commit 6ae944c23f56cddf0ce9bdd1747691680e7bf5f7 Author: Briar Young <[email protected]> Date: Tue Mar 1 17:28:14 2022 -0600 less blurry thumbnail commit b545b81c8fcdba983d1b570e60117366c41ad4ca Author: Briar Young <[email protected]> Date: Mon Feb 28 21:30:20 2022 -0600 [New Spritepack] Dress (Dark blue, sparkly) This is one of many new, upcoming spritepacks for future updates. TODO: less blurry thumbnail commit e48a3e6ef5064bde014796a5fadcbb9cb0c6d6a4 Author: lunulae <[email protected]> Date: Mon Feb 28 18:08:52 2022 -0800 small grammar thing commit 421c2d84fe5b5e1501f364f209ea1ed621cf10ba Author: John W <[email protected]> Date: Sun Feb 27 22:14:16 2022 -0500 history again commit a414ff82ff4173c322a5ab225708f4e988bd2a36 Author: multimokia <[email protected]> Date: Sun Feb 27 20:08:12 2022 -0500 small edits commit 6a85b217080231b13373fd65ec69efcbf244c9ee Author: multimokia <[email protected]> Date: Sun Feb 27 19:44:04 2022 -0500 haha -> ahaha commit 7fbc0684d7a048c6f842d64765a2f9136636ebb4 Author: John W <[email protected]> Date: Sun Feb 27 19:41:47 2022 -0500 hist commit 0206475cb8503aab17afb285da3cd2275a5fc844 Author: John W <[email protected]> Date: Sun Feb 27 19:37:38 2022 -0500 update commit de49b4d3c5db6bbb8e266cee716633b8a2051809 Merge: fd64b4911 f607010de Author: John W <[email protected]> Date: Sun Feb 27 19:36:25 2022 -0500 Merge branch 'content' into pr/8709 commit fd64b49116023b73893ca21a1787b6a656d94fb3 Author: John W <[email protected]> Date: Sun Feb 27 19:35:53 2022 -0500 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 2e866d4439d1ad19557d6cced556e4a82316d5ab Author: John W <[email protected]> Date: Sun Feb 27 17:13:32 2022 -0500 edits Co-Authored-By: Karrigan Taylor <[email protected]> commit 9e9a999d1bf192f1389263bf6e119660ff1cdf3e Author: potato <[email protected]> Date: Sun Feb 27 13:51:14 2022 -0600 fix merge commit 7170d7ed14c53723f58f99ce52d878a3e8ce4a49 Merge: 91aa1032a f607010de Author: potato <[email protected]> Date: Sun Feb 27 13:47:12 2022 -0600 Merge branch 'content' into clothes-json-outfit-req commit 91aa1032ad4090c3b365a5a6c987d3994db94e7b Author: potato <[email protected]> Date: Sun Feb 27 13:30:54 2022 -0600 Revert "orcaramelo prog point changes" This reverts commit d4e0ac06743777dc63648a2941b0147084496005. commit 9e6e67a7a2d9b55e00e720fa5f3577c738345c3e Author: ThePotatoGuy <[email protected]> Date: Sat Feb 26 19:25:28 2022 -0600 Apply suggestions from code review Co-authored-by: multimokia <[email protected]> commit 7cab84a4abfbb18d068f8374e9f32bf3208916f9 Author: multimokia <[email protected]> Date: Sat Feb 26 16:11:18 2022 -0500 add mocca creds commit f607010de568f0778511a5f20fd2f8dfd5d6aa18 Merge: f85470950 bf9b644d0 Author: multimokia <[email protected]> Date: Sat Feb 26 13:27:00 2022 -0500 Merge pull request #8923 from KritRom/patch-1 Adding more bad nicknames. commit 196d99fdf3e562c3c4816d5efad6d4458f212a81 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:40:42 2022 +0300 polish hair Thanks Mocca commit bf9b644d0b778ed01d3f3dbd76ea68148ad26199 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:32:10 2022 +0300 Allow `brooke` commit 5d471a632b27bf7a07c8e6f975e95af06613cb43 Author: Totally a booplicate <[email protected]> Date: Sat Feb 26 18:18:04 2022 +0300 Damn tags commit 805c00b9a585c5c0119282c19fe8f02014e37c3a Author: Kris the artist <[email protected]> Date: Thu Feb 24 20:54:51 2022 +0530 Adding more bad nicknames. Adding a few more names to the bad nickname list. commit f8547095039e2ede111c5bf59210f3b6df7106cc Author: potato <[email protected]> Date: Mon Feb 21 22:03:54 2022 -0600 comma commit 11135574f06072983872b7e92968cca1474527d4 Author: potato <[email protected]> Date: Mon Feb 21 22:03:28 2022 -0600 version change and update script commit 623c48e89475d823402728d2c7e613f0f386aaee Merge: 5ae545084 ce44528ca Author: ThePotatoGuy <[email protected]> Date: Mon Feb 21 21:48:57 2022 -0600 Merge pull request #8902 from Booplicate/fix_brb_crash Fix undefined var commit ce44528ca41b3b3e3e177ac3de3e035e70768285 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 17:07:13 2022 +0300 fix undefined var commit 5ae545084132cbb882441b6de6913f29a2b681da Author: potato <[email protected]> Date: Sun Feb 20 21:09:50 2022 -0600 update scripts commit c382b0944e5b0fae6e7ebe0a89f08e578e2d08ca Author: potato <[email protected]> Date: Sun Feb 20 20:54:04 2022 -0600 ver change commit 25219ebea35415a3e19fd176d83c81fc8b05e0a7 Merge: 2fac14dc5 8db7a7ca0 Author: multimokia <[email protected]> Date: Sun Feb 20 21:48:12 2022 -0500 Merge pull request #6915 from Booplicate/wet_monika New greeting, new clothes and hair, and hair sprite adjustments commit 2fac14dc51a29270a3dc246cbb8702e3ec4dad66 Merge: d7dadc13b 535e7c608 Author: John W <[email protected]> Date: Sun Feb 20 20:47:22 2022 -0500 Merge pull request #7889 from jmwall24/922-fixes some 922 fixes commit d7dadc13bfe43c11459a23f001b3ac1f658e32a3 Merge: 77c1c23af ce9f93909 Author: multimokia <[email protected]> Date: Sun Feb 20 20:14:13 2022 -0500 Merge pull request #8619 from ThePotatoGuy/event-context Add Event List wrappers and Event Context ![aboom](https://cdn.discordapp.com/emojis/943239032211644477.gif?size=256&quality=lossless) commit ce9f939090e1598e86a3774b375ec996e4040f58 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 04:08:48 2022 +0300 Revert "smol" This reverts commit 0a73110920ecdc84a296329eb7e865ef924d7591. commit 535e7c60847635f81ea7a24e31a6fced82829d4b Merge: 9677df927 77c1c23af Author: John W <[email protected]> Date: Sun Feb 20 20:08:31 2022 -0500 Merge remote-tracking branch 'upstream/content' into 922-fixes commit 77c1c23aff31e3c18818aae2d661bcd18fdaee9b Merge: 1581373a2 6f12fa268 Author: John W <[email protected]> Date: Sun Feb 20 20:04:29 2022 -0500 Merge pull request #8542 from jmwall24/d25-fixes d25/nye fixes commit 0a73110920ecdc84a296329eb7e865ef924d7591 Author: Totally a booplicate <[email protected]> Date: Mon Feb 21 02:01:16 2022 +0300 smol `None` can be pickled safely commit ee43162c6ef5ca193cb51c478f22b476b7a5d3e6 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 16:35:01 2022 -0600 repr to isolatedflexprop Co-authored-by: Totally a booplicate <[email protected]> commit 86de4eb1261837a0a158e2bd414081d994cac340 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 16:34:20 2022 -0600 Apply suggestions from code review Co-authored-by: Totally a booplicate <[email protected]> commit 6f12fa2681e4242899aaa506cc396155eb374d55 Merge: 89d536dab 1581373a2 Author: multimokia <[email protected]> Date: Sun Feb 20 16:19:37 2022 -0500 Merge remote-tracking branch 'upstream/content' into pr/jmwall24/8542 commit 1581373a21ad0221ee01ce18fb7402b8453d309c Merge: a470f841a 34f385298 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 20 15:16:19 2022 -0600 Merge pull request #7576 from Booplicate/idle_disp_stuff New idle mode exps + fixes commit a10ce9304a85d8915fd904810e4bbfc514414ba0 Author: potato <[email protected]> Date: Sat Feb 19 23:16:41 2022 -0600 add test for mas evet contxt commit eb676aec4baa85e2a0aa9661cbff16f8416e05c6 Author: potato <[email protected]> Date: Sat Feb 19 23:04:05 2022 -0600 type checks with unit tests commit 8db7a7ca07afd2c528886d8fa63b53eae763c15c Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 07:26:56 2022 +0300 sanity check commit b51c32bb7aad50a7bd4471ee5d9adba11458a06e Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 07:19:02 2022 +0300 Implement proper accessors Because I got fed up of this direct access commit b185e6c078a5ec0ea1100524c7ff764e0e36e3e2 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:30:26 2022 +0300 wow who coded this commit 2506e02c8108895f0cfa404a9b7be3c52c6db93f Merge: f494f43ae c6b16d900 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:12:29 2022 +0300 Merge branch 'wet_monika' of https://github.com/Booplicate/MonikaModDev into wet_monika commit f494f43aed5da5db4f1b32330de15f0d7126173a Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 06:12:11 2022 +0300 the flower pin must glow wait, this isn't factorio commit e4012185b921467639a0d1cad8e64701645863a7 Author: Totally a booplicate <[email protected]> Date: Sun Feb 20 05:56:23 2022 +0300 limit to ~daytime commit c6b16d900755b9eb80f31c59be5b387a6f48438f Author: multimokia <[email protected]> Date: Sat Feb 19 21:54:24 2022 -0500 smol dialogue things commit 10bd1094bc59eba55f38e7a57a78e0dc479fa170 Merge: f8719a443 2a693bd0c Author: potato <[email protected]> Date: Sat Feb 19 20:34:34 2022 -0600 Merge branch 'event-context' of github.com:ThePotatoGuy/MonikaModDev into event-context commit 2a693bd0c396a7bdf43550619b980e66d67a3c33 Author: ThePotatoGuy <[email protected]> Date: Sat Feb 19 20:33:31 2022 -0600 super call getattribute Co-authored-by: Totally a booplicate <[email protected]> commit f8719a4437bb390ee20881e24c825eec0069bfb0 Author: potato <[email protected]> Date: Sat Feb 19 20:33:13 2022 -0600 use findevl commit 89d536dabec4eac473fb51c5e530da73c21fb977 Author: potato <[email protected]> Date: Sat Feb 19 20:19:07 2022 -0600 correct store all commit 34f385298c6cfae05ce0e43e10d74941d935c07c Author: multimokia <[email protected]> Date: Sat Feb 19 19:56:50 2022 -0500 bump to 10 commit 7564c74b76b2a395cd395fa52aa8f2c6cc83f85a Merge: c1e5c6c47 0c9fcf9c8 Author: potato <[email protected]> Date: Sat Feb 19 12:30:17 2022 -0600 Merge branch 'd25-fixes' of https://github.com/jmwall24/MonikaModDev into d25-fixes commit c1e5c6c47886b3d2eff605a609cd8691d37d19f0 Author: potato <[email protected]> Date: Sat Feb 19 12:30:07 2022 -0600 transfer this too commit 0c9fcf9c8d7f62236d53f93a8562ab392cf47204 Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 21:16:57 2022 +0300 fix `lookup_ot` commit 3c26e439b53aec5402e79e73f2c38d4a7a4d6639 Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 21:01:12 2022 +0300 Better exceptions commit b5c660315d74118340806e09f4555d7f9b372419 Merge: f753dd455 a470f841a Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 20:55:45 2022 +0300 Merge remote-tracking branch 'upstream/content' into wet_monika commit f753dd455fd020c05486707a51b7008a2319373a Author: Totally a booplicate <[email protected]> Date: Sat Feb 19 20:55:18 2022 +0300 resolved todo commit 9677df927cf071518dcff8212b9e305db2a45e55 Merge: c9963669a a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:40:06 2022 -0600 Merge branch 'content' into 922-fixes commit 7b9c3f4ca65d6a88ba4c873425f00d8eb063ed99 Author: potato <[email protected]> Date: Sat Feb 19 11:38:38 2022 -0600 update script commit 68b2e06431e5affa10f54ad4f8084465801f3f9b Merge: 3ea1fb0d5 a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:32:24 2022 -0600 Merge branch 'content' into d25-fixes commit b9838cb92b7ca16162ea2f5ed18a7b71e3c040bd Merge: 88297d698 a470f841a Author: potato <[email protected]> Date: Sat Feb 19 11:27:27 2022 -0600 Merge branch 'content' into idle_disp_stuff commit 6f6df9bf90581dc9224161689d01c84da3d2f311 Author: potato <[email protected]> Date: Mon Feb 14 22:55:04 2022 -0600 add clothes to this commit 88bb6c47a3b659ae30939189439065834701ed66 Author: potato <[email protected]> Date: Sun Feb 13 23:58:16 2022 -0600 support delayed validation commit ba83fa3d28b19a7cbd09fc5316aff141adca9b91 Author: potato <[email protected]> Date: Sun Feb 13 23:05:54 2022 -0600 fixes commit c3827e8968753a9962671fff80fa2cff475f33eb Author: potato <[email protected]> Date: Sun Feb 13 23:00:09 2022 -0600 new years dress commit d4e0ac06743777dc63648a2941b0147084496005 Author: potato <[email protected]> Date: Sun Feb 13 15:46:28 2022 -0600 orcaramelo prog point changes commit c9c7d0c7f7c82e7254e0625b0a7c2893032352fe Author: potato <[email protected]> Date: Sun Feb 13 14:09:06 2022 -0600 none check here commit 884dcd7952859f34525ef3e4a015e94bf1d42fb2 Author: potato <[email protected]> Date: Sun Feb 13 00:22:29 2022 -0600 move built in outfit mode changes to sprite objects commit 5c2399dae975e410e7baec04d1ff0792c76b263e Author: potato <[email protected]> Date: Sat Feb 12 11:43:54 2022 -0600 moved clothes to after acs commit 3a84dba1d656c0c6277283040b91dfbda4c738c4 Author: potato <[email protected]> Date: Sat Feb 12 11:31:58 2022 -0600 adding logging commit 95d141f88262807713f677d7b0feed34b2464fdb Merge: bf5aac215 a470f841a Author: potato <[email protected]> Date: Sat Feb 12 11:22:24 2022 -0600 Merge branch 'content' into clothes-json-outfit-req commit 70a55d93532eb8ba94945b093f43fda835fab46c Author: ThePotatoGuy <[email protected]> Date: Fri Feb 11 23:04:48 2022 -0600 Apply suggestions from code review Co-authored-by: lunulae <[email protected]> commit 47f75360104a0bb28f68931a9b810a6e74918bb7 Author: potato <[email protected]> Date: Thu Feb 10 21:10:40 2022 -0600 forgot that commit 735cd5ddf56509e458302aabfe0469683d7f1ade Author: potato <[email protected]> Date: Thu Feb 10 21:09:06 2022 -0600 codes commit a0fb3a9f07bb816865c1236d8a606d336ba0fedc Author: potato <[email protected]> Date: Thu Feb 10 21:07:42 2022 -0600 codes commit 93fdc9085372e887941c0a92204474922bc64bc6 Author: potato <[email protected]> Date: Thu Feb 10 21:02:34 2022 -0600 codes commit 05d6020b2721f65d6670902b8960761a06060325 Author: potato <[email protected]> Date: Thu Feb 10 20:35:54 2022 -0600 use vars commit 54df31590cb0af8e5cef904b4917bbc64c8955c2 Author: potato <[email protected]> Date: Thu Feb 10 20:30:03 2022 -0600 adding cupcakes topic Co-authored-by: karrigantaylor <[email protected]> commit 0f0d4e8da9bd90e5fff91e3b94afecbe51ba7fb2 Author: potato <[email protected]> Date: Thu Feb 10 20:19:54 2022 -0600 adding convention topic Co-authored-by: karrigantaylor <[email protected]> commit 76496ebbe4092c24f7550ba46ba1aef93cabce4c Author: potato <[email protected]> Date: Thu Feb 10 19:58:41 2022 -0600 adding esports topic Co-authored-by: Karrigan Taylor <[email protected]> commit 3fcc8ce5088970494dd1184f66a576ffa0c0f076 Author: potato <[email protected]> Date: Mon Feb 7 22:53:03 2022 -0600 changes as suggested commit 898f145e66b3ade6b3174f6799bac849a2707f23 Author: potato <[email protected]> Date: Mon Feb 7 22:50:55 2022 -0600 fix commit 266931e1b723bae969fb35aba2813d2bf3a780a7 Author: potato <[email protected]> Date: Mon Feb 7 22:38:56 2022 -0600 remove reg felxprop commit 12846b775ee458e7459ebd8c188bb8a8232a04ac Merge: 8f20829d1 8597103ea Author: potato <[email protected]> Date: Mon Feb 7 22:14:08 2022 -0600 Merge branch 'event-context' of github.com:ThePotatoGuy/MonikaModDev into event-context commit 8597103ea65065220064c9ab141b5bb71eea28c4 Author: ThePotatoGuy <[email protected]> Date: Mon Feb 7 22:13:17 2022 -0600 Apply suggestions from code review Co-authored-by: Totally a booplicate <[email protected]> commit 8f20829d15b1bdacc945bc9ab132a5c54b91b87d Merge: dc3a6a39d a470f841a Author: potato <[email protected]> Date: Mon Feb 7 20:18:17 2022 -0600 Merge branch 'content' into event-context commit a470f841a6f8327cb7ae29e6de94cf38ae32f95a Author: potato <[email protected]> Date: Sun Feb 6 20:58:06 2022 -0600 update script commit 3f5b8b3cd2ec6e395f5f2095d7cc742157f2d721 Author: potato <[email protected]> Date: Sun Feb 6 19:13:56 2022 -0600 outfit mode check commit 4900ec89b0c41906c113e12be7940e377ef7103c Author: potato <[email protected]> Date: Sun Feb 6 18:55:24 2022 -0600 version change commit 6f83ae58f3a3a37ecccac86ed9561a8ca14ba36d Merge: 7d8143075 52651ac70 Author: ThePotatoGuy <[email protected]> Date: Sun Feb 6 18:41:10 2022 -0600 Merge pull request #8594 from multimokia/typos 0.12.7 Typos commit 52651ac70222ae4ff3576a13d8dd3460bc5773e5 Author: John W <[email protected]> Date: Sun Feb 6 19:25:25 2022 -0500 smol (sorry) commit 11a2e38423e9093cc230de88a8b207ef9d703938 Merge: 1614c9dc2 7d8143075 Author: John W <[email protected]> Date: Sun Feb 6 19:01:07 2022 -0500 Merge branch 'content' into pr/8217 commit 7d81430753246962d2c47961de08b9b9c94f05d8 Merge: 5328269ef e4b09e313 Author: John W <[email protected]> Date: Sun Feb 6 19:00:15 2022 -0500 Merge pull request #8648 from jmwall24/f1422 f14 2022 commit e4b09e3132a8a495766be94f2b6df3f04f8d6467 Author: potato <[email protected]> Date: Sun Feb 6 16:10:58 2022 -0600 length too commit 70f6c268eea77bee07e8d1a2294a35406ae6862c Author: potato <[email protected]> Date: Sun Feb 6 16:05:47 2022 -0600 use validator commit c05eb711669da199a3b1904a77823c6ea2a49505 Author: potato <[email protected]> Date: Sun Feb 6 15:53:44 2022 -0600 use pdget and hide commit f345f8c3cb5116530077fa90e0ddecd85e6de93d Author: multimokia <[email protected]> Date: Sat Feb 5 21:13:27 2022 -0500 more unlocks commit 1614c9dc22d0719343cc9d96efa72eb88cfb7b9b Author: multimokia <[email protected]> Date: Sat Feb 5 20:41:58 2022 -0500 unnecessary step removed commit 59aa453ef005e01d04163d54ddb3483297fd3da5 Author: multimokia <[email protected]> Date: Sat Feb 5 20:39:23 2022 -0500 update steps commit ce2ef4ed2f8c4869eb9db93788cd1f15dcac13c4 Merge: 7f0d790c2 91c9c5e69 Author: multimokia <[email protected]> Date: Sat Feb 5 20:34:40 2022 -0500 Merge branch 'typos' of github.com:multimokia/MonikaModDev into typos commit 7f0d790c23deb9160f622cc152c957ae32b2a79f Merge: 1cf6fd3bc 5328269ef Author: multimokia <[email protected]> Date: Sat Feb 5 20:34:36 2022 -0500 Merge remote-tracking branch 'upstream/content' into typos commit 1407773a649bd0623571ed6cc5fcedcf89e6377d Merge: 50ef85395 5328269ef Author: multimokia <mu…
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.