 Netuttki
|
1d4f83c7a0
Merge branch 'master' into upstream/master
|
4 years ago |
|
Netuttki
|
c4b1d3db50
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
 KevinSmarts
|
7a8bac299e
Merge remote-tracking branch 'Violet_Kitten/master'
|
4 years ago |
|
KevinSmarts
|
c193e0e303
[fixed] reversal of accidental change to makeQSP.bat file
|
4 years ago |
|
Netuttki
|
f9de8c866f
More renaming. All the train stations renamed plus the lake path
|
4 years ago |
|
Netuttki
|
00930eef1f
Renaming pavComplex locs to pav_complex, pavShared locs to pav_shared
|
4 years ago |
 VioletKitten
|
110d84a385
[Fixes] After weed event, player was always returning to pav train station even when heading to city.
|
4 years ago |
|
VioletKitten
|
a4ea60e3ea
[Fixes] Time was being added twice. Spotted by Netuttki.
|
4 years ago |
|
Netuttki
|
0e6176001e
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
KevinSmarts
|
89029b59af
[fixed] Weed event is only triggered in Pav when getting th etrain to the city as was intended and teh destination is fixed so that you do end up in the city. Only triggered if you buy a ticket and not if you have a pass for now.
|
4 years ago |
 richard_butte
|
f87beee17b
Moved cum location/amount/guy/age/etc. calculations from stat_display to cum_manage
|
4 years ago |
|
Netuttki
|
1fd3306023
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
KevinSmarts
|
58adbcee15
[fixed] family_scedule wasn't being called in either bedroom at home
|
4 years ago |
|
KevinSmarts
|
1331eb72ec
Merge branch 'master' of https://git.catrenelle.com/Violet_Kitten/glife
|
4 years ago |
|
VioletKitten
|
5d385eb98f
[Fixed] I forgot to change the > to < after copy pasting the code for the new clique system.
|
4 years ago |
|
KevinSmarts
|
a8ab08fbaa
Merge remote-tracking branch 'Violet_Kitten/master'
|
4 years ago |
|
VioletKitten
|
68e3308ca2
[Changed] Broke up social check and recorded grupvalue so now the grupvalue change limit should be exactly 30 for the whole school day.
|
4 years ago |
|
VioletKitten
|
e14233b3cf
[fixed] Swapped Bella and Albina in cheat menu. Putting Bella in Cool Clique and Albina in Jock clique.
|
4 years ago |
|
Netuttki
|
a264105920
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
KevinSmarts
|
daceea3309
[fixes] Image calls had extra cafe in them
|
4 years ago |
|
Netuttki
|
a310aee217
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
KevinSmarts
|
043a0f3aa4
Merge branch 'master' of https://git.catrenelle.com/Violet_Kitten/glife
|
4 years ago |
|
KevinSmarts
|
58f374d8db
[fixed] Extra comma in sexshop that I thought I'd fixed before, but no same error different line and some extra ends picked up by analyser. Plus one of the city_industrial image links changed in error during file renaming
|
4 years ago |
|
VioletKitten
|
e181a3e952
[Fixed] Image call for city industrial.
|
4 years ago |
|
KevinSmarts
|
59b5d6d09e
Merge remote-tracking branch 'Violet_Kitten/master'
|
4 years ago |
|
VioletKitten
|
935b219399
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
VioletKitten
|
2bb8c3ea65
[Fixed] Goto command missing gt in brother file.
|
4 years ago |
 julzor
|
4b5436f473
[fixed] grades should be blocked if sveta has been expelled
|
4 years ago |
|
VioletKitten
|
cec192cac1
[fixes] Removed a few variables that are no longer needed and added an image call to end scene. Also fixed syntax error in sexshop.
|
4 years ago |
|
KevinSmarts
|
e87b4d7e4d
Merge remote-tracking branch 'Violet_Kitten/master'
|
4 years ago |
