Merge commit '38df0665e3' into scripting

Conflicts:
	src/d_dehacked.cpp
	src/decallib.cpp
	src/g_hexen/a_clericstaff.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt

src/g_shared/shared_sbar.cpp

@@ -1338,17 +1338,17 @@ void DBaseStatusBar::Draw (EHudState state)
 		{
 			if (Scaled)
 			{
-				y -= Scale (10, SCREENHEIGHT, 200);
+				y -= Scale (11, SCREENHEIGHT, 200);
 			}
 			else
 			{
 				if (SCREENWIDTH < 640)
 				{
-					y -= 11;
+					y -= 12;
 				}
 				else
 				{ // Get past the tops of the gargoyles' wings
-					y -= 26;
+					y -= 28;
 				}
 			}
 		}