diff --git a/resources/[jobs]/[weapons]/ND_GunAnims/data/animations.lua b/resources/[jobs]/[weapons]/ND_GunAnims/data/animations.lua
index f40144439..992b5cfbd 100644
--- a/resources/[jobs]/[weapons]/ND_GunAnims/data/animations.lua
+++ b/resources/[jobs]/[weapons]/ND_GunAnims/data/animations.lua
@@ -42,7 +42,7 @@ info.clothing = {
     holster = {
         {
             anim = "police",
-            weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+            weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
             variation = 7,
             male = {186, 183, 188},
             female = {221,235, 233, 231, 229, 227, 225, 223, 219, 217, 215, 213, 211, 209, 207, 205, 199, 198, 197, 196}
@@ -51,7 +51,7 @@ info.clothing = {
     unholster = {
         {
             anim = "police",
-            weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+            weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
             variation = 7,
             male = {182, 179, 187},
             female = {220, 234, 232, 230, 228, 226, 224, 222, 218, 216, 214, 212, 210, 208, 206, 204, 203, 202, 201, 200}
diff --git a/resources/[jobs]/[weapons]/ND_GunAnims/data/holster.lua b/resources/[jobs]/[weapons]/ND_GunAnims/data/holster.lua
index 9e1338f02..064d70eb5 100644
--- a/resources/[jobs]/[weapons]/ND_GunAnims/data/holster.lua
+++ b/resources/[jobs]/[weapons]/ND_GunAnims/data/holster.lua
@@ -4,119 +4,119 @@
 
 return {
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         male = {182, 186},
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         male = {179, 183},
         female = {235, 234}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         male = {187, 188},
         female = {213, 212}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {233, 232}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {231, 230}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {229, 228},
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {227, 226},
     },   
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {225, 224}
     },      
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {223, 222}
     },  
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {221, 220}
     },        
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {221, 220}
     },  
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {219, 218}
     },  
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {217, 216}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {215, 214}
     },      
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {211, 210}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {209, 208}
     },    
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {207, 206}
     },     
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {207, 206}
     },   
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {205, 204}
     },  
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {203, 199}
     },    
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {202, 198}
     },  
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {201, 197}
     },
     {
-        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`},
+        weapons = {`weapon_pistol_mk2`,`WEAPON_REVOLVER`,`WEAPON_HEAVYPISTOL`,`WEAPON_APPISTOL`,`weapon_combatpisol`},
         variation = 7,
         female = {200, 196}
     },