Missing spawn and minor typo fixes
tweak and recipes for accessories
oops
oversight
resolve conflict
Moved ammo types to json
correct checking for worn power armor
use player::is_wearing_power_armor in iuse::UPS and similar
simplify access to itype::is_power_armor
allow to refill several fuel tanks
Merge pull request #5681 from BevapDin/power-armor-detection

Correct checking for worn power armor
fix error messages
change of refill error msg
Merge pull request #5679 from origamiwolf/ammotype

Moved ammo types to json
Merge pull request #5678 from Lain-/my

Tweaks and recipes for accessories
Orange & Spezi

Yeah, Spezi is a German import, which this USian thought was pretty good
shit when he was over there ~14 years ago now.

I figure that if liquor stores can sell pre-mixed Long Island Iced Tea
that teetotalers can have premixed cola & orange.
Crispy Cranberry

Commercially available *now* and not a bad mixed beverage, though it
tastes even better with a dash of lime syrup.
fix oversight
Merge pull request #5690 from Lain-/my

Fix oversight
Merge pull request #5687 from VlasovVitaly/disambigue-refill-vehicle

Disambigue refill vehicle