Commits · 5a895e4fc6e8d7cbc901011b7aee246a1aa69552 · macaronideath / fc-pregmod

Jul 20, 2020
- Merge branch 'pregmod-master' into 'pregmod-master' · 5a895e4f
  Pregmodder authored 4 years ago
  
  Fixes See merge request pregmodfan/fc-pregmod!7222
  5a895e4f
- RE Relative Recruiter fixes · c1ed37e7
  svornost authored 4 years ago
  
  c1ed37e7
- Fix condition grouping for nurse molestation event. · e16db597
  svornost authored 4 years ago
  
  e16db597
Jul 19, 2020
- Merge branch 'DJConversion' into 'pregmod-master' · 9ac39aa5
  Pregmodder authored 4 years ago
  
  Dj conversion (2/2) See merge request pregmodfan/fc-pregmod!7195
  9ac39aa5
- Dj conversion (2/2) · c697f5c6
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  c697f5c6
- Merge branch 'pregmod-dev' into 'pregmod-master' · dcf531c8
  Pregmodder authored 4 years ago
  
  Define canStand and canMove See merge request pregmodfan/fc-pregmod!7221
  dcf531c8
- Fix "raiding mercenaries" policy. · 2ca57f74
  svornost authored 4 years ago
  
  2ca57f74
- Define canStand and canMove · 57b271fc
  Pregmodder authored 4 years ago
  
  57b271fc
- Merge branch 'pregmod-dev' into 'pregmod-master' · 1911b6f2
  Pregmodder authored 4 years ago
  
  Missed passive impreg rolls + pen increment to Vchecks See merge request pregmodfan/fc-pregmod!7219
  1911b6f2
- Missed passive impreg rolls + pen increment to Vchecks · ba668543
  Pregmodder authored 4 years ago
  
  ba668543
- Merge branch 'JSification2' into 'pregmod-master' · b8c22017
  Pregmodder authored 4 years ago
  
  GidGud please See merge request pregmodfan/fc-pregmod!7218
  b8c22017
- Merge branch 'pregmod-master' into 'pregmod-master' · 77d15b7d
  Pregmodder authored 4 years ago
  
  Fixes See merge request pregmodfan/fc-pregmod!7215
  77d15b7d
- Merge branch 'Pair-fix' into 'pregmod-master' · fe7441b1
  Pregmodder authored 4 years ago
  
  Pair fix See merge request pregmodfan/fc-pregmod!7217
  fe7441b1
- Pair fix · 59d27038
  lowercasedonkey authored 4 years ago
  
  59d27038
- Suppository Resistance to JS · 7e55d8bc
  kopareigns authored 4 years ago
  
  7e55d8bc
Jul 18, 2020
- it's randomRelatedAvailableSlave, not randomAvailableRelatedSlave. · 9c8cf360
  svornost authored 4 years ago
  
  9c8cf360
- Fix $desc interpolation, add semicolon. · 948278f9
  svornost authored 4 years ago
  
  948278f9
- Merge branch 'fixes' into 'pregmod-master' · 5806943c
  Pregmodder authored 4 years ago
  
  Cockfeeder Resistance to JS 2: Electric Boogaloo See merge request pregmodfan/fc-pregmod!7214
  5806943c
- Updates · ce5aefd7
  kopareigns authored 4 years ago
  
  ce5aefd7
- Cockfeeder Resistance to JS · 87e0b4d4
  kopareigns authored 4 years ago
  
  87e0b4d4
- Merge branch 'fixes' into 'pregmod-master' · 987893b0
  Pregmodder authored 4 years ago
  
  minor fixup See merge request pregmodfan/fc-pregmod!7212
  987893b0
- whitespace · eddf9fbe
  Skriv authored 4 years ago
  
  eddf9fbe
- minor changes · 312d3057
  Skriv authored 4 years ago
  
  312d3057
- Merge branch 'pregmod-dev' into 'pregmod-master' · 55a8206e
  Pregmodder authored 4 years ago
  
  Name fix See merge request pregmodfan/fc-pregmod!7211
  55a8206e
- Name fix · 4cb1841f
  Pregmodder authored 4 years ago
  
  4cb1841f
- Merge branch 'pregmod-master' into 'pregmod-master' · c5729772
  Pregmodder authored 4 years ago
  
  Fix subslave humiliation fetish trigger & transfer See merge request pregmodfan/fc-pregmod!7210
  c5729772
- Fix subslave humiliation fetish trigger & transfer · 02334131
  svornost authored 4 years ago
  
  02334131
- Merge branch 'pregmod-dev' into 'pregmod-master' · b9611836
  Pregmodder authored 4 years ago
  
  spa tiredness feedback See merge request pregmodfan/fc-pregmod!7209
  b9611836
- spa tiredness feedback · 794c870e
  Pregmodder authored 4 years ago
  
  794c870e
- Merge branch 'pregmod-master' into 'pregmod-master' · 7932d1d6
  Pregmodder authored 4 years ago
  
  Fixes See merge request pregmodfan/fc-pregmod!7207
  7932d1d6
- Merge branch 'pregmod-dev' into 'pregmod-master' · c93a7984
  Pregmodder authored 4 years ago
  
  Increase spa tiredness gate See merge request pregmodfan/fc-pregmod!7208
  c93a7984
- Increase spa tiredness gate · 1c6b7c9b
  Pregmodder authored 4 years ago
  
  1c6b7c9b
- Merge branch 'docker' into 'pregmod-master' · 1e93f50d
  Pregmodder authored 4 years ago
  
  Added Dockerfile to compile and serve the game See merge request pregmodfan/fc-pregmod!7205
  1e93f50d
- Merge branch 'pregmod-master' into 'pregmod-master' · b6922437
  Pregmodder authored 4 years ago
  
  Fix extra = sign breaking no education corporation setting See merge request pregmodfan/fc-pregmod!7206
  b6922437
- Don't show smart bullet vibe setting if the slave doesn't have a smart bullet vibe. · a1824004
  svornost authored 4 years ago
  
  a1824004
- Fix extra = sign breaking no education corporation setting · 5179523b
  PandemoniumPenguin authored 4 years ago
  
  5179523b
- actually output the effects of illness in the weekly report instead of just silently killing slaves · 9caf356d
  svornost authored 4 years ago
  
  9caf356d
- Set timezone and debian noninteractive to avoid hang on buid · 0af59079
  derek authored 4 years ago
  
  0af59079
Jul 17, 2020
- Merge branch 'pregmod-dev' into 'pregmod-master' · c824855d
  Pregmodder authored 4 years ago
  
  Apply generateSalonModifications() See merge request pregmodfan/fc-pregmod!7204
  c824855d
- Apply generateSalonModifications() · 8ab4fc3d
  Pregmodder authored 4 years ago
  
  8ab4fc3d