Commits · f97b661e2cf079b79515197b05ac00eb9db284d2 · pregmodfan / fc-pregmod

May 06, 2020
- Update seBirthWidgets.tw · f97b661e
  Transhumanist01 authored 4 years ago
  
  f97b661e
May 05, 2020
- Merge branch 'issue-1774' into 'pregmod-master' · 9f2583e9
  Pregmodder authored 4 years ago
  
  Fix permuted names for the attraction in slave summary. Closes #1774 See merge request !6754
  9f2583e9
- Fix permuted names for the attraction in slave summary. · fe3852d8
  ezsh authored 4 years ago
  
  Closes #1774.
  fe3852d8
- Merge branch 'pregmod-dev' into 'pregmod-master' · bb5d07b8
  Pregmodder authored 4 years ago
  
  servant tiredness See merge request !6753
  bb5d07b8
- servant tiredness · ba265811
  Pregmodder authored 4 years ago
  
  ba265811
- Merge branch 'si' into 'pregmod-master' · dfc0daf6
  Pregmodder authored 4 years ago
  
  Finish converting "work" tab of slaveInteract See merge request !6752
  dfc0daf6
- fixes from autoformat · d8b1a4d2
  lowercasedonkey authored 4 years ago
  
  d8b1a4d2
- cleanup · 15f11e97
  lowercasedonkey authored 4 years ago
  
  15f11e97
- fix transfers · 7c2f3631
  lowercasedonkey authored 4 years ago
  
  7c2f3631
- Finish work tab · cb20aa6a
  lowercasedonkey authored 4 years ago
  
  cb20aa6a
May 04, 2020
- Merge branch 'theOneThatEscaped' into 'pregmod-master' · ddc0a866
  Pregmodder authored 4 years ago
  
  Minor fixes Closes #1771 See merge request !6751
  ddc0a866
- Minor fixes · a8003b40
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  a8003b40
- Update fc-version.js · 43c351c1
  Pregmodder authored 4 years ago
  
  43c351c1
- Merge branch 'pregmod-dev' into 'pregmod-master' · ebf2c908
  Pregmodder authored 4 years ago
  
  Pregmod v3.5.0 See merge request pregmodfan/fc-pregmod!6749
  ebf2c908
- Pregmod v3.5.0 · a920a7c9
  Pregmodder authored 4 years ago
  
  a920a7c9
- Merge branch 'pregmod-master' into 'pregmod-master' · bc3f4e56
  Pregmodder authored 4 years ago
  
  Fix a few string interpolation errors in Waistline Woes See merge request pregmodfan/fc-pregmod!6748
  bc3f4e56
- $he · 2873747c
  svornost authored 4 years ago
  
  2873747c
- Fix a few string interpolation errors · a4c7f1ae
  svornost authored 4 years ago
  
  a4c7f1ae
May 03, 2020
- Merge branch 'policiesObject' into 'pregmod-master' · 25b1385e
  Pregmodder authored 4 years ago
  
  Policies object [Ready for merge review] See merge request pregmodfan/fc-pregmod!6565
  25b1385e
- Policies object [Ready for merge review] · 35b9eb60
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  35b9eb60
- Merge branch 'issue-1767' into 'pregmod-master' · cc30f5ec
  Pregmodder authored 4 years ago
  
  Change removeJob() to handle null slaves as well Closes #1767 See merge request pregmodfan/fc-pregmod!6747
  cc30f5ec
- Change removeJob() to handle null slaves as well · 8c3ae536
  ezsh authored 4 years ago
  
  Migrating from special objects to ID, we replace absent special slaves with null values instead of 0. Therefore removeJob() has to handle the general case (!slave). Fixes #1767.
  8c3ae536
- Merge branch 'cheat-start' into 'pregmod-master' · 7e0ef823
  Pregmodder authored 4 years ago
  
  Fix datalookup for HG etc on cheatstart Closes #1766 See merge request pregmodfan/fc-pregmod!6746
  7e0ef823
- fix datalookup for HG · 0752bb3c
  lowercasedonkey authored 4 years ago
  
  0752bb3c
- whitespace · 5725db03
  lowercasedonkey authored 4 years ago
  
  5725db03
- Merge branch 'pregmod-dev' into 'pregmod-master' · afe2ca96
  Pregmodder authored 4 years ago
  
  sell slave variant See merge request pregmodfan/fc-pregmod!6745
  afe2ca96
- sell slave variant · 58ebd9d5
  Pregmodder authored 4 years ago
  
  58ebd9d5
- Merge branch 'husk' into 'pregmod-master' · 5c656535
  Pregmodder authored 4 years ago
  
  revert $AS change in husk slave swap Closes #1765 See merge request pregmodfan/fc-pregmod!6744
  5c656535
- revert $AS change in husk slave swap · d6c0cfc6
  lowercasedonkey authored 4 years ago
  
  d6c0cfc6
May 02, 2020
- Merge branch 'specials-proxy' into 'pregmod-master' · 0cc30de0
  Pregmodder authored 4 years ago
  
  Migrate Spa attendant game variable to ID See merge request pregmodfan/fc-pregmod!6731
  0cc30de0
- Migrate Spa attendant game variable to ID · 2f11c23f
  ezsh authored 4 years ago
  
  2f11c23f
- Merge branch 'correct-cashX-category' into 'pregmod-master' · c19bcb79
  Pregmodder authored 4 years ago
  
  correct cashX category See merge request pregmodfan/fc-pregmod!6743
  c19bcb79
- correct cashX category · 2dad4fff
  lowercasedonkey authored 4 years ago
  
  2dad4fff
- Merge branch 'generalFixes' into 'pregmod-master' · d3bb4b6f
  Pregmodder authored 4 years ago
  
  generalFixes Closes #1764 See merge request pregmodfan/fc-pregmod!6742
  d3bb4b6f
- generalFixes · e0fe4145
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  e0fe4145
May 01, 2020
- Merge branch 'SF-minorTweaking' into 'pregmod-master' · b474be78
  Pregmodder authored 4 years ago
  
  SF-minorTweaking See merge request pregmodfan/fc-pregmod!6741
  b474be78
- Inital commit · fe984ca3
  Blank authored 4 years ago
  
  fe984ca3
- Merge branch 'options' into 'pregmod-master' · 68c5c565
  Pregmodder authored 4 years ago
  
  mor eoptions converting See merge request pregmodfan/fc-pregmod!6739
  68c5c565
- Merge branch 'eslint' into 'pregmod-master' · 0b623523
  Pregmodder authored 4 years ago
  
  Eslint tweaks. See merge request pregmodfan/fc-pregmod!6740
  0b623523
- semi · 43bd6bed
  lowercasedonkey authored 4 years ago
  
  43bd6bed