sources/NicePack.uc

@@ -167,30 +167,23 @@ function PreBeginPlay()
 
 simulated function PostBeginPlay()
 {
-    local int i;
     local ScrnVotingHandlerMut VH;
     local MeanVoting VO;
     local NiceFFVoting FFVO;
+
     super.PostBeginPlay();
+
     class'ScrnLightVestPickup'.default.cost = 50;
     class'ScrnHorzineVestPickup'.default.weight = 2;
     class'ScrnHorzineVestPickup'.default.cost = 750;
     class'NicePack'.default.Mut = self;
-    // Gun skins
-    class'NiceMaulerPickup'.default.VariantClasses[class'NiceMaulerPickup'.default.VariantClasses.length] = class'ScrnSPSniperPickup';
-    class'NiceDeaglePickup'.default.VariantClasses[class'NiceDeaglePickup'.default.VariantClasses.length] = class'SkinExecutionerPickup';
-    class'NiceDualDeaglePickup'.default.VariantClasses[class'NiceDualDeaglePickup'.default.VariantClasses.length] = class'SkinDualExecutionerPickup';
-    class'NiceMagnumPickup'.default.VariantClasses[class'NiceMagnumPickup'.default.VariantClasses.length] = class'SkinCowboyMagnumPickup';
-    class'NiceDualMagnumPickup'.default.VariantClasses[class'NiceDualMagnumPickup'.default.VariantClasses.length] = class'SkinDualCowboyMagnumPickup';
-    class'NiceWinchesterPickup'.default.VariantClasses[class'NiceWinchesterPickup'.default.VariantClasses.length] = class'SkinRetroLARPickup';
-    class'NiceM14EBRPickup'.default.VariantClasses[class'NiceM14EBRPickup'.default.VariantClasses.length] = class'SkinM14EBR2ProPickup';
-    class'ScrnKrissMPickup'.default.VariantClasses[class'ScrnKrissMPickup'.default.VariantClasses.length] = class'SkinGoldenKrissPickup';
-    class'NiceSCARMK17Pickup'.default.VariantClasses[class'NiceSCARMK17Pickup'.default.VariantClasses.length] = class'SkinCamoSCARMK17Pickup';
+
     // Abilities
     class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceSharpshooterAbilitiesAdapter', level);
     class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceEnforcerAbilitiesAdapter', level);
+
     SetTimer(0.25, true);
-    if(Role < ROLE_Authority)
+    if (Role < ROLE_Authority)
        return;
     //  Create sync node
     serverStorage = new class'NiceStorageServer';
@@ -223,8 +216,8 @@ simulated function PostBeginPlay()
     // -- Lower starting HL
     ScrnMut.GameRules.HardcoreLevel -= 7;
     ScrnMut.GameRules.HardcoreLevelFloat -= 7;
+
     // -- Fill-in zed info
-    i = 0;
     // - Clot
     ZedDatabase[0].bNeedsReplacement = bReplaceClot;
     // - Crawler

sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc

@@ -1,6 +1,9 @@
 class NiceSCARMK17Pickup extends NiceWeaponPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'KFMod.NeonSCARMK17Pickup'
+    VariantClasses(1)=class'SkinCamoSCARMK17Pickup'
     Weight=8.000000
     cost=1250
     AmmoCost=28
@@ -15,7 +18,6 @@ defaultproperties
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     CorrespondingPerkIndex=3
     EquipmentCategoryID=3
-    VariantClasses(0)=Class'KFMod.NeonSCARMK17Pickup'
     InventoryType=class'NiceSCARMK17AssaultRifle'
     PickupMessage="You got the SCARMK17"
     PickupSound=Sound'KF_SCARSnd.SCAR_Pickup'

sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc

@@ -1,6 +1,9 @@
 class NiceDeaglePickup extends NiceSinglePickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'SkinExecutionerPickup'
+    VariantClasses(1)=class'SkinGoldenDeaglePickup'
     Weight=2.000000
     cost=250
     AmmoCost=14
@@ -13,7 +16,6 @@ defaultproperties
     ItemShortName="Deagle"
     AmmoItemName=".300 JHP Ammo"
     AmmoMesh=None
-    VariantClasses(0)=class'SkinGoldenDeaglePickup'
     InventoryType=class'NiceDeagle'
     PickupMessage="You got the Desert Eagle"
     PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup'

sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc

@@ -1,6 +1,9 @@
 class NiceDualDeaglePickup extends NiceDualiesPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'SkinDualExecutionerPickup'
+    VariantClasses(1)=class'SkinGoldenDualDeaglePickup'
     Weight=4.000000
     cost=500
     AmmoCost=28
@@ -13,7 +16,6 @@ defaultproperties
     ItemShortName="Dual Deagles"
     AmmoItemName=".300 JHP Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.DeagleAmmo'
-    VariantClasses(0)=class'SkinGoldenDualDeaglePickup'
     InventoryType=class'NiceDualDeagle'
     PickupMessage="You found another Handcannon"
     PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup'

sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc

@@ -1,6 +1,8 @@
 class NiceDualMagnumPickup extends NiceDualiesPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'SkinDualCowboyMagnumPickup'
     Weight=4.000000
     cost=250
     AmmoCost=10

sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc

@@ -1,6 +1,8 @@
 class NiceMagnumPickup extends NiceSinglePickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'SkinCowboyMagnumPickup'
     Weight=2.000000
     cost=125
     AmmoCost=5

sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc

@@ -1,6 +1,9 @@
 class NiceKrissMPickup extends NiceWeaponPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'KFMod.NeonKrissMPickup'
+    VariantClasses(1)=class'SkinGoldenKrissPickup'
     Weight=4.000000
     cost=750
     AmmoCost=22
@@ -15,7 +18,6 @@ defaultproperties
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
     CorrespondingPerkIndex=3
-    VariantClasses(0)=Class'KFMod.NeonKrissMPickup'
     InventoryType=class'NiceKrissMMedicGun'
     PickupMessage="You got the KRISS Vector Medic Gun"
     PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup'

sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc

@@ -1,6 +1,8 @@
 class NiceM14EBRPickup extends NiceWeaponPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'SkinM14EBR2ProPickup'
     Weight=8.000000
     cost=1000
     AmmoCost=25

sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc

@@ -1,6 +1,8 @@
 class NiceMaulerPickup extends NiceWeaponPickup;
+
 defaultproperties
 {
+    VariantClasses(0)=class'ScrnSPSniperPickup'
     Weight=6.000000
     cost=750
     AmmoCost=22

sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc

@@ -2,6 +2,7 @@ class NiceWinchesterPickup extends NiceWeaponPickup;
 
 defaultproperties
 {
+     VariantClasses(0)=class'SkinRetroLARPickup'
      Weight=6.000000
      AmmoCost=13
      cost=250