Commits · d8e72ed9e3a535d4e9485e92d82928c1b962acdd · macaronideath / fc-pregmod

Sep 10, 2020
- Merge branch 'sec-fix' into 'pregmod-master' · d8e72ed9
  Pregmodder authored 4 years ago
  
  sec fix See merge request pregmodfan/fc-pregmod!7694
  d8e72ed9
- sec fix · 6d62679d
  lowercasedonkey authored 4 years ago
  
  6d62679d
- Merge branch 'market-fix' into 'pregmod-master' · 41979222
  Pregmodder authored 4 years ago
  
  do not jump to this Closes #2233 See merge request pregmodfan/fc-pregmod!7692
  41979222
- Merge branch 'fixes-for-restaff' into 'pregmod-master' · d28375f7
  Pregmodder authored 4 years ago
  
  TS fixes See merge request pregmodfan/fc-pregmod!7691
  d28375f7
- do not jump to this · e09b8b2b
  lowercasedonkey authored 4 years ago
  
  e09b8b2b
- small fixes · 2f9bc460
  lowercasedonkey authored 4 years ago
  
  2f9bc460
- Merge branch 'newslave' into 'pregmod-master' · 9dd1632a
  Pregmodder authored 4 years ago
  
  VCheck fix, change order of params Closes #2234 See merge request pregmodfan/fc-pregmod!7688
  9dd1632a
- ts fix · e3162ca5
  lowercasedonkey authored 4 years ago
  
  e3162ca5
Sep 09, 2020
- fix · 4d2dc564
  lowercasedonkey authored 4 years ago
  
  4d2dc564
- fixes · 393b730a
  lowercasedonkey authored 4 years ago
  
  393b730a
- reStaff · e5108307
  lowercasedonkey authored 4 years ago
  
  e5108307
- convert order of VCheck parameters · f9b00617
  lowercasedonkey authored 4 years ago
  
  f9b00617
- require slave to be defined · 2330d7a4
  lowercasedonkey authored 4 years ago
  
  2330d7a4
- fix pronouns in newSlave · fef7ba37
  lowercasedonkey authored 4 years ago
  
  fef7ba37
- Merge branch 'tabs' into 'pregmod-master' · 85d6dc72
  Pregmodder authored 4 years ago
  
  stray $ See merge request pregmodfan/fc-pregmod!7690
  85d6dc72
- stray $ · ea493561
  lowercasedonkey authored 4 years ago
  
  ea493561
- Merge branch 'pregmod-dev' into 'pregmod-master' · 176992c0
  Pregmodder authored 4 years ago
  
  clean reStaffedMorning.js See merge request pregmodfan/fc-pregmod!7689
  176992c0
- clean reStaffedMorning.js · 03ea8f01
  Pregmodder authored 4 years ago
  
  03ea8f01
- Merge branch 'fix-neighbor-market' into 'pregmod-master' · a384a705
  Pregmodder authored 4 years ago
  
  Fix neighbor market Closes #2236 See merge request pregmodfan/fc-pregmod!7687
  a384a705
- Merge branch 'hair-to-data' into 'pregmod-master' · c115e5e8
  Pregmodder authored 4 years ago
  
  Hair to data See merge request pregmodfan/fc-pregmod!7686
  c115e5e8
- fix price · 839bb6c3
  lowercasedonkey authored 4 years ago
  
  839bb6c3
- bold display · 03fe50b2
  lowercasedonkey authored 4 years ago
  
  03fe50b2
- whitespace · ec10b6c3
  lowercasedonkey authored 4 years ago
  
  ec10b6c3
- use data for colors too · effee9c6
  lowercasedonkey authored 4 years ago
  
  effee9c6
- improve layout and check · eea0cf61
  lowercasedonkey authored 4 years ago
  
  eea0cf61
- cut hair when RA runs if switching to a short haircut · 12abe620
  lowercasedonkey authored 4 years ago
  
  12abe620
- more RA to use data for hair · c2998d79
  lowercasedonkey authored 4 years ago
  
  c2998d79
- fix bad data · cedd32b0
  lowercasedonkey authored 4 years ago
  
  cedd32b0
- Merge branch 'SecExp-QOL' into 'pregmod-master' · 6ad4b42a
  Pregmodder authored 4 years ago
  
  SecExp-Fixes-QOL 1/2 Closes #2228, #2229, #1436, and #1431 See merge request pregmodfan/fc-pregmod!7669
  6ad4b42a
- SecExp-Fixes-QOL 1/2 · 30dd938b
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  30dd938b
- Merge branch 'undercut' into 'pregmod-master' · 81eab07a
  Pregmodder authored 4 years ago
  
  Undercuts See merge request pregmodfan/fc-pregmod!7683
  81eab07a
- Adds undercut · 32daff4a
  turnop authored 4 years ago
  
  32daff4a
- Adds undercut. · 85318e39
  turnop authored 4 years ago
  
  85318e39
- Adds undercut · 46846f1f
  turnop authored 4 years ago
  
  46846f1f
- Update slaveMods.js · 4c46538c
  turnop authored 4 years ago
  
  4c46538c
- Merge branch 'pregmod-master' into 'pregmod-master' · 64cd0500
  Pregmodder authored 4 years ago
  
  FSChange does not return a string Closes #2232 See merge request pregmodfan/fc-pregmod!7682
  64cd0500
Sep 08, 2020
- Don't sometimes return a string from FSChange, and don't treat it as if it does. · 88021b81
  svornost authored 4 years ago
  
  88021b81
- Merge branch 'prisonCrime' into 'pregmod-master' · f680dfe5
  Pregmodder authored 4 years ago
  
  remove global prisonCrime See merge request pregmodfan/fc-pregmod!7681
  f680dfe5
- embeded pronouns · 21a89994
  lowercasedonkey authored 4 years ago
  
  21a89994
- remove global prisonCrime · 4b551013
  lowercasedonkey authored 4 years ago
  
  4b551013