diff --git a/_module/ncs/chd_on_spawn.ncs b/_module/ncs/chd_on_spawn.ncs
index 232cf49f..3bec434c 100644
Binary files a/_module/ncs/chd_on_spawn.ncs and b/_module/ncs/chd_on_spawn.ncs differ
diff --git a/_module/ncs/displ_onspawn.ncs b/_module/ncs/displ_onspawn.ncs
index 0ef8b72c..7ec5ed6f 100644
Binary files a/_module/ncs/displ_onspawn.ncs and b/_module/ncs/displ_onspawn.ncs differ
diff --git a/_module/ncs/dmfi_execute.ncs b/_module/ncs/dmfi_execute.ncs
index 2e8c6596..ca781da0 100644
Binary files a/_module/ncs/dmfi_execute.ncs and b/_module/ncs/dmfi_execute.ncs differ
diff --git a/_module/ncs/hcrh_spawnin.ncs b/_module/ncs/hcrh_spawnin.ncs
index a1e11a66..ee6c0bb9 100644
Binary files a/_module/ncs/hcrh_spawnin.ncs and b/_module/ncs/hcrh_spawnin.ncs differ
diff --git a/_module/ncs/nw_c2_bossdie.ncs b/_module/ncs/nw_c2_bossdie.ncs
index 2e198a48..ec5a325a 100644
Binary files a/_module/ncs/nw_c2_bossdie.ncs and b/_module/ncs/nw_c2_bossdie.ncs differ
diff --git a/_module/ncs/nw_c2_default9a.ncs b/_module/ncs/nw_c2_default9a.ncs
index 1917aea9..a4a122f2 100644
Binary files a/_module/ncs/nw_c2_default9a.ncs and b/_module/ncs/nw_c2_default9a.ncs differ
diff --git a/_module/ncs/nw_o2_boss.ncs b/_module/ncs/nw_o2_boss.ncs
index c5835be1..fb546e80 100644
Binary files a/_module/ncs/nw_o2_boss.ncs and b/_module/ncs/nw_o2_boss.ncs differ
diff --git a/_module/ncs/nw_o2_generalhig.ncs b/_module/ncs/nw_o2_generalhig.ncs
index 610c84b5..c2810c28 100644
Binary files a/_module/ncs/nw_o2_generalhig.ncs and b/_module/ncs/nw_o2_generalhig.ncs differ
diff --git a/_module/ncs/nw_o2_generallow.ncs b/_module/ncs/nw_o2_generallow.ncs
index 1c000d2b..41da7bf3 100644
Binary files a/_module/ncs/nw_o2_generallow.ncs and b/_module/ncs/nw_o2_generallow.ncs differ
diff --git a/_module/ncs/nw_o2_generalmed.ncs b/_module/ncs/nw_o2_generalmed.ncs
index f2b65e84..cc8bf8ec 100644
Binary files a/_module/ncs/nw_o2_generalmed.ncs and b/_module/ncs/nw_o2_generalmed.ncs differ
diff --git a/_module/ncs/nw_s0_res.ncs b/_module/ncs/nw_s0_res.ncs
index 5ed923ef..6d13643f 100644
Binary files a/_module/ncs/nw_s0_res.ncs and b/_module/ncs/nw_s0_res.ncs differ
diff --git a/_module/ncs/plc_detbarrdeath.ncs b/_module/ncs/plc_detbarrdeath.ncs
index bbead544..22f52bd6 100644
Binary files a/_module/ncs/plc_detbarrdeath.ncs and b/_module/ncs/plc_detbarrdeath.ncs differ
diff --git a/_module/ncs/pri_barmaid_spwn.ncs b/_module/ncs/pri_barmaid_spwn.ncs
index 6fdd4987..ba062dc6 100644
Binary files a/_module/ncs/pri_barmaid_spwn.ncs and b/_module/ncs/pri_barmaid_spwn.ncs differ
diff --git a/_module/ncs/wa_nullmagicon.ncs b/_module/ncs/wa_nullmagicon.ncs
index 78c328af..8deb0a4c 100644
Binary files a/_module/ncs/wa_nullmagicon.ncs and b/_module/ncs/wa_nullmagicon.ncs differ
diff --git a/_module/ncs/zep_demi_onspawn.ncs b/_module/ncs/zep_demi_onspawn.ncs
index 816cdbd7..f61b6862 100644
Binary files a/_module/ncs/zep_demi_onspawn.ncs and b/_module/ncs/zep_demi_onspawn.ncs differ
diff --git a/_module/ncs/zep_gob_worg_spw.ncs b/_module/ncs/zep_gob_worg_spw.ncs
index f25e72b1..a2a5c5a2 100644
Binary files a/_module/ncs/zep_gob_worg_spw.ncs and b/_module/ncs/zep_gob_worg_spw.ncs differ
diff --git a/_module/ncs/zep_la_c2_thorny.ncs b/_module/ncs/zep_la_c2_thorny.ncs
index c8dad3b2..f52c62cb 100644
Binary files a/_module/ncs/zep_la_c2_thorny.ncs and b/_module/ncs/zep_la_c2_thorny.ncs differ
diff --git a/_module/ncs/zep_la_c2_vegpyg.ncs b/_module/ncs/zep_la_c2_vegpyg.ncs
index c8dad3b2..f52c62cb 100644
Binary files a/_module/ncs/zep_la_c2_vegpyg.ncs and b/_module/ncs/zep_la_c2_vegpyg.ncs differ
diff --git a/_module/ncs/zep_scare_user.ncs b/_module/ncs/zep_scare_user.ncs
index 9430009d..70a513ec 100644
Binary files a/_module/ncs/zep_scare_user.ncs and b/_module/ncs/zep_scare_user.ncs differ
diff --git a/_module/ncs/zep_shrieker_spw.ncs b/_module/ncs/zep_shrieker_spw.ncs
index f2ccc2f9..5ecd2f62 100644
Binary files a/_module/ncs/zep_shrieker_spw.ncs and b/_module/ncs/zep_shrieker_spw.ncs differ
diff --git a/_module/ncs/zep_veg_thor_spw.ncs b/_module/ncs/zep_veg_thor_spw.ncs
index ae3fef98..298fbcd0 100644
Binary files a/_module/ncs/zep_veg_thor_spw.ncs and b/_module/ncs/zep_veg_thor_spw.ncs differ
diff --git a/_module/nss/chr_inc.nss b/_module/nss/chr_inc.nss
index 58a058c4..632165d3 100644
--- a/_module/nss/chr_inc.nss
+++ b/_module/nss/chr_inc.nss
@@ -17,6 +17,7 @@
 #include "util_inc"
 #include "util_names_inc"
 #include "nwnx_time"
+#include "prc_inc_skin"
 
 //:: void main (){}
 
@@ -294,7 +295,8 @@ void RemoveBlackScreen(object oPC)
 
 void chr_ZombieWalk(object oPC, int nDuration)
 {
-    object oPCSkin = GetItemInSlot (INVENTORY_SLOT_CARMOUR, oPC);
+    //object oPCSkin = GetItemInSlot (INVENTORY_SLOT_CARMOUR, oPC);
+	object oPCSkin = GetPCSkin(oPC);
     // We only relate this message once, it's just so they know what is going on.
     if (!GetLocalInt (oPC, CHR_NEARDEATH_VAR_MESSAGE))
     {
diff --git a/_module/nss/dmfi_execute.nss b/_module/nss/dmfi_execute.nss
index 7c314e85..e0007368 100644
--- a/_module/nss/dmfi_execute.nss
+++ b/_module/nss/dmfi_execute.nss
@@ -272,17 +272,17 @@ void DestroyAllItems()
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_BULLETS)))
             DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CARMOUR)))
-            DestroyObject(oItem);
+            //DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CHEST)))
             DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CLOAK)))
             DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CWEAPON_B)))
-            DestroyObject(oItem);
+            //DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CWEAPON_L)))
-            DestroyObject(oItem);
+            //DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_CWEAPON_R)))
-            DestroyObject(oItem);
+            //DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_HEAD)))
             DestroyObject(oItem);
         if(GetIsObjectValid(oItem=GetItemInSlot(INVENTORY_SLOT_LEFTHAND)))
@@ -543,12 +543,12 @@ void TakeStuff(int Level, object oTarget, object oUser)
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_BOLTS,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_BOOTS,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_BULLETS,oTarget));
-         DestroyObject(GetItemInSlot(INVENTORY_SLOT_CARMOUR,oTarget));
+         //DestroyObject(GetItemInSlot(INVENTORY_SLOT_CARMOUR,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_CHEST,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_CLOAK,oTarget));
-         DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_B,oTarget));
-         DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_L,oTarget));
-         DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_R,oTarget));
+         //DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_B,oTarget));
+         //DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_L,oTarget));
+         //DestroyObject(GetItemInSlot(INVENTORY_SLOT_CWEAPON_R,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_HEAD,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_LEFTHAND,oTarget));
          DestroyObject(GetItemInSlot(INVENTORY_SLOT_LEFTRING,oTarget));