Commits · b1aa933193137d7dc01fa2f1fbf6790203d0f9c4 · macaronideath / fc-pregmod

Apr 30, 2019
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into incubator · b1aa9331
  klorpa authored 5 years ago
  
  b1aa9331
- LawFix · 190eb94c
  klorpa authored 5 years ago
  
  190eb94c
- Merge branch 'SF_Fixes' into 'pregmod-master' · cadd8405
  Pregmodder authored 5 years ago
  
  SF_Fixes See merge request pregmodfan/fc-pregmod!4398
  cadd8405
- SF_Fixes · 8551697d
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  8551697d
- Merge branch 'patch-6' into 'pregmod-master' · 166a7081
  Pregmodder authored 5 years ago
  
  Fixed bugs See merge request pregmodfan/fc-pregmod!4400
  166a7081
- Merge branch 'patch-7' into 'pregmod-master' · d35b258d
  Pregmodder authored 5 years ago
  
  Fixed bugs to make it game-ready See merge request pregmodfan/fc-pregmod!4401
  d35b258d
- Fixed bugs to make it game-ready · 0ae85e3e
  Sonofrevvan authored 5 years ago
  
  0ae85e3e
- Fixed bugs · 865cda7d
  Sonofrevvan authored 5 years ago
  
  865cda7d
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into incubator · 5733d1a9
  klorpa authored 5 years ago
  
  5733d1a9
- BossWoman · 1da3e305
  klorpa authored 5 years ago
  
  1da3e305
- Fixed generateMarketSlave.js tattoo pronouns, maybe · e2194f7c
  Pregmodder authored 5 years ago
  
  @Skriv For twine to manage the pronouns in strings properly, it has to actually recognize what it is being given.
  e2194f7c
- Set player pronoun for reRecruit.tw · 4a9a3d0b
  Pregmodder authored 5 years ago
  
  4a9a3d0b
- Merge branch 'SF_InitFix_II' into 'pregmod-master' · 157fffb5
  Pregmodder authored 5 years ago
  
  SF_InitFix_II See merge request pregmodfan/fc-pregmod!4396
  157fffb5
- SF_InitFix_II · 5e967839
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  5e967839
- Merge branch 'economy-tweak' into 'pregmod-master' · a76091a0
  Pregmodder authored 5 years ago
  
  Why did I ever pass the slave array as an arg See merge request pregmodfan/fc-pregmod!4395
  a76091a0
- even simplier · b0ff7888
  lowercasedonkey authored 5 years ago
  
  b0ff7888
- why did I ever pass the slave array as an arg · ff5d6b4b
  lowercasedonkey authored 5 years ago
  
  ff5d6b4b
- Merge branch 'incubator' into 'pregmod-master' · e1e5219f
  Pregmodder authored 5 years ago
  
  Description Options Bug Fix See merge request pregmodfan/fc-pregmod!4394
  e1e5219f
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into incubator · 185a417b
  klorpa authored 5 years ago
  
  185a417b
- WeekSpaces · a8c83690
  klorpa authored 5 years ago
  
  a8c83690
- Merge branch 'fix-schoolroom-filter' into 'pregmod-master' · 707c27b7
  Pregmodder authored 5 years ago
  
  Fix schoolroom filter Closes #697 See merge request pregmodfan/fc-pregmod!4392
  707c27b7
- Merge branch 'SF_InitFix' into 'pregmod-master' · d84c6e18
  Pregmodder authored 5 years ago
  
  SF_InitFix Closes #699 See merge request pregmodfan/fc-pregmod!4393
  d84c6e18
- SF_InitFix · a2bcf0de
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  a2bcf0de
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into incubator · 65c788dc
  klorpa authored 5 years ago
  
  65c788dc
- OptionFix · ab01756a
  klorpa authored 5 years ago
  
  ab01756a
- Fix bug by making things explicit where they are · 8e1f41ec
  lowercasedonkey authored 5 years ago
  
  8e1f41ec
- Now fuckdoll checks only for new slaves, eslint · 1a6a7c9e
  lowercasedonkey authored 5 years ago
  
  1a6a7c9e
- Improve clinic and spa readability and logic · 31b8afc0
  lowercasedonkey authored 5 years ago
  
  31b8afc0
- Apply checks to transfer in schoolroom · 5a0bf0c4
  lowercasedonkey authored 5 years ago
  
  5a0bf0c4
Apr 29, 2019
- Merge branch 'refactor' into 'pregmod-master' · cb3dc078
  Pregmodder authored 5 years ago
  
  Refactor EconomyJS See merge request pregmodfan/fc-pregmod!4369
  cb3dc078
- Merge branch 'eslintx' into 'pregmod-master' · a34bb89b
  Pregmodder authored 5 years ago
  
  Yet more eslint rules See merge request pregmodfan/fc-pregmod!4390
  a34bb89b
- Merge branch 'SF_SeeHyperPregCheck' into 'pregmod-master' · 4e7e1002
  Pregmodder authored 5 years ago
  
  SF_SeeHyperPregCheck + minor clean up. See merge request pregmodfan/fc-pregmod!4389
  4e7e1002
- SF_SeeHyperPregCheck + minor clean up. · 945e2c94
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  945e2c94
- master merge · c2b0ec4c
  Skriv authored 5 years ago
  
  c2b0ec4c
- revert from master · e7bf925f
  Skriv authored 5 years ago
  
  e7bf925f
- more rules · 3cb445bd
  Skriv authored 5 years ago
  
  3cb445bd
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod · a6dcba4b
  Skriv authored 5 years ago
  
  a6dcba4b
- Merge branch 'pregmod-dev' into 'pregmod-master' · cd6c7a38
  Pregmodder authored 5 years ago
  
  Added toggle for clothing erection bulge art See merge request pregmodfan/fc-pregmod!4388
  cd6c7a38
- Merge branch 'pregmod-master' into 'pregmod-dev' · bc7822c4
  Pregmodder authored 5 years ago
  
  # Conflicts: # src/art/vector/VectorArtJS.js
  bc7822c4
- Added toggle for clothing erection bulge art · ae7760d8
  Pregmodder authored 5 years ago
  
  ae7760d8