Yesterday
merge from max_hp -> hackweek_modding_improvements