Make purifying water take a reasonable amount of time#39973

Closed

SkuliAdams wants to merge 24 commits intoCleverRaven:masterfrom SkuliAdams:purifier_fix_2

+108-2

Commits on Apr 20, 2020

Basic code for water purifier activity
SkuliAdams
committed
Finished making purification scale with time
SkuliAdams
committed

Commits on Apr 26, 2020

Added purification_factor as property and make purifying water scale properly.
SkuliAdams
committed

Commits on Apr 27, 2020

Updated JSON_INFO.md
SkuliAdams
committed
Remove unneeded line
SkuliAdams
committed
Fixed bug where canceling activity still cleans water
SkuliAdams
committed
Add new variable to serialize functions and astyle
SkuliAdams
committed
Merge branch 'master' into purifier_fix_2
SkuliAdams
committed

Commits on Apr 28, 2020

Removed another unneeded line
SkuliAdams
committed
Various corrections
SkuliAdams
committed
Update src/activity_actor.cpp

SkuliAdams
and
ifreund
authored
Another fix
SkuliAdams
committed
Merge branch 'purifier_fix_2' of https://github.com/SkuliAdams/Cataclysm-DDA into purifier_fix_2
SkuliAdams
committed

Commits on May 5, 2020

Merge branch 'master' into purifier_fix_2
SkuliAdams
authored

Commits on Jun 10, 2020

Merge branch 'master' into purifier_fix_2
ZhilkinSerg
authored

Commits on Jun 30, 2020

Merge branch 'master' into purifier_fix_2
ZhilkinSerg
authored

Commits on Jul 28, 2020

Commits on Aug 17, 2020

Merge branch 'master' into purifier_fix_2
ZhilkinSerg
authored

Commits on Aug 19, 2020

Commits on Aug 26, 2020