Merges #4679 , #4670 , and #4677

2018-01-07 15:29:15 -05:00
parent a2b4ffccdf
commit 3e937fcecf
11 changed files with 131 additions and 124 deletions
@@ -17,11 +17,14 @@
 			if(keys_held["Ctrl"] && keys_held["Shift"]) // Is this command ever used?
 				winset(src, null, "command=.options")
 			else
-				adminhelp()
+				get_adminhelp()
+			return
 		if("F2") // Screenshot. Hold shift to choose a name and location to save in
 			winset(src, null, "command=.screenshot [!keys_held["shift"] ? "auto" : ""]")
+			return
 		if("F12") // Toggles minimal HUD
 			mob.button_pressed_F12()
+			return

 	if(holder)
 		holder.key_down(_key, src)