Merge branch 'master' into tool-only

# Conflicts: # game/images_tool/to_be_continued.webp # game/script.rpy
DRincs-Productions · Aug 28, 2021 · 801e37e · 801e37e
2 parents 9e81dde + b222b85
commit 801e37e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 51 deletions.
diff --git a/game/images_tool/button-no.psd b/game/images_tool/button-no.psd
diff --git a/game/images_tool/button-no.webp b/game/images_tool/button-no.webp
diff --git a/game/images_tool/button-yes.psd b/game/images_tool/button-yes.psd
diff --git a/game/images_tool/button-yes.webp b/game/images_tool/button-yes.webp
diff --git a/game/images_tool/pegi_18.psd b/game/images_tool/pegi_18.psd
diff --git a/game/images_tool/pegi_18.webp b/game/images_tool/pegi_18.webp
diff --git a/game/images_tool/to_be_continued.webp b/game/images_tool/to_be_continued.webp
diff --git a/game/tool/check_age.rpy b/game/tool/check_age.rpy
diff --git a/game/tool/temporary_end.rpy b/game/tool/temporary_end.rpy