diff --git a/config/sounds.cfg b/config/sounds.cfg
index 9530e2ff..9406ca90 100755
--- a/config/sounds.cfg
+++ b/config/sounds.cfg
@@ -31,84 +31,85 @@ registersound "weapon/auto_reload" // 19 - S_RASSAULT
registersound "misc/pickup_ammo_clip" // 20 - S_ITEMAMMO
registersound "misc/pickup_health" // 21 - S_ITEMHEALTH
registersound "misc/pickup_armour" // 22 - S_ITEMARMOUR
-registersound "misc/tick9" // 23 - S_ITEMPUP
-registersound "weapon/clip_empty" // 24 - S_NOAMMO
-registersound "misc/tick11" // 25 - S_PUPOUT
-registersound "player/pain1" // 26 - S_PAIN1
-registersound "player/pain2" // 27 - S_PAIN2
-registersound "player/pain3" // 28 - S_PAIN3
-registersound "player/pain4" // 29 - S_PAIN4
-registersound "player/pain5" // 30 - S_PAIN5
-registersound "player/pain6" // 31 - S_PAIN6
-registersound "player/die1" // 32 - S_DIE1
-registersound "player/die2" // 33 - S_DIE2
-registersound "weapon/grenade_exp" // 34 - S_FEXPLODE
-registersound "player/splash1" // 35 - S_SPLASH1
-registersound "player/splash2" // 36 - S_SPLASH2
-registersound "ctf/flagdrop" // 37 - S_FLAGDROP
-registersound "ctf/flagpickup" // 38 - S_FLAGPICKUP
-registersound "ctf/flagreturn" // 39 - S_FLAGRETURN
-registersound "ctf/flagscore" // 40 - S_FLAGSCORE
-registersound "weapon/grenade_pull" // 41 - S_GRENADEPULL
-registersound "weapon/grenade_throw" // 42 - S_GRENADETHROW
-registersound "weapon/grenade_bounce1" // 43 - S_GRENADEBOUNCE1
-registersound "weapon/grenade_bounce2" // 44 - S_GRENADEBOUNCE2
-registersound "weapon/pistol_akreload" // 45 - S_RAKIMBO
-registersound "misc/change_gun" // 46 - S_GUNCHANGE
-registersound "misc/impact_t" // 47 - S_HITSOUND
-registersound "player/gib" // 48 - S_GIB
-registersound "misc/headshot" 10 // 49 - S_HEADSHOT
-registersound "vote/vote_call" // 50 - S_CALLVOTE
-registersound "vote/vote_pass" // 51 - S_VOTEPASS
-registersound "vote/vote_fail" // 52 - S_VOTEFAIL
-registersound "player/footsteps" 40 1 20 // 53 - S_FOOTSTEPS
-registersound "player/crouch" 40 1 10 // 54 - S_FOOTSTEPSCROUCH
-registersound "player/watersteps" 40 1 20 // 55 - S_WATERFOOTSTEPS
-registersound "player/watercrouch" 40 1 10// 56 - S_WATERFOOTSTEPSCROUCH
-registersound "player/crouch_in" 85 0 14 // 57 - S_CROUCH
-registersound "player/crouch_out" 75 0 14 // 58 - S_UNCROUCH
-registersound "misc/menu_click1" // 59 - S_MENUSELECT
-registersound "misc/menu_click2" // 60 - S_MENUENTER
-registersound "player/underwater" // 61 - S_UNDERWATER
-registersound "misc/tinnitus" 2 // 62 - S_TINNITUS
+registersound "misc/pickup_helmet" // 23 - S_ITEMHELMET
+registersound "misc/tick9" // 24 - S_ITEMPUP
+registersound "weapon/clip_empty" // 25 - S_NOAMMO
+registersound "misc/tick11" // 26 - S_PUPOUT
+registersound "player/pain1" // 27 - S_PAIN1
+registersound "player/pain2" // 28 - S_PAIN2
+registersound "player/pain3" // 29 - S_PAIN3
+registersound "player/pain4" // 30 - S_PAIN4
+registersound "player/pain5" // 31 - S_PAIN5
+registersound "player/pain6" // 32 - S_PAIN6
+registersound "player/die1" // 33 - S_DIE1
+registersound "player/die2" // 34 - S_DIE2
+registersound "weapon/grenade_exp" // 35 - S_FEXPLODE
+registersound "player/splash1" // 36 - S_SPLASH1
+registersound "player/splash2" // 37 - S_SPLASH2
+registersound "ctf/flagdrop" // 38 - S_FLAGDROP
+registersound "ctf/flagpickup" // 39 - S_FLAGPICKUP
+registersound "ctf/flagreturn" // 40 - S_FLAGRETURN
+registersound "ctf/flagscore" // 41 - S_FLAGSCORE
+registersound "weapon/grenade_pull" // 42 - S_GRENADEPULL
+registersound "weapon/grenade_throw" // 43 - S_GRENADETHROW
+registersound "weapon/grenade_bounce1" // 44 - S_GRENADEBOUNCE1
+registersound "weapon/grenade_bounce2" // 45 - S_GRENADEBOUNCE2
+registersound "weapon/pistol_akreload" // 46 - S_RAKIMBO
+registersound "misc/change_gun" // 47 - S_GUNCHANGE
+registersound "misc/impact_t" // 48 - S_HITSOUND
+registersound "player/gib" // 49 - S_GIB
+registersound "misc/headshot" 10 // 50 - S_HEADSHOT
+registersound "vote/vote_call" // 51 - S_CALLVOTE
+registersound "vote/vote_pass" // 52 - S_VOTEPASS
+registersound "vote/vote_fail" // 53 - S_VOTEFAIL
+registersound "player/footsteps" 40 1 20 // 54 - S_FOOTSTEPS
+registersound "player/crouch" 40 1 10 // 55 - S_FOOTSTEPSCROUCH
+registersound "player/watersteps" 40 1 20 // 56 - S_WATERFOOTSTEPS
+registersound "player/watercrouch" 40 1 10// 57 - S_WATERFOOTSTEPSCROUCH
+registersound "player/crouch_in" 85 0 14 // 58 - S_CROUCH
+registersound "player/crouch_out" 75 0 14 // 59 - S_UNCROUCH
+registersound "misc/menu_click1" // 60 - S_MENUSELECT
+registersound "misc/menu_click2" // 61 - S_MENUENTER
+registersound "player/underwater" // 62 - S_UNDERWATER
+registersound "misc/tinnitus" 2 // 63 - S_TINNITUS
// In-game voice coms
-registersound "voicecom/affirmative" // 63
-registersound "voicecom/allrightsir" // 64
-registersound "voicecom/comeonmove" // 65
-registersound "voicecom/cominginwiththeflag" // 66
-registersound "voicecom/coverme" // 67
-registersound "voicecom/defendtheflag" // 68
-registersound "voicecom/enemydown" // 69
-registersound "voicecom/gogetemboys" // 70
-registersound "voicecom/goodjobteam" // 71
-registersound "voicecom/igotone" // 72
-registersound "voicecom/imadecontact" // 73
-registersound "voicecom/imattacking" // 74
-registersound "voicecom/imondefense" // 75
-registersound "voicecom/imonyourteamman" // 76
-registersound "voicecom/negative" // 77
-registersound "voicecom/nocando" // 78
-registersound "voicecom/recovertheflag" // 79
-registersound "voicecom/sorry" // 80
-registersound "voicecom/spreadout" // 81
-registersound "voicecom/stayhere" // 82
-registersound "voicecom/staytogether" // 83
-registersound "voicecom/theresnowaysir" // 84
-registersound "voicecom/wedidit" // 85
-registersound "voicecom/yes" // 86
-registersound "voicecom/onthemove_1" // 87
-registersound "voicecom/onthemove_2" // 88
-registersound "voicecom/igotyourback" // 89
-registersound "voicecom/igotyoucovered" // 90
-registersound "voicecom/inposition_1" // 91
-registersound "voicecom/inposition_2" // 92
-registersound "voicecom/reportin" // 93
-registersound "voicecom/niceshot" // 94 : public
-registersound "voicecom/thanks_1" // 95 : public
-registersound "voicecom/thanks_2" // 96 : public
-registersound "voicecom/awesome_1" // 97 : public
-registersound "voicecom/awesome_2" // 98 : public
+registersound "voicecom/affirmative" // 64
+registersound "voicecom/allrightsir" // 65
+registersound "voicecom/comeonmove" // 66
+registersound "voicecom/cominginwiththeflag" // 67
+registersound "voicecom/coverme" // 68
+registersound "voicecom/defendtheflag" // 69
+registersound "voicecom/enemydown" // 70
+registersound "voicecom/gogetemboys" // 71
+registersound "voicecom/goodjobteam" // 72
+registersound "voicecom/igotone" // 73
+registersound "voicecom/imadecontact" // 74
+registersound "voicecom/imattacking" // 75
+registersound "voicecom/imondefense" // 76
+registersound "voicecom/imonyourteamman" // 77
+registersound "voicecom/negative" // 78
+registersound "voicecom/nocando" // 79
+registersound "voicecom/recovertheflag" // 80
+registersound "voicecom/sorry" // 81
+registersound "voicecom/spreadout" // 82
+registersound "voicecom/stayhere" // 83
+registersound "voicecom/staytogether" // 84
+registersound "voicecom/theresnowaysir" // 85
+registersound "voicecom/wedidit" // 86
+registersound "voicecom/yes" // 87
+registersound "voicecom/onthemove_1" // 88
+registersound "voicecom/onthemove_2" // 89
+registersound "voicecom/igotyourback" // 90
+registersound "voicecom/igotyoucovered" // 91
+registersound "voicecom/inposition_1" // 92
+registersound "voicecom/inposition_2" // 93
+registersound "voicecom/reportin" // 94
+registersound "voicecom/niceshot" // 95 : public
+registersound "voicecom/thanks_1" // 96 : public
+registersound "voicecom/thanks_2" // 97 : public
+registersound "voicecom/awesome_1" // 98 : public
+registersound "voicecom/awesome_2" // 99 : public
// Music
registermusic "pingpong/Ping_Pong_-_Kamikadze" // M_FLAGGRAB
diff --git a/source/codeblocks/AssaultCube.cbp b/source/codeblocks/AssaultCube.cbp
index 07a6b11f..760bee54 100644
--- a/source/codeblocks/AssaultCube.cbp
+++ b/source/codeblocks/AssaultCube.cbp
@@ -248,6 +248,7 @@
+
diff --git a/source/src/server.h b/source/src/server.h
index 5e3f4ed7..83a8fe1d 100644
--- a/source/src/server.h
+++ b/source/src/server.h
@@ -466,7 +466,7 @@ itemstat ammostats[NUMGUNS] =
itemstat powerupstats[I_ARMOUR-I_HEALTH+1] =
{
{33, 0, 100, S_ITEMHEALTH}, // 0 health
- {25, 0, 100, S_ITEMARMOUR}, // 1 helmet
+ {25, 0, 100, S_ITEMHELMET}, // 1 helmet
{50, 0, 100, S_ITEMARMOUR}, // 2 armour
};
diff --git a/source/src/sound.h b/source/src/sound.h
index 6b9f1588..578d6b34 100644
--- a/source/src/sound.h
+++ b/source/src/sound.h
@@ -13,7 +13,8 @@ enum
S_SNIPER, S_RSNIPER,
S_ASSAULT, S_RASSAULT,
S_ITEMAMMO, S_ITEMHEALTH,
- S_ITEMARMOUR, S_ITEMAKIMBO,
+ S_ITEMARMOUR, S_ITEMHELMET,
+ S_ITEMAKIMBO,
S_NOAMMO, S_AKIMBOOUT,
S_PAIN1, S_PAIN2, S_PAIN3, S_PAIN4, S_PAIN5, S_PAIN6,
S_DIE1, S_DIE2,