Code

Rewrite bionic fuel system#61049

Code

Merged

Fris0uman merged 107 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Hirmuolio:tryfixHirmuolio/Cataclysm-DDA:tryfixCopy head branch name to clipboardSep 21, 2022

+875-1,125

Commits

Commits on Aug 28, 2022

• energy_consumption as energy

  Hirmuolio

  committed
  110597e

• units::energy fuel

  Hirmuolio

  committed
  1d26cec

• units::energy material

  Hirmuolio

  committed
  7ff3900

• item fuel adjustments

  Hirmuolio

  committed
  b409cbb

Commits on Aug 29, 2022

• bionuc reload window

  Hirmuolio

  committed
  8be3aa5

• bionic reload window

  Hirmuolio

  committed
  343c1c4

• typo

  Hirmuolio

  committed
  405f0c8

• bionic power from pedaling

  Hirmuolio

  committed
  2ea4806

Commits on Aug 30, 2022

• Merge branch 'CleverRaven:master' into veh-pow

  Hirmuolio

  authored
  a5afc1c

• adjust electric vehicle tests

  Hirmuolio

  committed
  e222815

• mods

  Hirmuolio

  committed
  9f0481c

• mods

  Hirmuolio

  committed
  d1373e6

• rename some variables

  Hirmuolio

  committed
  0e1e438

• cleanup

  Hirmuolio

  committed
  384c88c

• temp fix bionic

  Hirmuolio

  committed
  b52b0d1

• temp fix treshold

  Hirmuolio

  committed
  857d853

• fuel tests

  Hirmuolio

  committed
  0b22c93

• adjust mod

  Hirmuolio

  committed
  0b2cf40

• adjust mod

  Hirmuolio

  committed
  c9c4a7a

• adjust mod

  Hirmuolio

  committed
  eb61f53

• rename variable

  Hirmuolio

  committed
  b9b7be9

Commits on Aug 31, 2022

• gasoline json

  Hirmuolio

  committed
  c5d889a

• flags

  Hirmuolio

  committed
  1bc15db

• get fuels

  Hirmuolio

  committed
  91a78b8

• remote ups

  Hirmuolio

  committed
  bf38498

• veh and solar

  Hirmuolio

  committed
  871a544

• auto toggle

  Hirmuolio

  committed
  deb5ea1

• testing

  Hirmuolio

  committed
  3efd03a

• fueled bionic

  Hirmuolio

  committed
  d813f8e

• cable vehicle

  Hirmuolio

  committed
  15727e7

• cable solar

  Hirmuolio

  committed
  111faf5

• metaboilism

  Hirmuolio

  committed
  243e440

• solar

  Hirmuolio

  committed
  9e98002

• cleanup

  Hirmuolio

  committed
  6947c9f

• metaboilism messages

  Hirmuolio

  committed
  da84852

• remove old

  Hirmuolio

  committed
  a289fbc

• rename

  Hirmuolio

  committed
  9decc6e

• combine with passive

  Hirmuolio

  committed
  e695b07

• fuel in bionic window

  Hirmuolio

  committed
  9125c54

• remove fuel eating

  Hirmuolio

  committed
  edcb3da

• more tanks

  Hirmuolio

  committed
  8e30d32

• fix restriction

  Hirmuolio

  committed
  5b01e53

• fix restriction

  Hirmuolio

  committed
  2384f8f

• base test pocket

  Hirmuolio

  committed
  6899ceb

• material limit

  Hirmuolio

  committed
  d0a8af7

• doc

  Hirmuolio

  committed
  941ce83

• more items

  Hirmuolio

  committed
  1dbfc57

• fuel from container pockets

  Hirmuolio

  committed
  6abe068

• lint

  Hirmuolio

  committed
  d30c99d

Commits on Sep 1, 2022

• flat_set

  Hirmuolio

  committed
  a980127

• remove unused get_fuel_available

  Hirmuolio

  committed
  863b605

• remove unused

  Hirmuolio

  committed
  0fde7da

• remove unused

  Hirmuolio

  committed
  aace1c8

• remove unused

  Hirmuolio

  committed
  a295c15

• remove unused

  Hirmuolio

  committed
  ae2a7a7

• astyle and tests

  Hirmuolio

  committed
  52185fb

• migration

  Hirmuolio

  committed
  0e93d3b

• mods

  Hirmuolio

  committed
  237db1b

• broken npc code

  Hirmuolio

  committed
  90f8794

• remove autostart

  Hirmuolio

  committed
  7354245

• treshold improvements

  Hirmuolio

  committed
  964184d

• treshold for muscle

  Hirmuolio

  committed
  59da9fc

• improved treshold

  Hirmuolio

  committed
  5d7f27d

• add only missing

  Hirmuolio

  committed
  248d2e3

• remnants of fuel eating

  Hirmuolio

  committed
  d20df51

Commits on Sep 8, 2022

• Merge branch 'master' into biofuel2

  Hirmuolio

  authored
  3a3d7a6

• applies only to fueled

  Hirmuolio

  committed
  55766bd

Commits on Sep 9, 2022

• fuel consumption display

  Hirmuolio

  committed
  3c2747b

• unused

  Hirmuolio

  committed
  5faa981

• itype

  Hirmuolio

  committed
  cae55ca

• Merge branch 'master' into biofuel2

  Hirmuolio

  authored
  06ecb40

• rename

  Hirmuolio

  committed
  4f8af08

• carble connection fixes

  Hirmuolio

  committed
  d4996e0

Commits on Sep 15, 2022

• sort

  Hirmuolio

  committed
  26433e5

• tests

  Hirmuolio

  committed
  91b1bbc

• muscle check

  Hirmuolio

  committed
  54274b0

• astyle

  Hirmuolio

  committed
  fd75b9b

• comment

  Hirmuolio

  committed
  6c18283

• cable test

  Hirmuolio

  committed
  a1f3c19

• cable solar

  Hirmuolio

  committed
  6a6772e

• better test

  Hirmuolio

  committed
  c81752b

Commits on Sep 16, 2022

• sort

  Hirmuolio

  committed
  245b6e1

• better cables

  Hirmuolio

  committed
  e5c3f5d

• test empty battery

  Hirmuolio

  committed
  71fbf3f

• fix corpses being made out of "

  Hirmuolio

  committed
  eb6e69b

• name typo

  Show description for e785492
  

  Hirmuolio

  and

  Fris0uman

  authored
  e785492

• name typo

  Show description for 5912aea
  

  Hirmuolio

  and

  Fris0uman

  authored
  5912aea

• not npc usable now

  Hirmuolio

  committed
  4827c05

• fuel saving ui

  Hirmuolio

  committed
  386ebbb

• astyle

  Hirmuolio

  committed
  ba78ebe

• get fuels only when necessary

  Hirmuolio

  committed
  7c10709

• reorganize bionic functions

  Hirmuolio

  committed
  ddc201e

• Merge branch 'CleverRaven:master' into tryfix

  Hirmuolio

  authored
  b0b34e7

• fuel saving for cable

  Hirmuolio

  committed
  74796bd

• test for running out of fuel

  Hirmuolio

  committed
  f3de9d0

• fix running out of fuel

  Hirmuolio

  committed
  66e5e46

Commits on Sep 17, 2022

• fix test

  Hirmuolio

  committed
  5e8a44e

• may not count by charges

  Hirmuolio

  committed
  3f1fa35

• avoid warning

  Hirmuolio

  committed
  822fa4b

• test mod fix

  Hirmuolio

  committed
  1c65632

Commits on Sep 18, 2022

• clang

  Hirmuolio

  committed
  ab0d62f

• cleanup test

  Hirmuolio

  committed
  43e256d

• fuel_energy per unit

  Hirmuolio

  committed
  1eed4b3

• unnecessary comment

  Hirmuolio

  committed
  81eea05

Commits on Sep 19, 2022

• outdated vehicle code

  Hirmuolio

  committed
  429cbd3

• maybe fixes test

  Hirmuolio

  committed
  83b9b0e

• Merge branch 'CleverRaven:master' into tryfix

  Hirmuolio

  authored
  083ab88