| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-08-29 16:43:58 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-08-29 16:43:58 +0200 |
| commit | b07f636ea1e905f494c57fd2de03e8f36a4d5061 (patch) | |
| tree | 6eebf81f1309332914764839bd45c442385e509e /src/asset/www/data/weapons.json.m4 | |
| parent | 120b0b7f6df0c8978aac9a423cbf8364feac4779 (diff) | |
Diffstat (limited to 'src/asset/www/data/weapons.json.m4')
| -rw-r--r-- | src/asset/www/data/weapons.json.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/asset/www/data/weapons.json.m4 b/src/asset/www/data/weapons.json.m4 index 7daf71b..7b3ff1e 100644 --- a/src/asset/www/data/weapons.json.m4 +++ b/src/asset/www/data/weapons.json.m4 @@ -1,6 +1,7 @@ [ m4_include(__MAKEFILE_DATA_DIR/weapon/global.m4.conf)m4_dnl -m4_include(__MAKEFILE_DATA_DIR/weapon/basic.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/weapon/primary_melee_10_20_25.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/weapon/primary_ranged_5_25_25.m4d)m4_dnl m4_include(__MAKEFILE_DATA_DIR/weapon/secondary.m4d)m4_dnl { "msg": "okay" |