Commits · ac58ad5fd5300761abc5442480f62177729155e9 · macaronideath / fc-pregmod

May 05, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · ac58ad5f
  Pregmodder authored 5 years ago
  
  Aphrodisiacs counter erectile dysfunction See merge request pregmodfan/fc-pregmod!4449
  ac58ad5f
- Aphrodisiacs counter erectile dysfunction · c02dce0b
  Pregmodder authored 5 years ago
  
  c02dce0b
- Merge branch 'when-madam-works-herself' into 'pregmod-master' · e4edc338
  Pregmodder authored 5 years ago
  
  Fix when madam works herself See merge request pregmodfan/fc-pregmod!4448
  e4edc338
- note for future · a654fed7
  lowercasedonkey authored 5 years ago
  
  a654fed7
- small text fix · 036b5239
  lowercasedonkey authored 5 years ago
  
  036b5239
- fix pronoun · 08b376c9
  lowercasedonkey authored 5 years ago
  
  08b376c9
- inform player of work oven with EWD off · cde586de
  lowercasedonkey authored 5 years ago
  
  cde586de
- Fix when madam works herself · e3b9e36c
  lowercasedonkey authored 5 years ago
  
  e3b9e36c
- Merge branch 'pregmod-dev' into 'pregmod-master' · 934ff313
  Pregmodder authored 5 years ago
  
  Added priapism agents and .chem clinic summary See merge request pregmodfan/fc-pregmod!4447
  934ff313
- tweak · 24082919
  Pregmodder authored 5 years ago
  
  24082919
- tweaks · 6a8a37ca
  Pregmodder authored 5 years ago
  
  6a8a37ca
- further tweaking · 16faacf8
  Pregmodder authored 5 years ago
  
  16faacf8
- tweak · b260bbb1
  Pregmodder authored 5 years ago
  
  b260bbb1
- Added priapism agents and .chem clinic summary · 40429a2a
  Pregmodder authored 5 years ago
  
  40429a2a
- Merge branch 'fix-story-caption-if-continue-hidden' into 'pregmod-master' · 5bceaa4e
  Pregmodder authored 5 years ago
  
  fix story caption if continue hidden Closes #718 See merge request pregmodfan/fc-pregmod!4445
  5bceaa4e
- fix story caption if continue hidden · 24ba8f99
  lowercasedonkey authored 5 years ago
  
  24ba8f99
May 04, 2019
- Merge branch 'dcoded-dev' into 'pregmod-master' · 99209cc1
  Pregmodder authored 5 years ago
  
  VectorArtJS linting See merge request pregmodfan/fc-pregmod!4435
  99209cc1
- Merge branch 'pregmod-dev' into 'pregmod-master' · 328e9d0a
  Pregmodder authored 5 years ago
  
  fixes Closes #715 See merge request pregmodfan/fc-pregmod!4443
  328e9d0a
- removed extra line · 71100beb
  Pregmodder authored 5 years ago
  
  71100beb
- fixes · 6a7a9e13
  Pregmodder authored 5 years ago
  
  6a7a9e13
- Merge branch 'fixes' into 'pregmod-master' · 5d799412
  Pregmodder authored 5 years ago
  
  generateMarketSlave fixes and cleanup See merge request pregmodfan/fc-pregmod!4416
  5d799412
- Comment formatting · 46e7252f
  DCoded authored 5 years ago
  
  46e7252f
- Master merge · ccc09c27
  DCoded authored 5 years ago
  
  ccc09c27
- Merge branch 'eslinter' into 'pregmod-master' · f436dc24
  Pregmodder authored 5 years ago
  
  Remove linebreak rule See merge request pregmodfan/fc-pregmod!4442
  f436dc24
- Merge branch 'StoryCaption_Tweaking-2.0' into 'pregmod-master' · 42d09324
  Pregmodder authored 5 years ago
  
  StoryCaption_Tweaking-2.0 0 See merge request pregmodfan/fc-pregmod!4433
  42d09324
- StoryCaption_Tweaking-2.0 0 · 30514a4b
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  30514a4b
- remove linebreak rule · 277fbbeb
  Skriv authored 5 years ago
  
  277fbbeb
- fix pronoun · f215da9c
  Skriv authored 5 years ago
  
  f215da9c
- More comment formatting · 074423c3
  DCoded authored 5 years ago
  
  074423c3
- Formatting fix · 87a1de6e
  DCoded authored 5 years ago
  
  87a1de6e
- Merge branch 'FixLogicIssuse' into 'pregmod-master' · f65eb4c2
  Pregmodder authored 5 years ago
  
  FixLogicIssuse See merge request pregmodfan/fc-pregmod!4441
  f65eb4c2
- FixLogicIssuse · 7a802d83
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  7a802d83
- More comment formatting · 8669ded1
  DCoded authored 5 years ago
  
  8669ded1
- Comment formatting and minor changes · 610f18b5
  DCoded authored 5 years ago
  
  610f18b5
- Reverted break change · 525fd22e
  DCoded authored 5 years ago
  
  525fd22e
- Minor text change · cac63152
  DCoded authored 5 years ago
  
  cac63152
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev · ade07cb9
  DCoded authored 5 years ago
  
  ade07cb9
- Formatting · 7133611a
  DCoded authored 5 years ago
  
  7133611a
- Merge branch 'alpha-update' into 'pregmod-master' · 1a7ac51c
  Pregmodder authored 5 years ago
  
  Alpha update See merge request pregmodfan/fc-pregmod!4440
  1a7ac51c
- Merge branch 'Fix-RES-sale-pronouns-if-images-are-off' into 'pregmod-master' · 3ba20019
  Pregmodder authored 5 years ago
  
  Fix RES sale pronouns if images are off Closes #712 See merge request pregmodfan/fc-pregmod!4439
  3ba20019