Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

[BUGFIX] has_injuries thoughts #3275

Merged
merged 1 commit into from
Jan 12, 2025

Conversation

larkgz
Copy link
Collaborator

@larkgz larkgz commented Dec 27, 2024

About The Pull Request

Fixes has_injuries thought constraint so that thoughts with the constraint can actually show up now.

There currently aren't any thoughts that use this constraint (presumably due to it being broken), which is why I'm targeting development.

Linked Issues

Fixes #3272

@j-gynn j-gynn merged commit c5a4561 into ClanGenOfficial:development Jan 12, 2025
7 checks passed
rustykitty added a commit to rustykitty/clangen that referenced this pull request Jan 13, 2025
commit c5a4561
Merge: 46d4c8a 130ec66
Author: J Gynn <[email protected]>
Date:   Sun Jan 12 22:54:31 2025 +0000

    Merge pull request ClanGenOfficial#3275 from larkgz/fix-injury-thoughts

    [BUGFIX] has_injuries thoughts

commit 46d4c8a
Merge: cd33086 d999622
Author: J Gynn <[email protected]>
Date:   Sun Jan 12 22:39:40 2025 +0000

    Merge pull request ClanGenOfficial#3356 from KiraDragoness/KiraDragoness-fixes

    [BUGFIX] Fixed text when bringing a litter of kits into camp

commit d999622
Author: KiraDragoness <[email protected]>
Date:   Sun Jan 12 23:36:41 2025 +0100

    Update pregnancy.en.json

commit cb56587
Author: KiraDragoness <[email protected]>
Date:   Sun Jan 12 23:32:43 2025 +0100

    Fixed text when bringing a litter of kits into camp

commit cd33086
Merge: 9c5df2a 237fb22
Author: J Gynn <[email protected]>
Date:   Sat Jan 11 17:11:45 2025 +0000

    Merge pull request ClanGenOfficial#3346 from rustykitty/pregnant-secret

    fixed secret pregnancy message

commit 9c5df2a
Merge: fdab408 4fd3787
Author: J Gynn <[email protected]>
Date:   Sat Jan 11 17:10:51 2025 +0000

    Merge pull request ClanGenOfficial#3353 from rustykitty/issue-3348

    fixed medicine den text adjusting error

commit 4fd3787
Author: Rusty <[email protected]>
Date:   Sat Jan 11 08:25:32 2025 -0800

    fixed error with adjusting empty test (ClanGenOfficial#3348)

commit 9bead09
Author: Rusty <[email protected]>
Date:   Sat Jan 11 08:19:35 2025 -0800

    lint code

commit 237fb22
Author: Rusty <[email protected]>
Date:   Thu Jan 9 06:55:53 2025 -0800

    fixed secret pregnancy message (ClanGenOfficial#3328)

commit 130ec66
Author: Lara <[email protected]>
Date:   Fri Dec 27 13:32:35 2024 -0500

    fix: has_injuries thoughts

# Conflicts:
#	scripts/conditions.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Unintended codeflow?
2 participants