diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
| commit | fc99167e687ba688ce9306bbec7e801450c917be (patch) | |
| tree | b440f2568a98b4b6a8db17925a299142adead7fa /datasrc/content.py | |
| parent | 206e9adb9140c3c8963661f534703de33f8abe05 (diff) | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| download | zcatch-fc99167e687ba688ce9306bbec7e801450c917be.tar.gz zcatch-fc99167e687ba688ce9306bbec7e801450c917be.zip | |
Merge branch 'master' into zCatch-Exp
Conflicts: src/engine/server.h src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/network.h src/engine/shared/network_server.cpp src/game/server/player.h
Diffstat (limited to 'datasrc/content.py')
| -rw-r--r-- | datasrc/content.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/datasrc/content.py b/datasrc/content.py index aa6554f3..546574f2 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -471,7 +471,7 @@ weapon.firedelay.Set(125) weapon.ammoregentime.Set(500) weapon.visual_size.Set(64) weapon.offsetx.Set(32) -weapon.offsety.Set(-4) +weapon.offsety.Set(4) weapon.muzzleoffsetx.Set(50) weapon.muzzleoffsety.Set(6) container.weapons.gun.base.Set(weapon) |