diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
| commit | 7c02e34b08a4e44a7f7935bf6b1bee45c3a8df6c (patch) | |
| tree | e3ff69394522a6cc7dd11edf27cd69df6c0a5819 /src/game/bg_mod.h | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'src/game/bg_mod.h')
| -rw-r--r-- | src/game/bg_mod.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/bg_mod.h b/src/game/bg_mod.h index 5e4245b..6f09037 100644 --- a/src/game/bg_mod.h +++ b/src/game/bg_mod.h @@ -8,6 +8,7 @@ MOD( MOD_CHAINGUN ), MOD( MOD_PRIFLE ), MOD( MOD_MDRIVER ), MOD( MOD_LASGUN ), +MOD( MOD_LIGHTNING ), MOD( MOD_LCANNON ), MOD( MOD_LCANNON_SPLASH ), MOD( MOD_FLAMER ), @@ -18,7 +19,6 @@ MOD( MOD_GRENADE ), MOD( MOD_PSAWBLADE ), MOD( MOD_MINE ), MOD( MOD_FLAMES ), -MOD( MOD_SMOKE ), MOD( MOD_SPITEFUL_ABCESS ), MOD( MOD_WATER ), MOD( MOD_SLIME ), |