cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
This commit is contained in:
PsiOmega
2015-07-17 23:19:34 +02:00
parent ae47726450 a9f2d83664
commit 34b0517578
12 changed files with 175 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/interface.dm
View File

@@ -57,6 +57,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