Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

Conflicts: .travis.yml polaris.dme
2026-07-19 02:56:14 +01:00 · 2015-07-26 16:01:27 -04:00
parent 0d7ebe73b6 154939ed90
commit 94a2ec5bf1
70 changed files with 4690 additions and 4624 deletions
@@ -64,6 +64,7 @@ Hotkey-Mode: (hotkey-mode must be on)
 \t5 = emote
 \tx = swap-hand
 \tz = activate held object (or y)
+\tj = toggle-aiming-mode
 \tf = cycle-intents-left
 \tg = cycle-intents-right
 \t1 = help-intent