Commit History

Author SHA1 Message Date
  Kevin_Smarts 55ea3d8b45 Merge remote-tracking branch 'slanon/master' 3 years ago
  Kevin_Smarts d716916292 Merge remote-tracking branch 'hornguy6/master' 3 years ago
  Kevin_Smarts dbe603c8ca Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 3 years ago
  Kevin_Smarts aa2f1bfb76 Merge remote-tracking branch 'Gwen/master' 3 years ago
  slanon 6eeb70bd6b [fixes] other blank screen due to argument spelling 3 years ago
  slanon 270f74ec6b [fixes] blank screen due to argument spelling 3 years ago
  hornguy6 3fcbaf1fae [fixed] 'or' should have been an 'and' 3 years ago
  hornguy6 c26462c14c [changed] formatting and text edits 3 years ago
  hornguy6 a4e2f5a47d [fixed] missing clear actions 3 years ago
  hornguy6 5d4ec0b7da [changed] more variables and removed a text block I decided was unnecessary in the end 3 years ago
  hornguy6 377f124cbc [fixed] some missing calls and wrong variable names 3 years ago
  hornguy6 6ed6473105 [changed] updated npc generation parameters 3 years ago
  hornguy6 7a42de04b8 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  bgkjdgbizgblzdgbr 91a619c69e [fixed] Loosing relationship with the nerds instead of gaining it when joining their socialgroup. 3 years ago
  bgkjdgbizgblzdgbr edee870d95 [fixed] Missing charging money for a private show. 3 years ago
  rachels 54c2bec0ed fix the typo in the npccleanc and add the function to avoid error for the names with an apostrophe 3 years ago
  bgkjdgbizgblzdgbr a69f61a385 [fixed] So your stepfather will only join you in teh shower if you first seduced him. 3 years ago
  hornguy6 3fa07e9ea3 [added] time passage to events 3 years ago
  hornguy6 79629d796d [changed] forgot to apply re-write to one of the other options 3 years ago
  hornguy6 0169da9266 [changed] order of actions so "relax on your bed" is always in a consistent place 3 years ago
  Gwen c2d8e8eb50 [Fixed] the image call directories so now you can view uniforms and officewear at GM 3 years ago
  Gwen 2764d0e488 [Changed] change the image call directories for both missing pictures (and it will be added) 3 years ago
  Gwen b5b24360bb [Changed] move and rename book.jpg to 'reading_dressed' inside pc/activities/ 3 years ago
  hornguy6 9696bf580c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  hornguy6 39cff9090a [added] option in the shower to cry if you've been raped that day 3 years ago
  hornguy6 a007f80d28 [changed] end of fight rape 3 years ago
  hornguy6 eef68782cb [added] new option post rape to go straight to the police 3 years ago
  hornguy6 5e7125c63a [changed] rape event 3 years ago
  hornguy6 1698067656 [added] trigger for conversation with Anya about dildos in the shower 3 years ago
  hornguy6 d5eacec993 [added] reminder you have detention in the morning 3 years ago