 KevinSmarts
|
6b4a1a7e34
Merge remote-tracking branch 'sovietmercader/master'
|
vor 6 Jahren |
|
KevinSmarts
|
0c5cd5519f
Merge remote-tracking branch 'jhawkkaw/dev'
|
vor 6 Jahren |
 sovietmercader
|
8811e021df
[changed] rewrite events for group drinking and sex with Sveta, Mira, Mitka, and his friends
|
vor 6 Jahren |
|
sovietmercader
|
248423bb0f
[fixed] small tweaks for relationship and a couple other minor fixes
|
vor 6 Jahren |
 jhawkkaw
|
35cecbfc79
[added] Aleksandra library event
|
vor 6 Jahren |
|
sovietmercader
|
d5a81a8e55
[fixed] mitka and friends events should go to mitkasex not hunters again
|
vor 6 Jahren |
|
KevinSmarts
|
056a3d0297
Merge remote-tracking branch 'jhawkkaw/dev'
|
vor 6 Jahren |
|
jhawkkaw
|
de17e97735
[added] link to start Aleksandra events from school
|
vor 6 Jahren |
|
jhawkkaw
|
c45c047a1b
[fixed] missing <> on name variables
|
vor 6 Jahren |
|
jhawkkaw
|
c497fc8122
[fixed] missing :
|
vor 6 Jahren |
|
jhawkkaw
|
25f6387996
[added] Aleksandra to phone selfies
|
vor 6 Jahren |
|
jhawkkaw
|
5e0aa5be1f
[added] Initial Aleksandra school code
|
vor 6 Jahren |
 julzor
|
65d58e5643
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 6 Jahren |
|
julzor
|
c36a6141e4
[fixed] syntax error in Snpc
|
vor 6 Jahren |
 CroWke
|
238f977910
[fixed] Ok, so I added $npcSelfie to npc_data and the school selfies now work. (no content yet tho)
|
vor 6 Jahren |
|
CroWke
|
2b0e2b75e3
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 6 Jahren |
|
KevinSmarts
|
64f1ff1a5c
[fixed] wrong lines commented out, so reversed them for CroWke
|
vor 6 Jahren |
|
CroWke
|
67f8639ec1
[edit] If you start in June the focus of the conversation will be on getting up early to help your grandparents instead of school.
|
vor 6 Jahren |
|
KevinSmarts
|
afd249bff1
[fixed] replacing the removed section to fix the unicode error
|
vor 6 Jahren |
|
KevinSmarts
|
47f2c6694a
[fixed] removing to repair unicode error, repairing in next commit
|
vor 6 Jahren |
|
KevinSmarts
|
02623385ea
Merge remote-tracking branch 'CroWke/master'
|
vor 6 Jahren |
|
CroWke
|
89e414d9eb
[edit] This includes all the school kids. I still need to figure out how to properly add the "if selfie is available" check.
|
vor 6 Jahren |
|
julzor
|
1e01dd4f37
[changed] blocked virginity messages in obj_din
|
vor 6 Jahren |
|
CroWke
|
3befba5f78
[fixed] This should be what sets Mikhail as a teacher, but I'm not sure when this part of the code actually gets triggered (It doesn't fix it for savegames as far as I know)
|
vor 6 Jahren |
|
julzor
|
24053c7b18
[added] drinking water/tea and refill bottle to fedorev4
|
vor 6 Jahren |
|
julzor
|
a6f18b2afd
[added] drinking water/tea and refill bottle to netbelapt
|
vor 6 Jahren |
|
julzor
|
5b7372e494
[fixed] changed actions to kitchen dynamics, [added] refillable water bottle to mey_home
|
vor 6 Jahren |
|
CroWke
|
c49d86e652
[fixed] cleaned up the code for the anushka event
|
vor 6 Jahren |
|
CroWke
|
f941a683b1
[fixed] I fixed it so that it'll always show 6 results on the first row.
|
vor 6 Jahren |
|
CroWke
|
426fc4db09
[fixed] Found some more repeated text in there and fixed it
|
vor 6 Jahren |
