Stomach
Stupid mistake fix
Fix one stupid mistake.
Merge branch 'master' into stomath

Conflicts:
	src/player.cpp
	src/player.h
	src/savegame_json.cpp
Aftermegre fixes
Fix
Initial attempt, needs compile-checked

Not gonna fire up C::B at 5:13 AM.
It works now!

This checks the terrain in question and awards a fair amount of
electronics-practice if you've at least basic familiarity with the skill
and are disassembling a console.  Broken ones provide fair amounts of
practice; *working* ones a pretty substantial load, since that's
permanently destroying a permanent light source.
Merge pull request #8482 from KA101/consoledeconstruct

(Blocker Fix) XP for deconstructing consoles
Merge pull request #8419 from Reaper42/stomath

Stomach