Commits · ce3e12c9684d3a2c7c5e821bc87bc50f27e480da · macaronideath / fc-pregmod

Aug 29, 2020
- Merge branch 'pregmod-master' into 'pregmod-master' · ce3e12c9
  Pregmodder authored 4 years ago
  
  Move corp ledger to DOM See merge request pregmodfan/fc-pregmod!7583
  ce3e12c9
- Move corp ledger to DOM (and fix that startup error) · 9874b335
  svornost authored 4 years ago
  
  9874b335
- Merge branch 'pregmod-dev' into 'pregmod-master' · 6eb17a82
  Pregmodder authored 4 years ago
  
  out of order See merge request pregmodfan/fc-pregmod!7582
  6eb17a82
- out of order · 648e1887
  Pregmodder authored 4 years ago
  
  648e1887
- Merge branch 'pregmod-master' into 'pregmod-master' · 55d48074
  Pregmodder authored 4 years ago
  
  Cleanup See merge request pregmodfan/fc-pregmod!7580
  55d48074
- spelling · a32b643b
  svornost authored 4 years ago
  
  a32b643b
- Merge branch 'pregmod-dev' into 'pregmod-master' · 7fd73f92
  Pregmodder authored 4 years ago
  
  pregWeek suggestion Closes #1359 See merge request pregmodfan/fc-pregmod!7579
  7fd73f92
- missed a week · cee7d8b3
  Pregmodder authored 4 years ago
  
  cee7d8b3
- pregWeek suggestion · 848931bf
  Pregmodder authored 4 years ago
  
  848931bf
- A bit of cleanup for corporate.js. · 1bafc564
  svornost authored 4 years ago
  
  1bafc564
- Merge branch 'pregmod-dev' into 'pregmod-master' · 2f9e1a9e
  Pregmodder authored 4 years ago
  
  should be 60s See merge request pregmodfan/fc-pregmod!7578
  2f9e1a9e
- should be 60s · 19cf08ee
  Pregmodder authored 4 years ago
  
  19cf08ee
- Merge branch 'pregmod-master' into 'pregmod-master' · 3b5433bc
  Pregmodder authored 4 years ago
  
  Fix corp report punctuation problem Closes #2178 See merge request pregmodfan/fc-pregmod!7577
  3b5433bc
- fix duplicate closing tag · e0148170
  svornost authored 4 years ago
  
  e0148170
- Make message_endWeek_Slaves responsible for ending punctuation, and put the... · 7fae77f3
  svornost authored 4 years ago
  
  Make message_endWeek_Slaves responsible for ending punctuation, and put the punctuation in the right place (i.e. inside the span if appropriate).
  7fae77f3
- Remove unused function · 6809dc12
  svornost authored 4 years ago
  
  6809dc12
- Merge branch 'pregmod-dev' into 'pregmod-master' · 9600a7b0
  Pregmodder authored 4 years ago
  
  plug devoted old HG hole Closes #2186 See merge request pregmodfan/fc-pregmod!7576
  9600a7b0
- plug devoted old HG hole · e658965a
  Pregmodder authored 4 years ago
  
  e658965a
- Merge branch 'pregmod-dev' into 'pregmod-master' · 4fc0bc47
  Pregmodder authored 4 years ago
  
  Event condition updates Closes #2185 See merge request pregmodfan/fc-pregmod!7575
  4fc0bc47
- Event condition updates · e2e13bdc
  Pregmodder authored 4 years ago
  
  e2e13bdc
Aug 28, 2020
- Merge branch 'pregmod-master' into 'pregmod-master' · 6cb9ae78
  Pregmodder authored 4 years ago
  
  Add more slave sorting options Closes #2188 See merge request pregmodfan/fc-pregmod!7574
  6cb9ae78
- make health sorting actually sort by health, not condition · d3787ff0
  svornost authored 4 years ago
  
  d3787ff0
- Add slave sorting by health, weight, muscles, sex drive, and pregnancy. · 84b0a5c6
  svornost authored 4 years ago
  
  84b0a5c6
- Merge branch 'patch-1' into 'pregmod-master' · b72522bd
  Pregmodder authored 4 years ago
  
  Minor fixes/changes See merge request pregmodfan/fc-pregmod!7573
  b72522bd
- No double belly · 30e4da1c
  Anu authored 4 years ago
  
  30e4da1c
- Pronouns · e3604851
  Anu authored 4 years ago
  
  e3604851
- stomach > belly & it's > its · 095dc28d
  Anu authored 4 years ago
  
  095dc28d
- Fix "she 32 years old" · e504fb14
  Anu authored 4 years ago
  
  e504fb14
- Merge branch 'pregmod-dev' into 'pregmod-master' · 8ce6324a
  Pregmodder authored 4 years ago
  
  Fix erroneous to nursery birth comment. Closes #2184 See merge request pregmodfan/fc-pregmod!7572
  8ce6324a
- Fix erroneous to nursery birth comment. · 1b97b130
  Pregmodder authored 4 years ago
  
  1b97b130
- Merge branch 'pregmod-master' into 'pregmod-master' · 43ae449e
  Pregmodder authored 4 years ago
  
  Cleanup See merge request pregmodfan/fc-pregmod!7571
  43ae449e
- Tiredness does not affect productivity of restrained slaves. · 3213bd68
  svornost authored 4 years ago
  
  3213bd68
- Reduce the scope of slaveCost and make it const · ccd1cbfb
  svornost authored 4 years ago
  
  ccd1cbfb
- Further simplify hero slave purchasing, eliminate $specialSlave and $heroSlaveID globals. · 48a695d3
  svornost authored 4 years ago
  
  48a695d3
- Fix minimumSlaveCost JSDoc. · d1d22be1
  svornost authored 4 years ago
  
  d1d22be1
- Tiredness cleanup. $disableTiredness doesn't exist anymore. · 607ab317
  svornost authored 4 years ago
  
  607ab317
Aug 27, 2020
- Merge branch 'trade-menials' into 'pregmod-master' · 0d094bb6
  Pregmodder authored 4 years ago
  
  Trade menials See merge request pregmodfan/fc-pregmod!7570
  0d094bb6
- add simple transaction display · 3f3e99e8
  lowercasedonkey authored 4 years ago
  
  3f3e99e8
- whitespace · 2b577e41
  lowercasedonkey authored 4 years ago
  
  2b577e41
- Merge branch 'pregmod-dev' into 'pregmod-master' · c3041a62
  Pregmodder authored 4 years ago
  
  Finalize tiredness Closes #2182 See merge request pregmodfan/fc-pregmod!7541
  c3041a62