 Netuttki
|
026c7cba38
Merge remote-tracking branch 'upstream/master'
|
4 vuotta sitten |
 hornguy6
|
bf309090de
[changed] code cleanup in the massuese scheduler
|
4 vuotta sitten |
|
hornguy6
|
f499d3615b
[fixed] drinks in the break room at the salon
|
4 vuotta sitten |
|
hornguy6
|
1b5b337fd0
[fixed] proper location tags for the break room at the salon
|
4 vuotta sitten |
|
hornguy6
|
a4defa23a1
[changed] wording in sentences
|
4 vuotta sitten |
 KevinSmarts
|
4b0279a367
[fixed] Wrong park linked in old town location
|
4 vuotta sitten |
|
KevinSmarts
|
457a55e345
Merge remote-tracking branch 'Vengence_11/master'
|
4 vuotta sitten |
|
Netuttki
|
b85bee83ea
Merge remote-tracking branch 'upstream/master'
|
4 vuotta sitten |
|
KevinSmarts
|
9a31662228
[fixed] issues raised by temp on the repo, mostly logic errors
|
4 vuotta sitten |
 Vengeance11
|
9de448cfb1
Fixed oversight of Albina inviting the player to the disco when she no longer appears there.
|
4 vuotta sitten |
|
Vengeance11
|
3f6f0b552d
Spelling and grammar fixes I missed
|
4 vuotta sitten |
|
Vengeance11
|
2e19125b4c
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 vuotta sitten |
|
KevinSmarts
|
d6f01a58ed
[fixed] Wrong variable spotted by Julzor
|
4 vuotta sitten |
|
KevinSmarts
|
0e21c371f8
[fixed] Claified and corrected location setting for Anya's schedule and fixed apostrophe issue that Julzor spotted
|
4 vuotta sitten |
 rachels
|
28809b9014
remove duplicate code and fix the limit at 50
|
4 vuotta sitten |
|
Netuttki
|
a6012533a3
Merge remote-tracking branch 'upstream/master'
|
4 vuotta sitten |
|
KevinSmarts
|
cb4a0742fc
[fixed] Second image added to replace duplicate that was meant to be an mp4 but that file was corrupt.
|
4 vuotta sitten |
|
KevinSmarts
|
2f81df8c47
Merge remote-tracking branch 'rachels/master'
|
4 vuotta sitten |
|
KevinSmarts
|
dcb5e9cee3
[fixes] References to swimwear to include those from Sandalicious so you can swim in them and not escape the beaches in them through events anymore.
|
4 vuotta sitten |
|
rachels
|
66aff61d34
populate files with $clothingworntype 'beach'
|
4 vuotta sitten |
|
rachels
|
c11809cea2
fix copy paste bug
|
4 vuotta sitten |
|
Vengeance11
|
1543b13d00
Some spelling errors I missed
|
4 vuotta sitten |
|
rachels
|
4c8f107df2
check also the beachwear
|
4 vuotta sitten |
|
rachels
|
c350da9ede
use the most reliable way for the condition
|
4 vuotta sitten |
|
rachels
|
39a83344ae
apply function for counting swimwear
|
4 vuotta sitten |
|
rachels
|
6fca35928a
Add a function for counting of the available swimwear
|
4 vuotta sitten |
|
Netuttki
|
cc8c01b286
Merge remote-tracking branch 'upstream/master'
|
4 vuotta sitten |
|
KevinSmarts
|
94ccdf904f
Merge remote-tracking branch 'rachels/master'
|
4 vuotta sitten |
|
KevinSmarts
|
056c3789ba
[fixes] Wrong variable and bracket in wrong place (although that one is just for show).
|
4 vuotta sitten |
|
rachels
|
9e24e9ba94
Add a trigger so the event would be unique
|
4 vuotta sitten |
