Commits · e9741b56c694a6d681911613cbb1f9fe0573f277 · macaronideath / fc-pregmod

Jan 29, 2020
- Merge branch 'fixes' into 'pregmod-master' · e9741b56
  Pregmodder authored 5 years ago
  
  Fix subordinate slave targeting Closes #1370 See merge request pregmodfan/fc-pregmod!5962
  e9741b56
- Fix subordinate slave targeting · cecde24f
  svornost authored 5 years ago
  
  cecde24f
- Merge branch 'fixes' into 'pregmod-master' · 354a0c99
  Pregmodder authored 5 years ago
  
  Agent removal fixes See merge request pregmodfan/fc-pregmod!5961
  354a0c99
- Get rid of the Agent Retrieve redirect page and just strip her job directly from Neighbor Interact. · e7a56f38
  svornost authored 5 years ago
  
  e7a56f38
- When an agent is removed from somewhere other than the diplomacy page, reset... · 85b07c32
  svornost authored 5 years ago
  
  When an agent is removed from somewhere other than the diplomacy page, reset the correct arcology's government.
  85b07c32
Jan 28, 2020
- Merge branch 'replace' into 'pregmod-master' · c2d816c8
  Pregmodder authored 5 years ago
  
  use App.UI.replace() See merge request pregmodfan/fc-pregmod!5959
  c2d816c8
- improve replace in limb amputation · 7fdfa542
  Arkerthan authored 5 years ago
  
  7fdfa542
- make reminder clear faster · 32aadac4
  Arkerthan authored 5 years ago
  
  32aadac4
- Merge branch 'Health-tweaks' into 'pregmod-master' · e87053bc
  Pregmodder authored 5 years ago
  
  Health tweaks See merge request pregmodfan/fc-pregmod!5912
  e87053bc
- Yes, again · 342776af
  Jones authored 5 years ago
  
  342776af
- Tweaks · 0655cc61
  Jones authored 5 years ago
  
  0655cc61
- updateHealth function · b97dbd8b
  Jones authored 5 years ago
  
  b97dbd8b
- health tweaks · 976a171c
  Jones authored 5 years ago
  
  976a171c
- Merge branch 'migrate-static-data' into 'pregmod-master' · f19cdb4e
  Pregmodder authored 5 years ago
  
  Migrate static data declarations to JS See merge request pregmodfan/fc-pregmod!5924
  f19cdb4e
- health tweaks · b46a4626
  Jones authored 5 years ago
  
  b46a4626
- Merge branch 'pregmod-master' into Health-tweaks · 88e45c5d
  Jones authored 5 years ago
  
  88e45c5d
- Merge branch 'pronouns-for-walkpast' into 'pregmod-master' · fd0d899a
  Pregmodder authored 5 years ago
  
  Pronoun fix for walkpast See merge request pregmodfan/fc-pregmod!5956
  fd0d899a
- Merge branch 'pregmod-master' into 'pregmod-master' · 61056227
  Pregmodder authored 5 years ago
  
  Don't test $activeSlave during week end Closes #1367 See merge request pregmodfan/fc-pregmod!5957
  61056227
- more bad checks of activeSlave · 0c305d9c
  svornost authored 5 years ago
  
  0c305d9c
- well, seems like that's a pretty common mistake...fix a whole load of those · 4fa3f54b
  svornost authored 5 years ago
  
  4fa3f54b
- Merge branch 'pregmod-master' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-master · 1efd3344
  svornost authored 5 years ago
  
  1efd3344
- Don't test $activeSlave during week end. · 4b33953a
  svornost authored 5 years ago
  
  4b33953a
- Pronoun fix for walkpast · b1883b4a
  lowercasedonkey authored 5 years ago
  
  b1883b4a
- Merge branch 'pregmod-dev' into 'pregmod-master' · cdc462ac
  Pregmodder authored 5 years ago
  
  lost classes line See merge request pregmodfan/fc-pregmod!5955
  cdc462ac
- lost classes line · 8709943d
  Pregmodder authored 5 years ago
  
  8709943d
Jan 27, 2020
- Merge branch 'pregmod-dev' into 'pregmod-master' · f659b0d5
  Pregmodder authored 5 years ago
  
  fixes See merge request pregmodfan/fc-pregmod!5954
  f659b0d5
- fixes · f3393ff3
  Pregmodder authored 5 years ago
  
  f3393ff3
- Merge branch 'reminder' into 'pregmod-master' · 2aec81f8
  Pregmodder authored 5 years ago
  
  make reminder sytem more robust See merge request pregmodfan/fc-pregmod!5953
  2aec81f8
- Merge branch 'preview' into 'pregmod-master' · a6bc22e3
  Pregmodder authored 5 years ago
  
  Remove bad preview check in saGetMilked See merge request pregmodfan/fc-pregmod!5952
  a6bc22e3
- make reminder sytem more robust · b76225be
  Arkerthan authored 5 years ago
  
  b76225be
- remove bad preview check · 4e2f32e5
  lowercasedonkey authored 5 years ago
  
  4e2f32e5
- Merge branch 'reminder' into 'pregmod-master' · 095d2dc6
  Pregmodder authored 5 years ago
  
  rework reminder system See merge request pregmodfan/fc-pregmod!5951
  095d2dc6
- Merge branch 'incubator' into 'pregmod-master' · 9e0fbf3e
  Pregmodder authored 5 years ago
  
  improve incubator organ UI Closes #1349 See merge request pregmodfan/fc-pregmod!5950
  9e0fbf3e
- rework reminder system · 052bc293
  Arkerthan authored 5 years ago
  
  052bc293
- Update descriptionWidgets.js · e151a810
  Jones authored 5 years ago
  
  e151a810
- Untangling condition and shortDamage · 0ec60817
  Jones authored 5 years ago
  
  0ec60817
- improve incubator organ UI · b77888ec
  Arkerthan authored 5 years ago
  
  b77888ec
- spa clinic entry conditions · 08dbf9a1
  Jones authored 5 years ago
  
  08dbf9a1
- Merge branch 'pregmod-master' into Health-tweaks · c49650f1
  Jones authored 5 years ago
  
  c49650f1
- Merge branch 'pregmod-dev' into 'pregmod-master' · 80ad3122
  Pregmodder authored 5 years ago
  
  Fixes + encyclopedia stuff See merge request pregmodfan/fc-pregmod!5949
  80ad3122