cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GinjaNinja32
2015-08-19 07:17:03 +01:00
parent 0d9ef708d5 faf11098d1
commit 03166ab4e9
7 changed files with 970 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interface/skin.dmf
+2 -2
View File
@@ -565,11 +565,11 @@ macro "hotkeymode"
is-disabled = false
elem
name = "4"
command = "a-intent hurt"
command = "a-intent harm"
is-disabled = false
elem
name = "CTRL+4"
command = "a-intent hurt"
command = "a-intent harm"
is-disabled = false
elem
name = "5"