Commits · f166f3b64084c61d06eb67dcde8c8110b843a562 · macaronideath / fc-pregmod

Dec 17, 2017
- fixes · f166f3b6
  Pregmodder authored 7 years ago
  
  f166f3b6
- Merge branch 'fixes' into 'pregmod-master' · b2ab6ec1
  Pregmodder authored 7 years ago
  
  Fixes See merge request pregmodfan/fc-pregmod!1156
  b2ab6ec1
- Undid bad changes · 6d702050
  kopareigns authored 7 years ago
  
  6d702050
- Updated old values and reversed some inequalities · dacf0f10
  kopareigns authored 7 years ago
  
  dacf0f10
- Missing sadism acquirement · de94e11a
  kopareigns authored 7 years ago
  
  de94e11a
- Corrected indexing variable · 8213e44c
  kopareigns authored 7 years ago
  
  8213e44c
- Merge branch 'typofix' into 'pregmod-master' · 6ca281aa
  Pregmodder authored 7 years ago
  
  Typo fixes See merge request !1153
  6ca281aa
Dec 16, 2017
- Update recETS.tw · 0128f070
  gheimhridh authored 7 years ago
  
  0128f070
- Merge branch 'pregmod-master' into 'pregmod-master' · 95bb9642
  Pregmodder authored 7 years ago
  
  Pregmod v1021-212 See merge request !1154
  95bb9642
- fixes and sneaking content. · 14b6db25
  Pregmodder authored 7 years ago
  
  14b6db25
- Typo fixes · 67810360
  gheimhridh authored 7 years ago
  
  67810360
- Merge branch 'pregmod-master' into 'pregmod-master' · 8d9f24e1
  Pregmodder authored 7 years ago
  
  Pregmod v1021-211 See merge request !1152
  8d9f24e1
- fixes · 17aa31cd
  Pregmodder authored 7 years ago
  
  17aa31cd
- Merge branch 'pregmod-master' into 'pregmod-master' · 617a22a9
  Pregmodder authored 7 years ago
  
  pregmod v1021-210 See merge request !1151
  617a22a9
- fixes · da28918f
  Pregmodder authored 7 years ago
  
  da28918f
Dec 15, 2017
- Merge branch 'pregmod-master' into 'pregmod-master' · 9d31e34b
  Pregmodder authored 7 years ago
  
  pregmod v1021-209 See merge request !1150
  9d31e34b
- small fixes · 9df5f5bf
  Pregmodder authored 7 years ago
  
  9df5f5bf
- Merge branch 'sfarmfix' into 'pregmod-master' · 6c4989d2
  Pregmodder authored 7 years ago
  
  Security Force Armoury upgrade fix See merge request !1149
  6c4989d2
- Security Force Armoury upgrade fix · 88fda0fa
  gheimhridh authored 7 years ago
  
  88fda0fa
- Merge branch 'SFMbtwfix' into 'pregmod-master' · 31c6694c
  Pregmodder authored 7 years ago
  
  SFMBarracks.tw fix See merge request !1148
  31c6694c
Dec 14, 2017
- SFMBarracks.tw fix · c12c792d
  gheimhridh authored 7 years ago
  
  c12c792d
- Merge branch 'pregmod-master' into 'pregmod-master' · b880b96c
  Pregmodder authored 7 years ago
  
  fix See merge request !1147
  b880b96c
- fix · 4d0daaba
  Pregmodder authored 7 years ago
  
  4d0daaba
- Merge branch 'pregmod-master' into 'pregmod-master' · b8fa2f03
  Pregmodder authored 7 years ago
  
  Pregmod v1021-208 See merge request !1146
  b8fa2f03
- fix · cff9ec06
  Pregmodder authored 7 years ago
  
  cff9ec06
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · bdb3e529
  Pregmodder authored 7 years ago
  
  bdb3e529
- saRules to the cellblock · 44397efb
  Pregmodder authored 7 years ago
  
  44397efb
- Merge branch 'pregmod-master' into 'pregmod-master' · 592e313e
  Pregmodder authored 7 years ago
  
  Refactored FS-token-unlocks See merge request !1143
  592e313e
- Merge branch 'pregmod-master' into 'pregmod-master' · d614371c
  Pregmodder authored 7 years ago
  
  fixing fucked up edicts See merge request !1145
  d614371c
- Merge branch 'fFeetfix' into 'pregmod-master' · fe63e277
  Pregmodder authored 7 years ago
  
  Fix See merge request !1144
  fe63e277
- fixing fucked up edicts · 012885d7
  hexall90 authored 7 years ago
  
  012885d7
- Fix · 30503246
  gheimhridh authored 7 years ago
  
  30503246
- Refactored FS-token-unlocks · bf023d5e
  Sotisi authored 7 years ago
  
  bf023d5e
- Merge branch 'srRtwfix' into 'pregmod-master' · b9b450a2
  Pregmodder authored 7 years ago
  
  Small rebellionReport.tw fix See merge request !1141
  b9b450a2
- Update rebellionReport.tw · 81bca0f7
  gheimhridh authored 7 years ago
  
  81bca0f7
Dec 13, 2017
- Small rebelionReport.tw fix · c8786ed9
  gheimhridh authored 7 years ago
  
  c8786ed9
- Merge branch 'pregmod-master' into 'pregmod-master' · 3f1aa0c7
  Pregmodder authored 7 years ago
  
  Pregmod v1021-207 See merge request !1140
  3f1aa0c7
- Rewrite · a2c319fb
  Pregmodder authored 7 years ago
  
  a2c319fb
- Merge branch 'pregmod-master' into 'pregmod-master' · 9c8cf72d
  Pregmodder authored 7 years ago
  
  Consolidated FSGotRepCredit-variables See merge request !1139
  9c8cf72d
- minor fix · cd55b5cd
  Sotisi authored 7 years ago
  
  cd55b5cd