Commits · 5b6e137cc74dec5ac2b98c022aef23c1fd66b858 · macaronideath / fc-pregmod

Sep 06, 2019
- Merge branch 'matron-bc' into 'pregmod-master' · 5b6e137c
  Pregmodder authored 5 years ago
  
  Matron fix Closes #1051 See merge request pregmodfan/fc-pregmod!5295
  5b6e137c
- fixes · a70ade61
  lowercasedonkey authored 5 years ago
  
  a70ade61
- Merge branch 'shelter-inspec-array' into 'pregmod-master' · 69f295bd
  Pregmodder authored 5 years ago
  
  Shelter inspec See merge request pregmodfan/fc-pregmod!5293
  69f295bd
- fix · f8e9b648
  lowercasedonkey authored 5 years ago
  
  f8e9b648
- fix devotion check · 8882a78c
  lowercasedonkey authored 5 years ago
  
  8882a78c
- whitespace · ed90b8d5
  lowercasedonkey authored 5 years ago
  
  ed90b8d5
Sep 05, 2019
- Merge branch 'fix-pubicHStyle' into 'pregmod-master' · b428cab6
  Pregmodder authored 5 years ago
  
  Fix bug showing pubicHStyle for bald and hairless See merge request pregmodfan/fc-pregmod!5292
  b428cab6
- Merge branch 'SF-Redesign' into 'pregmod-master' · 29d2b7ff
  Pregmodder authored 5 years ago
  
  SF-Redesign See merge request pregmodfan/fc-pregmod!5291
  29d2b7ff
- SF-Redesign · e8db2c4f
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  e8db2c4f
- Fix bug showing pubicHStyle for bald and hairless · 642f3a06
  _no0neman authored 5 years ago
  
  642f3a06
Sep 04, 2019
- never reached · b7ef8234
  lowercasedonkey authored 5 years ago
  
  b7ef8234
Sep 03, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · 1322ab89
  Pregmodder authored 5 years ago
  
  beauty law tweaks See merge request pregmodfan/fc-pregmod!5290
  1322ab89
- correction · f3074cc6
  Pregmodder authored 5 years ago
  
  f3074cc6
- beauty law tweaks · c71b6768
  Pregmodder authored 5 years ago
  
  c71b6768
- Merge branch 'pregmod-dev' into 'pregmod-master' · dd5b4834
  Pregmodder authored 5 years ago
  
  Education taste changes + gender fund law 2 revision See merge request pregmodfan/fc-pregmod!5289
  dd5b4834
- Education taste changes + gender fund law 2 revision · e2d75a88
  Pregmodder authored 5 years ago
  
  e2d75a88
- Added missed lb to pCitizensAndCivilians.tw · 760c7287
  Pregmodder authored 5 years ago
  
  fixes #1050
  760c7287
- Merge branch 'endWeekFix' into 'pregmod-master' · 4c0191a8
  Pregmodder authored 5 years ago
  
  endWeekFix Closes #1048 See merge request pregmodfan/fc-pregmod!5288
  4c0191a8
- endWeekFix · baf2f991
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  baf2f991
Sep 02, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · f639f965
  Pregmodder authored 5 years ago
  
  FS work See merge request pregmodfan/fc-pregmod!5287
  f639f965
- FS work · b92184d0
  Pregmodder authored 5 years ago
  
  b92184d0
- Merge branch 'patch-7' into 'pregmod-master' · 0b477436
  Pregmodder authored 5 years ago
  
  Repopulationist hookup expansion See merge request pregmodfan/fc-pregmod!5286
  0b477436
- Update reCitizenHookup.tw · f5661986
  Anu authored 5 years ago
  
  f5661986
- Update reCitizenHookup.tw · e87cdad7
  Anu authored 5 years ago
  
  e87cdad7
- Update reCitizenHookup.tw · e468e307
  Anu authored 5 years ago
  
  e468e307
- Update reCitizenHookup.tw · 6c63b541
  Anu authored 5 years ago
  
  6c63b541
- Update reCitizenHookup.tw · 12613324
  Anu authored 5 years ago
  
  12613324
Sep 01, 2019
- Update reCitizenHookup.tw · f0ff9d4f
  Anu authored 5 years ago
  
  f0ff9d4f
- Update reCitizenHookup.tw · 5f810a10
  Anu authored 5 years ago
  
  5f810a10
- Update reCitizenHookup.tw · 49cb2228
  Anu authored 5 years ago
  
  49cb2228
- Merge branch 'works' into 'pregmod-master' · 48191257
  Pregmodder authored 5 years ago
  
  Limbs / Amputee Work See merge request pregmodfan/fc-pregmod!5125
  48191257
Aug 31, 2019
- Merge branch 'pregmod-master' into 'pregmod-master' · f133db6f
  Pregmodder authored 5 years ago
  
  in arcmgmt, nicaeaFocus should be owners, not slaveowners See merge request pregmodfan/fc-pregmod!5284
  f133db6f
- Merge branch 'evac-facility-refactor' into 'pregmod-master' · c2655654
  Pregmodder authored 5 years ago
  
  Refactor "remove all slaves" fragments See merge request pregmodfan/fc-pregmod!5285
  c2655654
- Refactor "remove all slaves" fragments · fe169b04
  ezsh authored 5 years ago
  
  Introduce a widget and a function to do the work and use them in facility passages.
  fe169b04
- in arcmgmt, nicaeaFocus should be owners, not slaveowners · c01ae4fd
  mweggen authored 5 years ago
  
  c01ae4fd
- Merge branch 'fix-evac-all' into 'pregmod-master' · 74a3eb9a
  Pregmodder authored 5 years ago
  
  fix evac all Closes #1042 See merge request pregmodfan/fc-pregmod!5283
  74a3eb9a
- fix evac all · d36655c8
  lowercasedonkey authored 5 years ago
  
  d36655c8
Aug 30, 2019

Merge branch 'issue-1040' into 'pregmod-master' · 634d423f
Pregmodder authored 5 years ago
```
Issue 1040

Closes #1040

See merge request pregmodfan/fc-pregmod!5282
```
634d423f
Add employeesIds to the base job class · 38ab062a
ezsh authored 5 years ago
```
...and make it function as its sisters are (was a property).
```
38ab062a

ezsh authored 5 years ago

The getHostedSlaves property must work even if facility does not have
jobs (e.g. armory). In this case we return 0.

Fixes #1040.

07658d96