diff --git a/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini b/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini
index 7df9a6a72..4ebd378b8 100644
--- a/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini
+++ b/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini
@@ -5,3 +5,13 @@
     [[eye_angle]]
         name = m_angEyeAngles[0]
         type = QAngle
+
+
+[virtual_function]
+
+    # _ZN10CDODPlayer13GiveNamedItemEPKci
+    [[give_named_item]]
+        offset_linux = 401
+        offset_windows = 400
+        arguments = STRING, INT
+        return_type = POINTER
diff --git a/addons/source-python/data/source-python/weapons/dod.ini b/addons/source-python/data/source-python/weapons/dod.ini
index 062cba531..b61df1681 100644
--- a/addons/source-python/data/source-python/weapons/dod.ini
+++ b/addons/source-python/data/source-python/weapons/dod.ini
@@ -6,113 +6,200 @@
 
 [weapons]
 
-    [[30cal]]
-        tags = "all"
+    # =========================================================================
+    # PRIMARY WEAPONS
+    # =========================================================================
+    [[garand]]
+        slot = 0
+        clip = 8
+        ammoprop = 4
+        tags = "all,primary,rifle"
 
-    [[amerknife]]
-        tags = "all"
+    [[thompson]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
     [[bar]]
-        tags = "all"
+        slot = 0
+        clip = 20
+        ammoprop = 9
+        tags = "all,primary"
 
-    [[basebomb]]
-        tags = "all"
+    [[spring]]
+        slot = 0
+        clip = 5
+        ammoprop = 7
+        tags = "all,primary,rifle"
 
-    [[basedodgrenade]]
-        tags = "all"
+    [[30cal]]
+        slot = 0
+        clip = 150
+        ammoprop = 10
+        tags = "all,primary,machinegun"
 
     [[bazooka]]
-        tags = "all"
-
-    [[c96]]
-        tags = "all"
-
-    [[colt]]
-        tags = "all"
-
-    [[dod_base]]
-        tags = "all"
+        slot = 0
+        clip = 1
+        ammoprop = 12
+        tags = "all,primary,explosive"
 
-    [[dod_base_gun]]
-        tags = "all"
-
-    [[dod_base_melee]]
-        tags = "all"
+    [[k98]]
+        slot = 0
+        clip = 5
+        ammoprop = 5
+        tags = "all,primary,rifle"
 
-    [[dodbaserpg]]
-        tags = "all"
+    [[mp40]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
-    [[frag_ger]]
-        tags = "all"
+    [[mp44]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
-    [[frag_ger_live]]
-        tags = "all"
+    [[k98_scoped]]
+        slot = 0
+        clip = 5
+        ammoprop = 5
+        tags = "all,primary,rifle"
 
-    [[frag_us]]
-        tags = "all"
+    [[mg42]]
+        slot = 0
+        clip = 250
+        ammoprop = 11
+        tags = "all,primary,machinegun"
 
-    [[frag_us_live]]
-        tags = "all"
+    [[pschreck]]
+        slot = 0
+        clip = 1
+        ammoprop = 12
+        tags = "all,primary,explosive"
+
+    # =========================================================================
+    # SECONDARY WEAPONS
+    # =========================================================================
+    [[colt]]
+        slot = 1
+        clip = 7
+        ammoprop = 1
+        tags = "all,secondary,pistol"
 
-    [[garand]]
-        tags = "all"
+    [[m1carbine]]
+        slot = 1
+        clip = 15
+        ammoprop = 6
+        tags = "all,secondary,rifle"
 
-    [[ifm_base]]
-        tags = "all"
+    [[p38]]
+        slot = 1
+        clip = 8
+        ammoprop = 2
+        tags = "all,secondary,pistol"
 
-    [[ifm_base_camera]]
-        tags = "all"
+    [[c96]]
+        slot = 0
+        clip = 20
+        ammoprop = 3
+        tags = "all,secondary,pistol"
+
+    # =========================================================================
+    # MELEE WEAPONS
+    # =========================================================================
+    [[amerknife]]
+        slot = 2
+        clip = -1
+        ammoprop = -1
+        tags = "all,melee"
 
-    [[ifm_steadycam]]
-        tags = "all"
+    [[spade]]
+        slot = 2
+        clip = -1
+        ammoprop = -1
+        tags = "all,melee"
+
+    # =========================================================================
+    # PROJECTILE WEAPONS
+    # =========================================================================
+    [[riflegren_us]]
+        slot = 3
+        clip = -1
+        ammoprop = 21
+        tags = "all,grenade,explosive"
 
-    [[k98]]
-        tags = "all"
+    [[smoke_us]]
+        slot = 2
+        clip = -1
+        ammoprop = 17
+        tags = "all,grenade"
 
-    [[k98_scoped]]
-        tags = "all"
+    [[frag_us]]
+        slot = 3
+        clip = -1
+        ammoprop = 13
+        tags = "all,grenade,explosive"
 
-    [[m1carbine]]
-        tags = "all"
+    [[riflegren_ger]]
+        slot = 3
+        clip = -1
+        ammoprop = 22
+        tags = "all,grenade,explosive"
 
-    [[mg42]]
-        tags = "all"
+    [[smoke_ger]]
+        slot = 2
+        clip = -1
+        ammoprop = 18
+        tags = "all,grenade"
 
-    [[mp40]]
+    [[frag_ger]]
+        slot = 3
+        clip = -1
+        ammoprop = 14
+        tags = "all,grenade,explosive"
+
+    # =========================================================================
+    # UNKNOWN WEAPONS
+    # =========================================================================
+    [[dod_base]]
         tags = "all"
 
-    [[mp44]]
+    [[basebomb]]
         tags = "all"
 
-    [[p38]]
+    [[basedodgrenade]]
         tags = "all"
 
-    [[pschreck]]
+    [[dod_base_gun]]
         tags = "all"
 
-    [[riflegren_ger]]
+    [[dod_base_melee]]
         tags = "all"
 
-    [[riflegren_ger_live]]
+    [[dodbaserpg]]
         tags = "all"
 
-    [[riflegren_us]]
+    [[frag_ger_live]]
         tags = "all"
 
-    [[riflegren_us_live]]
+    [[frag_us_live]]
         tags = "all"
 
-    [[smoke_ger]]
+    [[ifm_base]]
         tags = "all"
 
-    [[smoke_us]]
+    [[ifm_base_camera]]
         tags = "all"
 
-    [[spade]]
+    [[ifm_steadycam]]
         tags = "all"
 
-    [[spring]]
+    [[riflegren_ger_live]]
         tags = "all"
 
-    [[thompson]]
+    [[riflegren_us_live]]
         tags = "all"