Merge branch 'dev' into Chibis

2023-02-18 23:43:58 +00:00 · 2023-02-18 23:43:58 +00:00 · b84d14c6e4
commit b84d14c6e4
parent baa83c8cc5 b48f602e35
1305 changed files with 9277 additions and 5004 deletions
--- a/game/characters/astoria/body/armleft/on_hips.webp
+++ b/game/characters/astoria/body/armleft/on_hips.webp
--- a/game/characters/astoria/body/armleft/on_hips_fix.webp
+++ b/game/characters/astoria/body/armleft/on_hips_fix.webp
--- a/game/characters/astoria/body/armright/on_hips.webp
+++ b/game/characters/astoria/body/armright/on_hips.webp
--- a/game/characters/astoria/body/armright/on_hips_fix.webp
+++ b/game/characters/astoria/body/armright/on_hips_fix.webp
--- a/game/characters/astoria/body/base/front.webp
+++ b/game/characters/astoria/body/base/front.webp
--- a/game/characters/astoria/body/breasts/normal.webp
+++ b/game/characters/astoria/body/breasts/normal.webp
--- a/game/characters/astoria/bodyparts/frame/default/skin.webp
+++ b/game/characters/astoria/bodyparts/frame/default/skin.webp
--- a/game/characters/astoria/clothes/bottom/pants_1/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/pants_1/armfix.webp
--- a/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/angry/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/angry/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/base/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/base/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/clench/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/clench/0.webp
--- a/Show More
+++ b/Show More