Merge pull request #49 from zeno0207/master

fix Ext_TraitDemoProfessional
Update Ext_TraitDemoProfessional.uc
2024-09-14 18:14:38 +03:00 · 2024-08-21 22:59:18 +08:00 · 2024-07-22 16:14:05 +03:00 · 2024-07-21 23:10:13 +03:00 · 2024-07-14 15:58:02 +08:00 · 2023-12-31 23:21:19 +03:00
203 changed files with 1500 additions and 2315 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,33 @@
+root = true
+
+# Global
+[*]
+indent_style = unset
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = unset
+
+# Unreal Engine 3 / Source
+[*.uc]
+indent_style = tab
+
+[*.{uci,upkg}]
+
+# Unreal Engine 3 / i18n
+[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
+charset = utf-16le
+
+# Other
+[*.md]
+indent_style = space
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.{txt,cfg,conf}]
+indent_style = tab
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@ -1,8 +0,0 @@
-### Details
-Tell us exactly what happens, every single detail that you can think of
-
-### Screenshots
-Provide a screenshot of the issue so we can debug it's not a user issue
-
-### Steps to reproduce
-Tell us how to reproduce the problem, step by step
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@ -0,0 +1,116 @@
+---
+name: MegaLinter
+
+permissions: read-all
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+env:
+  APPLY_FIXES: none
+  APPLY_FIXES_EVENT: pull_request
+  APPLY_FIXES_MODE: commit
+  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
+  DISABLE: SPELL
+  DISABLE_ERRORS_LINTERS: MARKDOWN_MARKDOWN_LINK_CHECK
+  EDITORCONFIG_EDITORCONFIG_CHECKER_FILTER_REGEX_EXCLUDE: 'xVoteAnnouncer.upk'
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  megalinter:
+    name: MegaLinter
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: MegaLinter
+        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
+        id: ml
+        env:
+          VALIDATE_ALL_CODEBASE: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
+        if: success() || failure()
+        with:
+          name: MegaLinter reports
+          path: |
+            megalinter-reports
+            mega-linter.log
+
+      - name: Set APPLY_FIXES_IF var
+        run: |
+          printf 'APPLY_FIXES_IF=%s\n' "${{
+            steps.ml.outputs.has_updated_sources == 1 &&
+            (
+              env.APPLY_FIXES_EVENT == 'all' ||
+              env.APPLY_FIXES_EVENT == github.event_name
+            ) &&
+            (
+              github.event_name == 'push' ||
+              github.event.pull_request.head.repo.full_name == github.repository
+            )
+          }}" >> "${GITHUB_ENV}"
+
+      - name: Set APPLY_FIXES_IF_* vars
+        run: |
+          printf 'APPLY_FIXES_IF_PR=%s\n' "${{
+            env.APPLY_FIXES_IF == 'true' &&
+            env.APPLY_FIXES_MODE == 'pull_request'
+          }}" >> "${GITHUB_ENV}"
+          printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
+            env.APPLY_FIXES_IF == 'true' &&
+            env.APPLY_FIXES_MODE == 'commit' &&
+            (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
+          }}" >> "${GITHUB_ENV}"
+
+      - name: Create Pull Request with applied fixes
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        id: cpr
+        if: env.APPLY_FIXES_IF_PR == 'true'
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          commit-message: "[MegaLinter] Apply linters automatic fixes"
+          title: "[MegaLinter] Apply linters automatic fixes"
+          labels: bot
+
+      - name: Create PR output
+        if: env.APPLY_FIXES_IF_PR == 'true'
+        run: |
+          echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Prepare commit
+        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        run: sudo chown -Rc $UID .git/
+
+      - name: Commit and push applied linter fixes
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
+        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        with:
+          branch: >-
+            ${{
+              github.event.pull_request.head.ref ||
+              github.head_ref ||
+              github.ref
+            }}
+          commit_message: "[MegaLinter] Apply linters fixes"
+          commit_user_name: "github-actions"
+          commit_user_email: "github-actions[bot]@users.noreply.github.com"
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+*.psd
+/ignore
--- a/Localization/CHN/ServerExt.chn
+++ b/Localization/CHN/ServerExt.chn
--- a/Localization/CHT/ServerExt.CHT
+++ b/Localization/CHT/ServerExt.CHT
--- a/Localization/ESN/ServerExt.esn
+++ b/Localization/ESN/ServerExt.esn
--- a/Localization/INT/ServerExt.int
+++ b/Localization/INT/ServerExt.int
--- a/Localization/JPN/ServerExt.jpn
+++ b/Localization/JPN/ServerExt.jpn
--- a/Localization/RUS/ServerExt.rus
+++ b/Localization/RUS/ServerExt.rus
--- a/PublicationContent/description.txt
+++ b/PublicationContent/description.txt
@ -1,6 +1,6 @@
 [img]https://raw.githubusercontent.com/GenZmeY/KF2-Server-Extension/master/PublicationContent/mutbanner.png[/img]

-[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-Server-Extension[/img] [img]https://img.shields.io/steam/downloads/2085786712[/img] [img]https://img.shields.io/steam/favorites/2085786712[/img] [img]https://img.shields.io/steam/update-date/2085786712[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2085786712][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-Server-Extension[/img][/url]
+[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-Server-Extension[/img] [img]https://img.shields.io/steam/downloads/2085786712[/img] [img]https://img.shields.io/steam/favorites/2085786712[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2085786712] [img]https://img.shields.io/steam/update-date/2085786712[/img] [img]https://img.shields.io/github/v/tag/GenZmeY/KF2-Server-Extension[/img][/url]

 [h1]Description:[/h1]
 [i]This mod replaces current perk system in Killing Floor 2 with a serverside perk progression with RPG elements, which let you buy individual stats and traits.
@ -88,7 +88,7 @@ SettingsInit=0[/b]
 [b][ServerExtMut.xVotingHandler]
 ConfigVersion=0[/b]

-[*]Put in [b]KFServerExt.ini[/b] this: [url=https://pastebin.com/raw/Wx3HYjkj]<PasteBin>[/url] [b](*)[/b]
+[*]Put in [b]KFServerExt.ini[/b] this: [url=https://gist.githubusercontent.com/GenZmeY/616b6f845f9829c93976f42f6c48505a/raw/1a8c8409d61a2908d5c854ced0932b8ed43a7f51/KFServerExt-Default.ini]<github gist>[/url] [b](*)[/b]

 [*]Start the game/server along with the ServerExt, then check the configs - content should be generated.
 [/olist]
@ -120,6 +120,7 @@ If you have a desire to help translate ServerExt into other languages, you can r
 [url=https://steamcommunity.com/profiles/76561197967822972]MilkTeaFox[/url] - Traditional Chinese [CHT];
 [url=https://steamcommunity.com/profiles/76561198930643117]あさぴっぴ1020[/url] - Japanese [JPN];
 [url=https://steamcommunity.com/profiles/76561198080866131]Jason Voorehes [/url] - Spanish [ESN];
+[url=https://steamcommunity.com/profiles/76561198200630473/]小曦曦[/url] - Simplified Chinese [CHN];

 [h1]Sources[/h1]
 [url=https://github.com/GenZmeY/KF2-Server-Extension]https://github.com/GenZmeY/KF2-Server-Extension[/url] [b](GNU GPLv3)[/b]
--- a/README.md
+++ b/README.md
@ -1,22 +1,22 @@
-[![](PublicationContent/mutbanner.png)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
+# Server Extension
+
+[![Banner](PublicationContent/mutbanner.png)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)

 [![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
-[![Steam Subscriptions](https://img.shields.io/steam/subscriptions/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
+[![Steam Downloads](https://img.shields.io/steam/downloads/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
 [![Steam Favorites](https://img.shields.io/steam/favorites/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
-[![Steam Update Date](https://img.shields.io/steam/update-date/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
+[![MegaLinter](https://github.com/GenZmeY/KF2-Server-Extension/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-Server-Extension/actions/workflows/mega-linter.yml)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/tags)
 [![GitHub top language](https://img.shields.io/github/languages/top/GenZmeY/KF2-Server-Extension)](https://docs.unrealengine.com/udk/Three/WebHome.html)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-Server-Extension)](LICENSE)

-[![ServerExt Contributors](https://contrib.rocks/image?repo=GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/graphs/contributors)
-
 ***

 *This mod replaces current perk system in [Killing Floor 2](https://en.wikipedia.org/wiki/Killing_Floor_2) with a serverside perk progression with RPG elements, which let you buy individual stats and traits.*

 *This is a further development of the ServerExt mutator from [Marco](https://forums.tripwireinteractive.com/index.php?threads/mutator-server-extension-mod.109463) and [Forrest Mark X](https://github.com/ForrestMarkX/KF2-Server-Extension).*

-# Features
+## Features
 - RPG elements (traits and stats);
 - New menu system;
 - Scoreboard that supports unlimited playercount on server;
@ -33,7 +33,7 @@ The full changelog is available on [steam workshop](https://steamcommunity.com/s

 **Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.

-# Build
+## Build
 1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
 2. open git-bash and go to any folder where you want to store ServerExt sources:  
 `cd <ANY_FOLDER_YOU_WANT>`  
@ -46,43 +46,27 @@ The full changelog is available on [steam workshop](https://steamcommunity.com/s
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`

-# Testing
-Open git-bash in the ServerExt source folder and run command:  
-`./tools/builder -t`  
-(or `./tools/builder -ct` if you haven't compiled the mutator yet)  
-
-A local single-user test will be launched with parameters from `builder.cfg` (edit this file if you want to test mutator with different parameters).
-
-# Using and configuring ServerExt
+## Using and configuring ServerExt
 A detailed manual is available on the [mod page](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) in the steam workshop.

-# Publication in steam workshop
-1. Modify the publish files if necessary, they are in the `PublicationContent`:
-> description.txt  
-> preview.png  
-> tags.txt  
-> title.txt  
-
-2. Run this command in the source folder: `./tools/builder -cbu`
-
-# Contributing
+## Contributing
 **Participation is welcome!**

-## Bug reports
+### Bug reports
 If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-Server-Extension/issues) and check if there is a description of your bug. If not, create a new issue.  
 Describe what the bug looks like and how we can reproduce it.  
 Attach screenshots if you think it might help.

-If it's a crash issue, be sure to include the `Launch.log` and `Launch_2.log` files. You can find them here:  
+If it's a crash issue, be sure to include the `Launch.log` file. You can find them here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Logs\`  
 Please note that these files are overwritten every time you start the game/server. Therefore, you must take these files immediately after the game crashes in order not to lose information.

-## Localization
+### Localization
 The mutator supports localization and you can help translate it into other languages.  
 It does not require any special knowledge or programming skills, so you just need to know the language into which you will translate.  
 Here's a quick guide on how to do it: [localization guide](https://steamcommunity.com/workshop/filedetails/discussion/2085786712/2942494909176752884)

-## Contribute code
+### Contribute code
 You can help improve ServerExt by fixing bugs and adding new features.  
 Before making a pull request, make sure that:  
 1. Your code is working correctly.  
@ -91,10 +75,27 @@ Before making a pull request, make sure that:
 In the description of the pull request, describe the changes you made.


-# License
-[GNU GPLv3](LICENSE)
+## Contributors
+[![ServerExt Contributors](https://contrib.rocks/image?repo=GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/graphs/contributors)
+
+[Marco](https://steamcommunity.com/profiles/76561197975509070)  
+[ForrestMarkX](https://steamcommunity.com/profiles/76561197997881512)  
+[inklesspen](https://steamcommunity.com/profiles/76561198143883210)  
+[GenZmeY](https://steamcommunity.com/profiles/76561198001617867)  
+[secret](https://steamcommunity.com/profiles/76561198042219365)  
+[Scaredkid93](https://steamcommunity.com/profiles/76561198004271210)  
+
+**Translators:**  
+[GenZmeY](https://steamcommunity.com/profiles/76561198001617867) - Russian [RUS];  
+[MilkTeaFox](https://steamcommunity.com/profiles/76561197967822972) - Traditional Chinese [CHT];  
+[あさぴっぴ1020](https://steamcommunity.com/profiles/76561198930643117) - Japanese [JPN];  
+[Jason Voorehes ](https://steamcommunity.com/profiles/76561198080866131) - Spanish [ESN];  
+[小曦曦](https://steamcommunity.com/profiles/76561198200630473) - Simplified Chinese [CHN].  
+
+## License
+[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)

 ***

 **Note about the banner:**  
-The cat in the picture is [meowbin](https://www.deviantart.com/cottonvalent/gallery/48815375/creepy-cat). And [Cotton Valent](https://www.deviantart.com/cottonvalent) is the artist who designed and painted this magnificent cat.
+The cat in the picture is [meowbin](https://twitter.com/meawbinneko). And [Cotton Valent](https://twitter.com/horrormove) is the artist who designed and painted this magnificent cat.
--- a/ServerExt/Classes/ExtAutoPurchaseHelper.uc
+++ b/ServerExt/Classes/ExtAutoPurchaseHelper.uc
@ -126,8 +126,8 @@ function SellOffPerkWeapons()

 function InitializeOwnedItemList()
 {
-   	local Inventory Inv;
-   	local KFWeapon KFW;
+	local Inventory Inv;
+	local KFWeapon KFW;
 	local KFPawn_Human KFP;
 	local Ext_PerkBase EP;

@ -142,14 +142,14 @@ function InitializeOwnedItemList()
 		// init armor purchase values
 		ArmorItem.SpareAmmoCount = KFP.Armor;
 		ArmorItem.MaxSpareAmmo = KFP.GetMaxArmor();
-	   	ArmorItem.AmmoPricePerMagazine = TraderItems.ArmorPrice * ActivePerkManager.GetArmorDiscountMod();
-	   	ArmorItem.DefaultItem.WeaponDef = TraderItems.ArmorDef;
+		ArmorItem.AmmoPricePerMagazine = TraderItems.ArmorPrice * ActivePerkManager.GetArmorDiscountMod();
+		ArmorItem.DefaultItem.WeaponDef = TraderItems.ArmorDef;

 		// init grenade purchase values
 		GrenadeItem.SpareAmmoCount = MyKFIM.GrenadeCount;
 		GrenadeItem.MaxSpareAmmo = ActivePerkManager.MaxGrenadeCount;
-	   	GrenadeItem.AmmoPricePerMagazine = TraderItems.GrenadePrice;
-	   	GrenadeItem.DefaultItem.WeaponDef = EP.GrenadeWeaponDef;
+		GrenadeItem.AmmoPricePerMagazine = TraderItems.GrenadePrice;
+		GrenadeItem.DefaultItem.WeaponDef = EP.GrenadeWeaponDef;

 		// @temp: fill in stuff that is normally serialized in the archetype
 		GrenadeItem.DefaultItem.AssociatedPerkClasses[0] = CurrentPerk.Class;
@ -161,7 +161,7 @@ function InitializeOwnedItemList()
 			{
 				// Set the weapon information and add it to the OwnedItemList
 				SetWeaponInformation(KFW);
-		 	}
+			}
 		}

 		if (MyGfxManager != none && MyGfxManager.TraderMenu != none)
@ -217,18 +217,18 @@ function int AddItemByPriority(out SItemInformation WeaponInfo)

 	// Add secondary ammo immediately after the main weapon
 	if (WeaponInfo.DefaultItem.WeaponDef.static.UsesSecondaryAmmo())
-   	{
-   		WeaponInfo.bIsSecondaryAmmo = true;
+	{
+		WeaponInfo.bIsSecondaryAmmo = true;
 		WeaponInfo.SellPrice = 0;
 		OwnedItemList.InsertItem(BestIndex + 1, WeaponInfo);
-   	}
+	}

 	if (MyGfxManager != none && MyGfxManager.TraderMenu != none)
 	{
 		MyGfxManager.TraderMenu.OwnedItemList = OwnedItemList;
 	}

-   	return BestIndex;
+	return BestIndex;
 }

 function bool CanCarry(const out STraderItem Item, optional int OverrideLevelValue = INDEX_NONE)
--- a/ServerExt/Classes/ExtCharDataInfo.uc
+++ b/ServerExt/Classes/ExtCharDataInfo.uc
@ -46,4 +46,5 @@ final function SaveData(FMyCustomChar R)

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtCharacterInfo.uc
+++ b/ServerExt/Classes/ExtCharacterInfo.uc
@ -64,7 +64,7 @@ static final function SetCharacterMeshFromArch(KFCharacterInfo_Human C, KFPawn K
 	if (KFPRI == none)
 	{
 		`Warn("Does not have a KFPRI" @ C);
-		 return;
+		return;
 	}
 	EPRI = ExtPlayerReplicationInfo(KFPRI);
 	bCustom = (EPRI!=None ? EPRI.UsesCustomChar() : false);
@ -341,7 +341,7 @@ static final function SetAttachmentMeshAndSkin(KFCharacterInfo_Human C,
 	// Since cosmetic attachments are optional, do not choose index 0 if none is
 	// specified unlike the the head and body meshes
 	if (C.CosmeticVariants.Length > 0 &&
-		 CurrentAttachmentMeshIndex < C.CosmeticVariants.Length)
+		CurrentAttachmentMeshIndex < C.CosmeticVariants.Length)
 	{
 		if (KFPRI.StartLoadCosmeticContent(C, ECOSMETICTYPE_Attachment, CurrentAttachmentMeshIndex))
 		{
@ -531,7 +531,7 @@ static final function DetachConflictingAttachments(KFCharacterInfo_Human C, int
 		return;

 	if (C.CosmeticVariants.length > 0 &&
-		 NewAttachmentMeshIndex < C.CosmeticVariants.length)
+		NewAttachmentMeshIndex < C.CosmeticVariants.length)
 	{
 		// The socket that this attachment requires
 		NewAttachmentSocketName = C.CosmeticVariants[NewAttachmentMeshIndex].AttachmentItem.SocketName;
@ -580,7 +580,7 @@ static final function SetFirstPersonArmsFromArch(KFCharacterInfo_Human C, KFPawn
 	if (KFPRI == none)
 	{
 		`Warn("Does not have a KFPRI" @ C);
-		 return;
+		return;
 	}
 	EPRI = ExtPlayerReplicationInfo(KFPRI);
 	bCustom = (EPRI!=None ? EPRI.UsesCustomChar() : false);
--- a/ServerExt/Classes/ExtDT_Ballistic_9mm.uc
+++ b/ServerExt/Classes/ExtDT_Ballistic_9mm.uc
@ -2,7 +2,7 @@ class ExtDT_Ballistic_9mm extends KFDT_Ballistic_9mm
 	abstract
 	hidedropdown;

-DefaultProperties
+defaultproperties
 {
 	ModifierPerkList(0) = class'KFPerk_Sharpshooter'
 	ModifierPerkList(1) = class'KFPerk_Gunslinger'
--- a/ServerExt/Classes/ExtDT_Ballistic_Pistol_Medic.uc
+++ b/ServerExt/Classes/ExtDT_Ballistic_Pistol_Medic.uc
@ -2,7 +2,7 @@ class ExtDT_Ballistic_Pistol_Medic extends KFDT_Ballistic_Pistol_Medic
 	abstract
 	hidedropdown;

-DefaultProperties
+defaultproperties
 {
 	ModifierPerkList(0) = class'KFPerk_Sharpshooter'
 	ModifierPerkList(1) = class'KFPerk_Gunslinger'
--- a/ServerExt/Classes/ExtExplosion_SirenScream.uc
+++ b/ServerExt/Classes/ExtExplosion_SirenScream.uc
@ -5,6 +5,7 @@ protected function SpecialCringeEffectsfor (Actor Victim, float VictimDist)
 	return;
 }

-DefaultProperties
+defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtHUD_ObjectiveConatiner.uc
+++ b/ServerExt/Classes/ExtHUD_ObjectiveConatiner.uc
@ -0,0 +1,28 @@
+class ExtHUD_ObjectiveConatiner extends KFGFxHUD_ObjectiveConatiner;
+
+simulated function SetActive(bool bActive)
+{
+	if (bActive)
+	{
+		Super.SetActive(bActive);
+	}
+	else
+	{
+		SetVisible(bActive);
+		CurrentObjectiveInterface = none;
+
+		// Fix:
+		// ScriptWarning: Accessed None
+		// KFGFxHUD_ObjectiveConatiner Transient.ExtMoviePlayer_HUD_0:KFGFxHUD_ObjectiveConatiner_0
+		// Function KFGame.KFGFxHUD_ObjectiveConatiner:SetActive:01D9
+		if (GetObject("objectiveNumberMC") != None)
+		{
+			GetObject("objectiveNumberMC").SetVisible(false);
+		}
+	}
+}
+
+DefaultProperties
+{
+
+}
--- a/ServerExt/Classes/ExtHUD_PlayerBackpack.uc
+++ b/ServerExt/Classes/ExtHUD_PlayerBackpack.uc
@ -29,6 +29,7 @@ function UpdateGrenades()
 	}
 }

-DefaultProperties
+defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtHUD_SpectatorInfo.uc
+++ b/ServerExt/Classes/ExtHUD_SpectatorInfo.uc
@ -44,4 +44,5 @@ function UpdatePlayerInfo(optional bool bForceUpdate)

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtHUD_WeaponSelectWidget.uc
+++ b/ServerExt/Classes/ExtHUD_WeaponSelectWidget.uc
@ -86,6 +86,7 @@ simulated function SetWeaponGroupList(out array<KFWeapon> WeaponList, byte Group
 	SetWeaponList(DataProvider, GroupIndex);
 }

-DefaultProperties
+defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtMenu_Gear.uc
+++ b/ServerExt/Classes/ExtMenu_Gear.uc
@ -2,7 +2,6 @@ class ExtMenu_Gear extends KFGFxObject_Menu;

 var ExtPlayerReplicationInfo ExtPRI;

-// var KFGFxObject_TraderItems TraderItems;
 var KFGFxGearContainer_PerksSelection PerkSelectionContainer;
 var KFCharacterInfo_Human CurrentCharInfo;
 var string CharInfoPath;
@ -19,7 +18,6 @@ function InitializeMenu(KFGFxMoviePlayer_Manager InManager)
 	LocalizeText();
 	EmoteList = class'ExtEmoteList'.static.GetEmoteArray();
 	InitCharacterMenu();
-	// TraderItems = KFGameReplicationInfo(GetPC().WorldInfo.GRI).TraderItems;
 }

 function InitCharacterMenu()
@ -69,7 +67,6 @@ function OnOpen()
 		return;

 	CheckForCustomizationPawn(PC);
-	//GetGameViewportClient().HandleInputAxis = OnAxisModified;

 	if (PC.PlayerReplicationInfo.bReadyToPlay && PC.WorldInfo.GRI.bMatchHasBegun)
 	{
--- a/ServerExt/Classes/ExtMenu_Inventory.uc
+++ b/ServerExt/Classes/ExtMenu_Inventory.uc
@ -62,4 +62,5 @@ function Callback_Equip(int ItemDefinition)

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtMoviePlayer_HUD.uc
+++ b/ServerExt/Classes/ExtMoviePlayer_HUD.uc
@ -93,6 +93,20 @@ final function ShowKillMessageX(PlayerReplicationInfo PRI1, PlayerReplicationInf
 	}
 }

+function UpdateObjectiveActive()
+{
+	// Fix:
+	// ScriptWarning: Accessed None 'KFGRI'
+	// ExtMoviePlayer_HUD Transient.ExtMoviePlayer_HUD_0
+	// Function KFGame.KFGFxMoviePlayer_HUD:UpdateObjectiveActive:00B7
+	if (GetPC() == None || KFGameReplicationInfo(GetPC().WorldInfo.GRI) == None)
+	{
+		return;
+	}
+
+	Super.UpdateObjectiveActive();
+}
+
 defaultproperties
 {
 	WidgetBindings.Remove((WidgetName="SpectatorInfoWidget",WidgetClass=class'KFGFxHUD_SpectatorInfo'))
@ -103,4 +117,6 @@ defaultproperties
 	WidgetBindings.Add((WidgetName="PlayerBackpackWidget",WidgetClass=class'ExtHUD_PlayerBackpack'))
 	WidgetBindings.Remove((WidgetName="WeaponSelectContainer",WidgetClass=class'KFGFxHUD_WeaponSelectWidget'))
 	WidgetBindings.Add((WidgetName="WeaponSelectContainer",WidgetClass=class'ExtHUD_WeaponSelectWidget'))
+	WidgetBindings.Remove((WidgetName="ObjectiveContainer",WidgetClass=class'KFGFxHUD_ObjectiveConatiner'))
+	WidgetBindings.Add((WidgetName="ObjectiveContainer",WidgetClass=class'ExtHUD_ObjectiveConatiner'))
 }
--- a/ServerExt/Classes/ExtMoviePlayer_Manager.uc
+++ b/ServerExt/Classes/ExtMoviePlayer_Manager.uc
@ -111,6 +111,22 @@ function OnMenuOpen(name WidgetPath, KFGFxObject_Menu Widget)
 		PerksMenu.ActionScriptVoid("closeContainer");
 }

+event OnClose()
+{
+	// Fix:
+	// ScriptWarning: Accessed None 'CurrentBackgroundMovie'
+	// ExtMoviePlayer_Manager KF-BIOTICSLAB.TheWorld:PersistentLevel.ExtPlayerController_0.ExtMoviePlayer_Manager_0
+	// Function KFGame.KFGFxMoviePlayer_Manager:OnClose:0039
+	if (CurrentBackgroundMovie != None)
+	{
+		Super.OnClose();
+	}
+	else
+	{
+		CloseMenus();
+	}
+}
+
 defaultproperties
 {
 	InGamePartyWidgetClass=class'ExtWidget_PartyInGame'
--- a/ServerExt/Classes/ExtPawn_Customization.uc
+++ b/ServerExt/Classes/ExtPawn_Customization.uc
@ -98,7 +98,6 @@ function AttachWeaponByItemDefinition(int ItemDefinition)

 	//setweapon skin
 	WeaponAttachment.SetWeaponSkin(ItemDefinition);
-	
 }

 defaultproperties
--- a/ServerExt/Classes/ExtPawn_ZedHans_Pet.uc
+++ b/ServerExt/Classes/ExtPawn_ZedHans_Pet.uc
@ -7,4 +7,5 @@ static simulated event bool IsABoss()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtPerkManager.uc
+++ b/ServerExt/Classes/ExtPerkManager.uc
@ -7,7 +7,6 @@ Class ExtPerkManager extends KFPerk;
 enum EReplicateState
 {
 	REP_CustomCharacters,
-	REP_CustomInventory,
 	REP_PerkClasses,
 	REP_Done
 };
@ -451,14 +450,6 @@ function ReplicateTimer()
 			++RepIndex;
 		}
 		break;
-	case REP_CustomInventory: // Replicate custom trader inventory
-		if (!PRIOwner.OnRepNextItem(PRIOwner,RepIndex))
-		{
-			RepIndex = 0;
-			++RepState;
-		}
-		else ++RepIndex;
-		break;
 	case REP_PerkClasses: // Open up all actor channel connections.
 		if (RepIndex>=UserPerks.Length)
 		{
@ -901,7 +892,7 @@ simulated function float GetPenetrationModifier(byte Level, class<KFDamageType>

 simulated function float GetTightChokeModifier()
 {
-    return (CurrentPerk!=None ? CurrentPerk.GetTightChokeModifier() : 1.f);
+	return (CurrentPerk!=None ? CurrentPerk.GetTightChokeModifier() : 1.f);
 }

 // SwitchSpeed
--- a/ServerExt/Classes/ExtPerksContainer_Selection.uc
+++ b/ServerExt/Classes/ExtPerksContainer_Selection.uc
@ -4,7 +4,7 @@ var localized string PerkChangeWarning;

 function UpdatePerkSelection(byte SelectedPerkIndex)
 {
- 	local int i;
+	local int i;
 	local GFxObject DataProvider;
 	local GFxObject TempObj;
 	local ExtPlayerController KFPC;
@ -14,7 +14,7 @@ function UpdatePerkSelection(byte SelectedPerkIndex)

 	if (KFPC!=none && KFPC.ActivePerkManager!=None)
 	{
-	   	DataProvider = CreateArray();
+		DataProvider = CreateArray();

 		for (i = 0; i < KFPC.ActivePerkManager.UserPerks.Length; i++)
 		{
--- a/ServerExt/Classes/ExtPlayerReplicationInfo.uc
+++ b/ServerExt/Classes/ExtPlayerReplicationInfo.uc
@ -18,13 +18,6 @@ struct FMyCustomChar // Now without constant.
 	}
 };

-// For custom trader inventory.
-struct FCustomTraderItem
-{
-	var class<KFWeaponDefinition> WeaponDef;
-	var class<KFWeapon> WeaponClass;
-};
-
 var bool bIsMuted,bInitialPT,bIsDev,bHiddenUser,bClientUseCustom,bClientFirstChar,bClientCharListDone,bClientInitChars;

 enum E_AdminType
@ -58,10 +51,6 @@ var repnotify FMyCustomChar CustomCharacter;
 var transient array<ExtCharDataInfo> SaveDataObjects;
 var transient ExtPlayerReplicationInfo LocalOwnerPRI; // Local playercontroller owner PRI

-// Custom trader inventory
-var KFGFxObject_TraderItems CustomList;
-var array<FCustomTraderItem> CustomItems;
-
 // Supplier data:
 var transient struct FSupplierData
 {
@ -237,98 +226,6 @@ function UnsetPT()
 	bInitialPT = false;
 }

-Delegate bool OnRepNextItem(ExtPlayerReplicationInfo PRI, int RepIndex)
-{
-	return false;
-}
-
-simulated reliable client function ClientAddTraderItem(int Index, FCustomTraderItem Item)
-{
-	// Make sure to not execute on server.
-	if (WorldInfo.NetMode!=NM_Client && (PlayerController(Owner)==None || LocalPlayer(PlayerController(Owner).Player)==None))
-		return;
-
-	if (CustomList==None)
-	{
-		CustomList = CreateNewList();
-		RecheckGRI();
-	}
-	CustomItems.AddItem(Item);
-	SetWeaponInfo(false,Index,Item,CustomList);
-}
-
-simulated static final function KFGFxObject_TraderItems CreateNewList()
-{
-	local KFGFxObject_TraderItems L;
-	
-	L = new class'KFGFxObject_TraderItems';
-	L.SaleItems = L.Default.SaleItems;
-	L.ArmorPrice = L.Default.ArmorPrice;
-	L.GrenadePrice = L.Default.GrenadePrice;
-
-	return L;
-}
-
-simulated static final function SetWeaponInfo(bool bDedicated, int Index, FCustomTraderItem Item, KFGFxObject_TraderItems List)
-{
-	local array<STraderItemWeaponStats> S;
-	local int i;
-
-	if (List.SaleItems.Length<=Index)
-		List.SaleItems.Length = Index+1;
-
-	List.SaleItems[Index].WeaponDef = Item.WeaponDef;
-	List.SaleItems[Index].ClassName = Item.WeaponClass.Name;
-	if (class<KFWeap_DualBase>(Item.WeaponClass)!=None && class<KFWeap_DualBase>(Item.WeaponClass).Default.SingleClass!=None)
-		List.SaleItems[Index].SingleClassName = class<KFWeap_DualBase>(Item.WeaponClass).Default.SingleClass.Name;
-	else List.SaleItems[Index].SingleClassName = '';
-	List.SaleItems[Index].DualClassName = Item.WeaponClass.Default.DualClass!=None ? Item.WeaponClass.Default.DualClass.Name : '';
-	List.SaleItems[Index].AssociatedPerkClasses = Item.WeaponClass.Static.GetAssociatedPerkClasses();
-	List.SaleItems[Index].MaxSpareAmmo = Item.WeaponClass.Default.SpareAmmoCapacity[0];
-	List.SaleItems[Index].MagazineCapacity = Item.WeaponClass.Default.MagazineCapacity[0];
-	List.SaleItems[Index].InitialSpareMags = Item.WeaponClass.Default.InitialSpareMags[0];
-	List.SaleItems[Index].MaxSecondaryAmmo = Item.WeaponClass.Default.MagazineCapacity[1] * Item.WeaponClass.Default.SpareAmmoCapacity[1];
-	List.SaleItems[Index].BlocksRequired = Item.WeaponClass.Default.InventorySize;
-	List.SaleItems[Index].ItemID = Index;
-
-	List.SaleItems[Index].InitialSecondaryAmmo = Item.WeaponClass.Default.InitialSpareMags[1];
-	List.SaleItems[Index].WeaponUpgradeDmgMultiplier[0] = 1.0;
-	for (i = 0;i<Min(Item.WeaponClass.Default.WeaponUpgrades.Length, 5);i++)
-	{
-		List.SaleItems[Index].WeaponUpgradeWeight[i+1] = Item.WeaponClass.Static.GetUpgradeStatAdd(EWUS_Weight, i+1);
-		List.SaleItems[Index].WeaponUpgradeDmgMultiplier[i+1] = Item.WeaponClass.Static.GetUpgradeStatScale(EWUS_Damage0, i+1);
-	}
-
-	if (!bDedicated)
-	{
-		List.SaleItems[Index].SecondaryAmmoImagePath = Item.WeaponClass.Default.SecondaryAmmoTexture!=None ? PathName(Item.WeaponClass.Default.SecondaryAmmoTexture) : "UI_SecondaryAmmo_TEX.GasTank";
-		List.SaleItems[Index].TraderFilter = Item.WeaponClass.Static.GetTraderFilter();
-		List.SaleItems[Index].InventoryGroup = Item.WeaponClass.Default.InventoryGroup;
-		List.SaleItems[Index].GroupPriority = Item.WeaponClass.Default.GroupPriority;
-		Item.WeaponClass.Static.SetTraderWeaponStats(S);
-		List.SaleItems[Index].WeaponStats = S;
-	}
-}
-
-simulated function RecheckGRI()
-{
-	local ExtPlayerController PC;
-
-	if (KFGameReplicationInfo(WorldInfo.GRI)==None)
-		SetTimer(0.1,false,'RecheckGRI');
-	else
-	{
-		KFGameReplicationInfo(WorldInfo.GRI).TraderItems = CustomList;
-		foreach LocalPlayerControllers(class'ExtPlayerController',PC)
-		{
-			if (PC.PurchaseHelper!=None)
-			{
-				PC.PurchaseHelper.TraderItems = CustomList;
-			}
-		}
-	}
-}
-
 simulated final function bool ShowAdminName()
 {
 	return (bAdmin || AdminType < AT_Player);
@ -842,6 +739,6 @@ event BeginState(Name N)
 defaultproperties
 {
 	RespawnCounter=-1
-	AdminType=255
+	AdminType=AT_Player
 	TaggedPlayerName="Player"
 }
--- a/ServerExt/Classes/ExtSM_Player_Emote.uc
+++ b/ServerExt/Classes/ExtSM_Player_Emote.uc
@ -45,6 +45,7 @@ function PlayAnimation()
 	}
 }

-DefaultProperties
+defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtSM_Siren_Scream.uc
+++ b/ServerExt/Classes/ExtSM_Siren_Scream.uc
@ -5,7 +5,7 @@ function SpawnProjectileShield()
 	return;
 }

-DefaultProperties
+defaultproperties
 {
 	ExplosionActorClass=class'ExtExplosion_SirenScream'

--- a/ServerExt/Classes/ExtTraderContainer_Filter.uc
+++ b/ServerExt/Classes/ExtTraderContainer_Filter.uc
@ -2,7 +2,7 @@ class ExtTraderContainer_Filter extends KFGFxTraderContainer_Filter;

 function SetPerkFilterData(byte FilterIndex)
 {
- 	local int i;
+	local int i;
 	local GFxObject DataProvider;
 	local GFxObject FilterObject;
 	local ExtPlayerController KFPC;
@ -31,7 +31,7 @@ function SetPerkFilterData(byte FilterIndex)
 				SetString("filterText", OffPerkString);
 			}

-		   	DataProvider = CreateArray();
+			DataProvider = CreateArray();
 			for (i = 0; i < PrM.UserPerks.Length; i++)
 			{
 				FilterObject = CreateObject("Object");
--- a/ServerExt/Classes/ExtTraderContainer_PlayerInfo.uc
+++ b/ServerExt/Classes/ExtTraderContainer_PlayerInfo.uc
@ -10,11 +10,11 @@ function SetPerkInfo()
 	if (KFPC!=none && KFPC.ActivePerkManager!=None && KFPC.ActivePerkManager.CurrentPerk!=None)
 	{
 		CurrentPerk = KFPC.ActivePerkManager.CurrentPerk;
- 		SetString("perkName", CurrentPerk.PerkName);
- 		SetString("perkIconPath", CurrentPerk.GetPerkIconPath(CurrentPerk.CurrentLevel));
- 		SetInt("perkLevel", CurrentPerk.CurrentLevel);
+		SetString("perkName", CurrentPerk.PerkName);
+		SetString("perkIconPath", CurrentPerk.GetPerkIconPath(CurrentPerk.CurrentLevel));
+		SetInt("perkLevel", CurrentPerk.CurrentLevel);
 		V = CurrentPerk.GetProgressPercent()*100.f;
- 		SetInt("xpBarValue", int(V));
+		SetInt("xpBarValue", int(V));
 	}
 }

@ -52,4 +52,5 @@ function SetPerkList()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/ExtTraderContainer_Store.uc
+++ b/ServerExt/Classes/ExtTraderContainer_Store.uc
@ -12,7 +12,7 @@ function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
 	if ( Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted( Item.WeaponDef.default.PlatformRestriction ) )
 		return true;

-   	return false;
+	return false;
 }

 function RefreshWeaponListByPerk(byte FilterIndex, const out array<STraderItem> ItemList)
--- a/ServerExt/Classes/ExtWeapDef_9mm.uc
+++ b/ServerExt/Classes/ExtWeapDef_9mm.uc
@ -1,7 +1,7 @@
 class ExtWeapDef_9mm extends KFWeapDef_9mm
 	abstract;

-DefaultProperties
+defaultproperties
 {
 	// Set free ammo
 	AmmoPricePerMag=0
--- a/ServerExt/Classes/ExtWeapDef_MedicPistol.uc
+++ b/ServerExt/Classes/ExtWeapDef_MedicPistol.uc
@ -1,7 +1,7 @@
 class ExtWeapDef_MedicPistol extends KFWeapDef_MedicPistol
 	abstract;

-DefaultProperties
+defaultproperties
 {
 	// Unsellable weapon
 	BuyPrice=0
--- a/ServerExt/Classes/ExtWeaponSkinList.uc
+++ b/ServerExt/Classes/ExtWeaponSkinList.uc
@ -2,11 +2,11 @@ class ExtWeaponSkinList extends Object;

 struct WeaponSkin
 {
-	var int 	Id;
+	var int	Id;

-	var array<string> 	MIC_1P;
-	var string 			MIC_3P;
-	var string  		MIC_Pickup;
+	var array<string>	MIC_1P;
+	var string			MIC_3P;
+	var string 		MIC_Pickup;

 	var class<KFWeaponDefinition> WeaponDef;
 };
@ -87,12 +87,12 @@ defaultproperties
 {
 //Anodized Hazard AR15
 	Skins.Add((Id=3001, Weapondef=class'KFWeapDef_AR15', MIC_1P=("WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_1P_Mint_MIC"), MIC_3P="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_Pickup_MIC"))
- 	Skins.Add((Id=3002, Weapondef=class'KFWeapDef_AR15', MIC_1P=("WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_Pickup_MIC"))
+	Skins.Add((Id=3002, Weapondef=class'KFWeapDef_AR15', MIC_1P=("WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_Pickup_MIC"))
 	Skins.Add((Id=3003, Weapondef=class'KFWeapDef_AR15', MIC_1P=("WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet01_MAT.anodizedhazard_ar15.AnodizedHazard_AR15_3P_Pickup_MIC"))

 //Airlock 9mm
 	Skins.Add((Id=3004, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_1P_Mint_MIC"), MIC_3P="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_Pickup_MIC"))
- 	Skins.Add((Id=3005, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_Pickup_MIC"))
+	Skins.Add((Id=3005, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_Pickup_MIC"))
 	Skins.Add((Id=3006, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet01_MAT.airlock_9mm.Airlock_9MM_3P_Pickup_MIC"))

 //Aeronaut Bullpup
@ -102,17 +102,17 @@ defaultproperties

 //Woodland AA12
 	Skins.Add((Id=3010, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_Pickup_MIC"))
- 	Skins.Add((Id=3011, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_Pickup_MIC"))
+	Skins.Add((Id=3011, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_Pickup_MIC"))
 	Skins.Add((Id=3012, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_aa12.Woodland_AA12_3P_Pickup_MIC"))

 //Woodland Boomstick
 	Skins.Add((Id=3013, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_1P_Mint_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_Mint_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_Pickup_MIC"))
- 	Skins.Add((Id=3014, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_Pickup_MIC"))
+	Skins.Add((Id=3014, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_Pickup_MIC"))
 	Skins.Add((Id=3015, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_doublebarrel.Woodland_DoubleBarrel_3P_Pickup_MIC"))

 //Woodland L85A2
 	Skins.Add((Id=3016, Weapondef=class'KFWeapDef_Bullpup', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_1P_Mint_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Mint_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Pickup_MIC"))
- 	Skins.Add((Id=3017, Weapondef=class'KFWeapDef_Bullpup', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Mint_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Pickup_MIC"))
+	Skins.Add((Id=3017, Weapondef=class'KFWeapDef_Bullpup', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Mint_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Pickup_MIC"))
 	Skins.Add((Id=3018, Weapondef=class'KFWeapDef_Bullpup', MIC_1P=("WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSetPSN03_MAT.woodland_bullpup.Woodland_Bullpup_3P_Pickup_MIC"))

 //Woodland Scar
@ -863,7 +863,7 @@ defaultproperties

 //Victorian Double Barrel
 	Skins.Add((Id=4047, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_1P_Mint_MIC"), MIC_3P="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_Pickup_MIC"))
- 	Skins.Add((Id=4046, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_Pickup_MIC"))
+	Skins.Add((Id=4046, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_Pickup_MIC"))
 	Skins.Add((Id=4045, Weapondef=class'KFWeapDef_DoubleBarrel', MIC_1P=("WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet06_MAT.victorian_doublebarrel.Victorian_DoubleBarrel_3P_Pickup_MIC"))

 //Victorian M4
@ -920,7 +920,7 @@ defaultproperties

 //Tactical AA12
 	Skins.Add((Id=4460, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_Pickup_MIC"))
- 	Skins.Add((Id=4459, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_Pickup_MIC"))
+	Skins.Add((Id=4459, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_Pickup_MIC"))
 	Skins.Add((Id=4458, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet07_MAT.tactical_aa12.Tactical_AA12_3P_Pickup_MIC"))

 //Tactical AK12
@ -980,92 +980,92 @@ defaultproperties

 //Deepstrike 9mm
 	Skins.Add((Id=4359, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_Pickup_MIC"))
- 	Skins.Add((Id=4358, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_Pickup_MIC"))
+	Skins.Add((Id=4358, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_Pickup_MIC"))
 	Skins.Add((Id=4357, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_9mm.Deepstrike_9mm_3P_Pickup_MIC"))

 //Deepstrike Crossbow
 	Skins.Add((Id=4362, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_1P_Mint_MIC", "WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_Pickup_MIC"))
- 	Skins.Add((Id=4361, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_Pickup_MIC"))
+	Skins.Add((Id=4361, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_Pickup_MIC"))
 	Skins.Add((Id=4360, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_crossbow.Deepstrike_Crossbow_3P_Pickup_MIC"))

 //Deepstrike Desert Eagle
 	Skins.Add((Id=4365, Weapondef=class'KFWeapDef_Deagle', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_Pickup_MIC"))
- 	Skins.Add((Id=4364, Weapondef=class'KFWeapDef_Deagle', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_Pickup_MIC"))
+	Skins.Add((Id=4364, Weapondef=class'KFWeapDef_Deagle', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_Pickup_MIC"))
 	Skins.Add((Id=4363, Weapondef=class'KFWeapDef_Deagle', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_deagle.Deepstrike_Deagle_3P_Pickup_MIC"))

 //Deepstrike Winchester 1894
 	Skins.Add((Id=4368, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_Pickup_MIC"))
- 	Skins.Add((Id=4367, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_Pickup_MIC"))
+	Skins.Add((Id=4367, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_Pickup_MIC"))
 	Skins.Add((Id=4366, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_lar.Deepstrike_LAR_3P_Pickup_MIC"))

 //Deepstrike M79
 	Skins.Add((Id=4371, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_Pickup_MIC"))
- 	Skins.Add((Id=4370, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_Pickup_MIC"))
+	Skins.Add((Id=4370, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_Pickup_MIC"))
 	Skins.Add((Id=4369, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_m79.Deepstrike_M79_3P_Pickup_MIC"))

 //Deepstrike RPG7
 	Skins.Add((Id=4374, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_Pickup_MIC"))
- 	Skins.Add((Id=4373, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_Pickup_MIC"))
+	Skins.Add((Id=4373, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_Pickup_MIC"))
 	Skins.Add((Id=4372, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_rpg7.Deepstrike_RPG7_3P_Pickup_MIC"))

 //Deepstrike SCAR
 	Skins.Add((Id=4377, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_1P_Mint_MIC", "WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_Pickup_MIC"))
- 	Skins.Add((Id=4376, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_Pickup_MIC"))
+	Skins.Add((Id=4376, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_Pickup_MIC"))
 	Skins.Add((Id=4375, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.deepstrike_scar.Deepstrike_SCAR_3P_Pickup_MIC"))

 //Horzine Elite Blue Kriss
 	Skins.Add((Id=4572, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_1P_Mint_MIC", "WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=4571, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=4571, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=4570, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineeliteblue_kriss.HorzineEliteBlue_Kriss_3P_Pickup_MIC"))

 //Horzine Elite Green Kriss
 	Skins.Add((Id=4575, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_1P_Mint_MIC", "WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=4574, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=4574, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=4573, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitegreen_kriss.HorzineEliteGreen_Kriss_3P_Pickup_MIC"))

 //Horzine Elite Red Kriss
 	Skins.Add((Id=4578, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_1P_Mint_MIC", "WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=4577, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=4577, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=4576, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitered_kriss.HorzineEliteRed_Kriss_3P_Pickup_MIC"))

 //Horzine Elite White Kriss
 	Skins.Add((Id=4581, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_1P_Mint_MIC", "WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=4580, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=4580, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_1P_FieldTested_MIC", "WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=4579, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_1P_BattleScarred_MIC", "WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet09_MAT.horzineelitewhite_kriss.HorzineEliteWhite_Kriss_3P_Pickup_MIC"))

 //Industrial Crossbow
 	Skins.Add((Id=4720, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_1P_Mint_MIC", "WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_Pickup_MIC"))
- 	Skins.Add((Id=4719, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_Pickup_MIC"))
+	Skins.Add((Id=4719, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_Pickup_MIC"))
 	Skins.Add((Id=4718, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_1P_BattleScarred_MIC", "WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_crossbow.Industrial_Crossbow_3P_Pickup_MIC"))

 //Shredder (Industrial) Kriss
 	Skins.Add((Id=4723, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=4722, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=4722, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=4721, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_kriss.Industrial_Kriss_3P_Pickup_MIC"))

 //Industrial M14EBR
 	Skins.Add((Id=4726, Weapondef=class'KFWeapDef_M14EBR', MIC_1P=("WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_1P_Mint_MIC", "WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_Pickup_MIC"))
- 	Skins.Add((Id=4725, Weapondef=class'KFWeapDef_M14EBR', MIC_1P=("WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_Pickup_MIC"))
+	Skins.Add((Id=4725, Weapondef=class'KFWeapDef_M14EBR', MIC_1P=("WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_Pickup_MIC"))
 	Skins.Add((Id=4724, Weapondef=class'KFWeapDef_M14EBR', MIC_1P=("WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_1P_BattleScarred_MIC", "WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_m14ebr.Industrial_M14EBR_3P_Pickup_MIC"))

 //Industrial MP5RAS
 	Skins.Add((Id=4729, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=4728, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=4728, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=4727, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp5ras.Industrial_MP5RAS_3P_Pickup_MIC"))

 //Jackhammer (Industrial) MP7
 	Skins.Add((Id=4732, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_1P_Mint_MIC", "WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_Pickup_MIC"))
- 	Skins.Add((Id=4731, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_Pickup_MIC"))
+	Skins.Add((Id=4731, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_Pickup_MIC"))
 	Skins.Add((Id=4730, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_1P_BattleScarred_MIC", "WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_mp7.Industrial_MP7_3P_Pickup_MIC"))

 //Buzzsaw (Industrial) P90
 	Skins.Add((Id=4735, Weapondef=class'KFWeapDef_P90', MIC_1P=("WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_1P_Mint_MIC", "WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_Pickup_MIC"))
- 	Skins.Add((Id=4734, Weapondef=class'KFWeapDef_P90', MIC_1P=("WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_Pickup_MIC"))
+	Skins.Add((Id=4734, Weapondef=class'KFWeapDef_P90', MIC_1P=("WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_Pickup_MIC"))
 	Skins.Add((Id=4733, Weapondef=class'KFWeapDef_P90', MIC_1P=("WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_1P_BattleScarred_MIC", "WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_p90.Industrial_P90_3P_Pickup_MIC"))

 //High Voltage (Industrial) Railgun
 	Skins.Add((Id=4738, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_1P_Mint_MIC", "WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_Pickup_MIC"))
- 	Skins.Add((Id=4737, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_Pickup_MIC"))
+	Skins.Add((Id=4737, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_1P_FieldTested_MIC", "WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_Pickup_MIC"))
 	Skins.Add((Id=4736, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_1P_BattleScarred_MIC", "WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet10_MAT.industrial_railgun.Industrial_RailGun_3P_Pickup_MIC"))

 //Industrial SW500
@ -1162,7 +1162,7 @@ defaultproperties

 //Junkyard AA12
 	Skins.Add((Id=4614, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_Pickup_MIC"))
- 	Skins.Add((Id=4613, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_Pickup_MIC"))
+	Skins.Add((Id=4613, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_Pickup_MIC"))
 	Skins.Add((Id=4612, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_aa12.Junkyard_AA12_3P_Pickup_MIC"))

 //Junkyard AK12
@ -1192,12 +1192,12 @@ defaultproperties

 //Junkyard M4
 	Skins.Add((Id=4626, Weapondef=class'KFWeapDef_M4', MIC_1P=("WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_1P_Mint_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_Pickup_MIC"))
- 	Skins.Add((Id=4625, Weapondef=class'KFWeapDef_M4', MIC_1P=("WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_Pickup_MIC"))
+	Skins.Add((Id=4625, Weapondef=class'KFWeapDef_M4', MIC_1P=("WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_Pickup_MIC"))
 	Skins.Add((Id=4624, Weapondef=class'KFWeapDef_M4', MIC_1P=("WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_m4.Junkyard_M4_3P_Pickup_MIC"))

 //Junkyard MP5RAS
 	Skins.Add((Id=4629, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=4628, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=4628, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=4627, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_mp5ras.Junkyard_MP5RAS_3P_Pickup_MIC"))

 //Junkyard SCAR
@ -1207,7 +1207,7 @@ defaultproperties

 //Junkyard Winchester 1894
 	Skins.Add((Id=4635, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_1P_Mint_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_Pickup_MIC"))
- 	Skins.Add((Id=4634, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_Pickup_MIC"))
+	Skins.Add((Id=4634, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_Pickup_MIC"))
 	Skins.Add((Id=4633, Weapondef=class'KFWeapDef_Winchester1894', MIC_1P=("WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet13_MAT.junkyard_winchester1894.Junkyard_Winchester1894_3P_Pickup_MIC"))

 //Headshot Weekly Centerfire
@ -1215,117 +1215,117 @@ defaultproperties

 //Horzine Elite White MP5RAS
 	Skins.Add((Id=5033, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5032, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=5032, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=5031, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitewhite_mp5ras.HorzineEliteWhite_MP5RAS_3P_Pickup_MIC"))

 //Horzine Elite Black MP5RAS
 	Skins.Add((Id=5036, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5035, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=5035, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=5034, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblack_mp5ras.HorzineEliteBlack_MP5RAS_3P_Pickup_MIC"))

 //Horzine Elite Green MP5RAS
 	Skins.Add((Id=5039, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5038, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=5038, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=5037, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitegreen_mp5ras.HorzineEliteGreen_MP5RAS_3P_Pickup_MIC"))

 //Horzine Elite Blue MP5RAS
 	Skins.Add((Id=5042, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5041, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=5041, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=5040, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineeliteblue_mp5ras.HorzineEliteBlue_MP5RAS_3P_Pickup_MIC"))

 //Horzine Elite Red MP5RAS
 	Skins.Add((Id=5045, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_1P_Mint_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5044, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_Pickup_MIC"))
+	Skins.Add((Id=5044, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_Pickup_MIC"))
 	Skins.Add((Id=5043, Weapondef=class'KFWeapDef_MP5RAS', MIC_1P=("WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet15_MAT.horzineelitered_mp5ras.HorzineEliteRed_MP5RAS_3P_Pickup_MIC"))

 //Halloween 9mm
 	Skins.Add((Id=5115, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_Pickup_MIC"))
- 	Skins.Add((Id=5114, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_Pickup_MIC"))
+	Skins.Add((Id=5114, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_Pickup_MIC"))
 	Skins.Add((Id=5113, Weapondef=class'KFWeapDef_9mm', MIC_1P=("WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_9mm.Halloween_9MM_3P_Pickup_MIC"))

 //Halloween Crossbow
 	Skins.Add((Id=5118, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_Pickup_MIC"))
- 	Skins.Add((Id=5117, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_Pickup_MIC"))
+	Skins.Add((Id=5117, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_Pickup_MIC"))
 	Skins.Add((Id=5116, Weapondef=class'KFWeapDef_Crossbow', MIC_1P=("WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_crossbow.Halloween_Crossbow_3P_Pickup_MIC"))

 //Halloween Flamethrower
 	Skins.Add((Id=5121, Weapondef=class'KFWeapDef_FlameThrower', MIC_1P=("WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_Pickup_MIC"))
- 	Skins.Add((Id=5120, Weapondef=class'KFWeapDef_FlameThrower', MIC_1P=("WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_Pickup_MIC"))
+	Skins.Add((Id=5120, Weapondef=class'KFWeapDef_FlameThrower', MIC_1P=("WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_Pickup_MIC"))
 	Skins.Add((Id=5119, Weapondef=class'KFWeapDef_FlameThrower', MIC_1P=("WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_flamethrower.Halloween_Flamethrower_3P_Pickup_MIC"))

 //Halloween Healer
 	Skins.Add((Id=5124, Weapondef=class'KFWeapDef_Healer', MIC_1P=("WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_Pickup_MIC"))
- 	Skins.Add((Id=5123, Weapondef=class'KFWeapDef_Healer', MIC_1P=("WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_Pickup_MIC"))
+	Skins.Add((Id=5123, Weapondef=class'KFWeapDef_Healer', MIC_1P=("WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_Pickup_MIC"))
 	Skins.Add((Id=5122, Weapondef=class'KFWeapDef_Healer', MIC_1P=("WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_healer.Halloween_Healer_3P_Pickup_MIC"))

 //Halloween HZ12
 	Skins.Add((Id=5127, Weapondef=class'KFWeapDef_HZ12', MIC_1P=("WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_Pickup_MIC"))
- 	Skins.Add((Id=5126, Weapondef=class'KFWeapDef_HZ12', MIC_1P=("WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_Pickup_MIC"))
+	Skins.Add((Id=5126, Weapondef=class'KFWeapDef_HZ12', MIC_1P=("WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_Pickup_MIC"))
 	Skins.Add((Id=5125, Weapondef=class'KFWeapDef_HZ12', MIC_1P=("WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_hz12.Halloween_HZ12_3P_Pickup_MIC"))

 //Halloween Katana
 	Skins.Add((Id=5130, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_Pickup_MIC"))
- 	Skins.Add((Id=5129, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_Pickup_MIC"))
+	Skins.Add((Id=5129, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_Pickup_MIC"))
 	Skins.Add((Id=5128, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_katana.Halloween_Katana_3P_Pickup_MIC"))

 //Halloween Kriss
 	Skins.Add((Id=5133, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_Pickup_MIC"))
- 	Skins.Add((Id=5132, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_Pickup_MIC"))
+	Skins.Add((Id=5132, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_Pickup_MIC"))
 	Skins.Add((Id=5131, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_kriss.Halloween_Kriss_3P_Pickup_MIC"))

 //Halloween M79
 	Skins.Add((Id=5136, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_Pickup_MIC"))
- 	Skins.Add((Id=5135, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_Pickup_MIC"))
+	Skins.Add((Id=5135, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_Pickup_MIC"))
 	Skins.Add((Id=5134, Weapondef=class'KFWeapDef_M79', MIC_1P=("WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_m79.Halloween_M79_3P_Pickup_MIC"))

 //Halloween Stoner 63A
 	Skins.Add((Id=5139, Weapondef=class'KFWeapDef_Stoner63A', MIC_1P=("WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_1P_Mint_MIC", "WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_Receiver_1P_Mint_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_Pickup_MIC"))
- 	Skins.Add((Id=5138, Weapondef=class'KFWeapDef_Stoner63A', MIC_1P=("WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_1P_FieldTested_MIC", "WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_Receiver_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_Pickup_MIC"))
+	Skins.Add((Id=5138, Weapondef=class'KFWeapDef_Stoner63A', MIC_1P=("WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_1P_FieldTested_MIC", "WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_Receiver_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_Pickup_MIC"))
 	Skins.Add((Id=5137, Weapondef=class'KFWeapDef_Stoner63A', MIC_1P=("WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_1P_BattleScarred_MIC", "WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_Receiver_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet14_MAT.halloween_stoner63a.Halloween_Stoner63a_3P_Pickup_MIC"))

 //Neon MB500
 	Skins.Add((Id=5160, Weapondef=class'KFWeapDef_MB500', MIC_1P=("WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_Pickup_MIC"))
- 	Skins.Add((Id=5159, Weapondef=class'KFWeapDef_MB500', MIC_1P=("WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_Pickup_MIC"))
+	Skins.Add((Id=5159, Weapondef=class'KFWeapDef_MB500', MIC_1P=("WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_Pickup_MIC"))
 	Skins.Add((Id=5158, Weapondef=class'KFWeapDef_MB500', MIC_1P=("WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_mb500.Neon_MB500_3P_Pickup_MIC"))

 //Neon Railgun
 	Skins.Add((Id=5163, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_1P_Mint_MIC", "WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_Pickup_MIC"))
- 	Skins.Add((Id=5162, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_Scope_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_Pickup_MIC"))
+	Skins.Add((Id=5162, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_Scope_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_Pickup_MIC"))
 	Skins.Add((Id=5161, Weapondef=class'KFWeapDef_RailGun', MIC_1P=("WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_1P_BattleScarred_MIC", "WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_Scope_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_railgun.Neon_Railgun_3P_Pickup_MIC"))

 //Neon RPG7
 	Skins.Add((Id=5166, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_Pickup_MIC"))
- 	Skins.Add((Id=5165, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_Pickup_MIC"))
+	Skins.Add((Id=5165, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_Pickup_MIC"))
 	Skins.Add((Id=5164, Weapondef=class'KFWeapDef_RPG7', MIC_1P=("WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_rpg7.Neon_RPG7_3P_Pickup_MIC"))

 //Neon Scar
 	Skins.Add((Id=5169, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_1P_Mint_MIC", "WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_Pickup_MIC"))
- 	Skins.Add((Id=5168, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_Scope_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_Pickup_MIC"))
+	Skins.Add((Id=5168, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_Scope_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_Pickup_MIC"))
 	Skins.Add((Id=5167, Weapondef=class'KFWeapDef_SCAR', MIC_1P=("WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_1P_BattleScarred_MIC", "WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_Scope_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_scar.Neon_SCAR_3P_Pickup_MIC"))

 //Neon M1911
 	Skins.Add((Id=5172, Weapondef=class'KFWeapDef_Colt1911', MIC_1P=("WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_Pickup_MIC"))
- 	Skins.Add((Id=5171, Weapondef=class'KFWeapDef_Colt1911', MIC_1P=("WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_Pickup_MIC"))
+	Skins.Add((Id=5171, Weapondef=class'KFWeapDef_Colt1911', MIC_1P=("WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_Pickup_MIC"))
 	Skins.Add((Id=5170, Weapondef=class'KFWeapDef_Colt1911', MIC_1P=("WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_m1911.Neon_M1911_3P_Pickup_MIC"))

 //Neon Katana
 	Skins.Add((Id=5175, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet16_MAT.neon_katana.Neon_Katana_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_Pickup_MIC"))
- 	Skins.Add((Id=5174, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet16_MAT.neon_katana.Neon_Katana_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_Pickup_MIC"))
+	Skins.Add((Id=5174, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet16_MAT.neon_katana.Neon_Katana_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_Pickup_MIC"))
 	Skins.Add((Id=5173, Weapondef=class'KFWeapDef_Katana', MIC_1P=("WEP_SkinSet16_MAT.neon_katana.Neon_Katana_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_katana.Neon_Katana_3P_Pickup_MIC"))

 //Neon Dragonsbreath
 	Skins.Add((Id=5178, Weapondef=class'KFWeapDef_DragonsBreath', MIC_1P=("WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_Pickup_MIC"))
- 	Skins.Add((Id=5177, Weapondef=class'KFWeapDef_DragonsBreath', MIC_1P=("WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_Pickup_MIC"))
+	Skins.Add((Id=5177, Weapondef=class'KFWeapDef_DragonsBreath', MIC_1P=("WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_Pickup_MIC"))
 	Skins.Add((Id=5176, Weapondef=class'KFWeapDef_DragonsBreath', MIC_1P=("WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_dragonsbreath.Neon_DragonsBreath_3P_Pickup_MIC"))

 //Neon Kriss
 	Skins.Add((Id=5181, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_1P_Mint_MIC", "WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_Sight_1P_Mint_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_Pickup_MIC"))
- 	Skins.Add((Id=5180, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_Sight_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_Pickup_MIC"))
+	Skins.Add((Id=5180, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_1P_FieldTested_MIC", "WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_Sight_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_Pickup_MIC"))
 	Skins.Add((Id=5179, Weapondef=class'KFWeapDef_Kriss', MIC_1P=("WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_1P_BattleScarred_MIC", "WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_Sight_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet16_MAT.neon_kriss.Neon_KRISS_3P_Pickup_MIC"))

 //Vault Pink MP7
 	Skins.Add((Id=5291, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_1P_Mint_MIC", "WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_Pickup_MIC"))
- 	Skins.Add((Id=5290, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_1P_FieldTested_MIC", "WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_Pickup_MIC"))
+	Skins.Add((Id=5290, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_1P_FieldTested_MIC", "WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_Pickup_MIC"))
 	Skins.Add((Id=5289, Weapondef=class'KFWeapDef_MP7', MIC_1P=("WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_1P_BattleScarred_MIC", "WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_Scope_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet17_MAT.cute_mp7.Vault_Cute_MP7_3P_Pickup_MIC"))

 //Vault Honorable Death AK12
@ -1347,5 +1347,4 @@ defaultproperties
 	Skins.Add((Id=5303, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
 	Skins.Add((Id=5302, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
 	Skins.Add((Id=5301, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
-
 }
--- a/ServerExt/Classes/ExtWidget_PartyInGame.uc
+++ b/ServerExt/Classes/ExtWidget_PartyInGame.uc
@ -77,6 +77,6 @@ function GFxObject RefreshSlot(int SlotIndex, KFPlayerReplicationInfo KFPRI)
 	return PlayerInfoObject;
 }

-DefaultProperties
+defaultproperties
 {
 }
--- a/ServerExt/Classes/Ext_AICommandBasePet.uc
+++ b/ServerExt/Classes/Ext_AICommandBasePet.uc
@ -156,6 +156,6 @@ RecheckOwner:
 	Goto('Begin');
 }

-DefaultProperties
+defaultproperties
 {
 }
--- a/ServerExt/Classes/Ext_AINoTaunt.uc
+++ b/ServerExt/Classes/Ext_AINoTaunt.uc
@ -7,9 +7,10 @@ function SpecialMoveStarted(bool bForced, Name PrevMove)

 function SpecialMoveEnded(Name PrevMove, Name NextMove)
 {
+
 }

-DefaultProperties
+defaultproperties
 {
 	Handle=KFSM_Taunt
 	bDisableMovement=true
--- a/ServerExt/Classes/Ext_PerkBase.uc
+++ b/ServerExt/Classes/Ext_PerkBase.uc
@ -1171,10 +1171,10 @@ simulated function float ApplyEffect(name Type, float Value, float Progress)
 		Modifiers[1] = 1.f + (Value*Progress);
 		break;
 	case 'Recoil':
-		Modifiers[2] = 1.f / (1.f+Value*Progress);
+		Modifiers[2] = 1.f - (Value*Progress);
 		break;
 	case 'Spread':
-		Modifiers[3] = 1.f / (1.f+Value*Progress);
+		Modifiers[3] = 1.f - (Value*Progress);
 		break;
 	case 'Rate':
 		Modifiers[4] = 1.f / (1.f+Value*Progress);
@ -1191,8 +1191,8 @@ simulated function float ApplyEffect(name Type, float Value, float Progress)
 		}
 		break;
 	case 'KnockDown':
-		Modifiers[7] = FMin(1.f + (Value*Progress),2.f);
-		return (Modifiers[7]-1.f);
+		Modifiers[7] = 1.f + (Value*Progress);
+		break;
 	case 'Welder':
 		Modifiers[8] = 1.f + (Value*Progress);
 		break;
@ -1499,7 +1499,7 @@ simulated function float GetZedTimeExtensions(byte Level)

 simulated function float GetTightChokeModifier()
 {
-    return Modifiers[3];
+	return Modifiers[3];
 }

 defaultproperties
@ -1556,8 +1556,8 @@ defaultproperties

 	DefPerkStats(0)=(MaxValue=50,CostPerValue=1,StatType="Speed",Progress=0.4)
 	DefPerkStats(1)=(MaxValue=1000,CostPerValue=1,StatType="Damage",Progress=0.5)
-	DefPerkStats(2)=(MaxValue=90,CostPerValue=1,StatType="Recoil",Progress=1)
-	DefPerkStats(3)=(MaxValue=80,CostPerValue=1,StatType="Spread",Progress=0.75)
+	DefPerkStats(2)=(MaxValue=100,CostPerValue=1,StatType="Recoil",Progress=1)
+	DefPerkStats(3)=(MaxValue=100,CostPerValue=1,StatType="Spread",Progress=1)
 	DefPerkStats(4)=(MaxValue=1000,CostPerValue=1,StatType="Rate",Progress=0.5)
 	DefPerkStats(5)=(MaxValue=1000,CostPerValue=1,StatType="Reload",Progress=0.5)
 	DefPerkStats(6)=(MaxValue=150,CostPerValue=1,StatType="Health",Progress=1)
--- a/ServerExt/Classes/Ext_PerkFieldMedic.uc
+++ b/ServerExt/Classes/Ext_PerkFieldMedic.uc
@ -212,7 +212,7 @@ defaultproperties

 	ToxicDmgTypeClass=class'KFDT_Toxic_AcidicRounds'

-  	SelfHealingSurgePct=0.1f
+	SelfHealingSurgePct=0.1f

 	MaxHealingSpeedBoost=30
 	HealingSpeedBoostDuration=5.f
--- a/ServerExt/Classes/Ext_PerkFirebug.uc
+++ b/ServerExt/Classes/Ext_PerkFirebug.uc
@ -1,5 +1,48 @@
 Class Ext_PerkFirebug extends Ext_PerkBase;

+var bool bUseInferno,bUsePyromaniac,bUseGroundFire,bUseHeatWave;
+
+replication
+{
+	// Things the server should send to the client.
+	if (true)
+		bUseInferno,bUsePyromaniac,bUseGroundFire,bUseHeatWave;
+}
+
+simulated final private function bool IsInfernoActive()
+{
+	return bUseInferno && WorldInfo.TimeDilation < 1.f;
+}
+
+simulated function bool GetIsUberAmmoActive(KFWeapon KFW)
+{
+	return bUsePyromaniac && IsWeaponOnPerk(KFW) && WorldInfo.TimeDilation < 1.f;
+}
+
+simulated function float GetZedTimeModifier(KFWeapon W)
+{
+	local name StateName;
+
+	if (bUsePyromaniac && IsWeaponOnPerk(W))
+	{
+		StateName = W.GetStateName();
+		if (BasePerk.Default.ZedTimeModifyingStates.Find(StateName) != INDEX_NONE || StateName == 'Reloading')
+			return 1.f;
+	}
+
+	return 0.f;
+}
+
+simulated final private function bool IsGroundFireActive()
+{
+	return bUseGroundFire;
+}
+
+simulated final private function bool IsHeatWaveActive()
+{
+	return bUseHeatWave;
+}
+
 defaultproperties
 {
 	PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_Firebug'
@ -7,6 +50,10 @@ defaultproperties
 	DefTraitList.Add(class'Ext_TraitNapalm')
 	DefTraitList.Add(class'Ext_TraitFireExplode')
 	DefTraitList.Add(class'Ext_TraitFireRange')
+	DefTraitList.Add(class'Ext_TraitInferno')
+	DefTraitList.Add(class'Ext_TraitPyromaniac')
+	DefTraitList.Add(class'Ext_TraitGroundFire')
+	DefTraitList.Add(class'Ext_TraitHeatWave')
 	BasePerk=class'KFPerk_Firebug'

 	PrimaryMelee=class'KFWeap_Knife_Firebug'
--- a/ServerExt/Classes/Ext_PerkRhythmPerkBase.uc
+++ b/ServerExt/Classes/Ext_PerkRhythmPerkBase.uc
@ -52,16 +52,16 @@ final function UpdateDmgScale(bool bUp)
 function UpdatePerkHeadShots(ImpactInfo Impact, class<DamageType> DamageType, int NumHit)
 {
 	local int HitZoneIdx;
-   	local KFPawn_Monster KFPM;
+	local KFPawn_Monster KFPM;

 	if (MaxRhythmCombo<=0)
 		return;
-   	KFPM = KFPawn_Monster(Impact.HitActor);
-   	if (KFPM==none || KFPM.GetTeamNum()==0)
-   		return;
+	KFPM = KFPawn_Monster(Impact.HitActor);
+	if (KFPM==none || KFPM.GetTeamNum()==0)
+		return;

-   	HitZoneIdx = KFPM.HitZones.Find('ZoneName', Impact.HitInfo.BoneName);
-   	if (HitZoneIdx == HZI_Head && KFPM.IsAliveAndWell())
+	HitZoneIdx = KFPM.HitZones.Find('ZoneName', Impact.HitInfo.BoneName);
+	if (HitZoneIdx == HZI_Head && KFPM.IsAliveAndWell())
 	{
 		if (class<KFDamageType>(DamageType)!=None && (class<KFDamageType>(DamageType).Default.ModifierPerkList.Find(BasePerk)>=0))
 			UpdateDmgScale(true);
--- a/ServerExt/Classes/Ext_TGroupMonster.uc
+++ b/ServerExt/Classes/Ext_TGroupMonster.uc
@ -2,4 +2,5 @@ class Ext_TGroupMonster extends Ext_TGroupBase;

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/Ext_TGroupRegen.uc
+++ b/ServerExt/Classes/Ext_TGroupRegen.uc
@ -33,4 +33,5 @@ static final function byte GetMaxLimit(Ext_PerkBase Perk)

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/Ext_TGroupZEDTime.uc
+++ b/ServerExt/Classes/Ext_TGroupZEDTime.uc
@ -2,4 +2,5 @@ class Ext_TGroupZEDTime extends Ext_TGroupBase;

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/Ext_T_HealthRegHelp.uc
+++ b/ServerExt/Classes/Ext_T_HealthRegHelp.uc
@ -24,4 +24,5 @@ function Timer()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/Ext_T_SupplierInteract.uc
+++ b/ServerExt/Classes/Ext_T_SupplierInteract.uc
@ -194,7 +194,7 @@ simulated function Destroyed()
 	}
 }

-DefaultProperties
+defaultproperties
 {
 	InteractionIndex=IMT_ReceiveAmmo
 	RemoteRole=ROLE_SimulatedProxy
--- a/ServerExt/Classes/Ext_TraitDataStore.uc
+++ b/ServerExt/Classes/Ext_TraitDataStore.uc
@ -8,4 +8,5 @@ var class<Ext_TraitBase> TraitClass;

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/Ext_TraitDemoProfessional.uc
+++ b/ServerExt/Classes/Ext_TraitDemoProfessional.uc
@ -15,7 +15,7 @@ static function bool MeetsRequirements(byte Lvl, Ext_PerkBase Perk)
 {
 	local int i;

-	if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<3)
+	if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<1)
 		return false;

 	if (Lvl==0)
--- a/ServerExt/Classes/Ext_TraitGroundFire.uc
+++ b/ServerExt/Classes/Ext_TraitGroundFire.uc
@ -0,0 +1,16 @@
+Class Ext_TraitGroundFire extends Ext_TraitBase;
+
+static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseGroundFire = true;
+}
+
+static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseGroundFire = false;
+}
+
+defaultproperties
+{
+	DefLevelCosts(0)=50
+}
--- a/ServerExt/Classes/Ext_TraitHeatWave.uc
+++ b/ServerExt/Classes/Ext_TraitHeatWave.uc
@ -0,0 +1,16 @@
+Class Ext_TraitHeatWave extends Ext_TraitBase;
+
+static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseHeatWave = true;
+}
+
+static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseHeatWave = false;
+}
+
+defaultproperties
+{
+	DefLevelCosts(0)=50
+}
--- a/ServerExt/Classes/Ext_TraitInferno.uc
+++ b/ServerExt/Classes/Ext_TraitInferno.uc
@ -0,0 +1,31 @@
+Class Ext_TraitInferno extends Ext_TraitBase;
+
+var localized string GroupDescription;
+
+function string GetPerkDescription()
+{
+	local string S;
+
+	S = Super.GetPerkDescription();
+	S $= "|"$GroupDescription;
+	return S;
+}
+
+static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseInferno = true;
+}
+
+static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUseInferno = false;
+}
+
+defaultproperties
+{
+	SupportedPerk=class'Ext_PerkFirebug'
+	TraitGroup=class'Ext_TGroupZEDTime'
+	NumLevels=1
+	DefLevelCosts(0)=50
+	//DefMinLevel=65
+}
--- a/ServerExt/Classes/Ext_TraitMedicPistol.uc
+++ b/ServerExt/Classes/Ext_TraitMedicPistol.uc
@ -20,7 +20,7 @@ static function ApplyEffectOn(KFPawn_Human Player, Ext_PerkBase Perk, byte Level
 	{
 		Inv = Player.CreateInventory(class'ExtWeap_Pistol_MedicS',Player.Weapon!=None);
 		if (KFWeapon(Inv)!=None)
-		 	KFWeapon(Inv).bGivenAtStart = true;
+			KFWeapon(Inv).bGivenAtStart = true;
 	}
 }

--- a/ServerExt/Classes/Ext_TraitPyromaniac.uc
+++ b/ServerExt/Classes/Ext_TraitPyromaniac.uc
@ -0,0 +1,31 @@
+Class Ext_TraitPyromaniac extends Ext_TraitBase;
+
+var localized string GroupDescription;
+
+function string GetPerkDescription()
+{
+	local string S;
+
+	S = Super.GetPerkDescription();
+	S $= "|"$GroupDescription;
+	return S;
+}
+
+static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUsePyromaniac = true;
+}
+
+static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
+{
+	Ext_PerkFirebug(Perk).bUsePyromaniac = false;
+}
+
+defaultproperties
+{
+	SupportedPerk=class'Ext_PerkFirebug'
+	TraitGroup=class'Ext_TGroupZEDTime'
+	NumLevels=1
+	DefLevelCosts(0)=50
+	//DefMinLevel=65
+}
--- a/ServerExt/Classes/Ext_TraitWeapons.uc
+++ b/ServerExt/Classes/Ext_TraitWeapons.uc
@ -54,7 +54,7 @@ static function ApplyEffectOn(KFPawn_Human Player, Ext_PerkBase Perk, byte Level
 		{
 			Inv = Player.CreateInventory(IC,Player.Weapon!=None);
 			if (KFWeapon(Inv)!=None)
-			 	KFWeapon(Inv).bGivenAtStart = true;
+				KFWeapon(Inv).bGivenAtStart = true;
 		}
 	}
 	if (M!=None)
--- a/ServerExt/Classes/KF2GUIInput.uc
+++ b/ServerExt/Classes/KF2GUIInput.uc
@ -59,4 +59,5 @@ function PreClientTravel(string PendingURL, ETravelType TravelType, bool bIsSeam

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_Button_CD.uc
+++ b/ServerExt/Classes/KFGUI_Button_CD.uc
@ -53,4 +53,5 @@ function DrawMenu()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_Clickable.uc
+++ b/ServerExt/Classes/KFGUI_Clickable.uc
@ -90,4 +90,5 @@ function HandleMouseClick(bool bRight);

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_FloatingWindow.uc
+++ b/ServerExt/Classes/KFGUI_FloatingWindow.uc
@ -56,4 +56,5 @@ function PreDraw()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_HTMLTextBox.txt
+++ b/ServerExt/Classes/KFGUI_HTMLTextBox.txt
@ -1,928 +0,0 @@
-//====================================================================
-// HTML Text box, written by Marco
-// Simply call SetContents to change window contents.
-// Only callback available is for LaunchKFURL.
-// ====================================================================
-class KFGUI_HTMLTextBox extends KFGUI_MultiComponent;
-
-struct FTextLine
-{
-	var string Text,URL;
-	var color Color,ALColor;
-	var Font Font;
-	var float FontScale;
-	var byte Align,FontSize;
-	var int X,Y,XS,YS,Tab,TOffset;
-	var byte LineSkips;
-	var array<int> ImgList;
-	var bool bHasURL,bSplit;
-};
-var array<FTextLine> Lines;
-
-struct FImageEntry
-{
-	var Surface Img;
-	var int X,Y,XS,YS,YOffset,XOffset;
-	var byte Align,Style;
-};
-var array<FImageEntry> Images;
-
-var FImageEntry BgImage;
-var float OldXSize,OldYSize;
-var int YSize,HoverOverLinkLine,OldHoverLine;
-var() Color BGColor,WhiteColor,BlueColor,RedColor;
-var KFGUI_ScrollBarV MyScrollBar;
-var string TitleString;
-var int CurTab;
-var byte DefaultFontSize;
-var bool bNeedsInit,bHasSplitLines,bNeedScrollbar;
-
-function InitMenu()
-{
-	Super.InitMenu();
-	
-	MyScrollBar = KFGUI_ScrollBarV(FindComponentID('Scrollbar'));
-}
-
-final function int AddText( string Input, color TextColor, byte TextAlign, byte FontSize, out byte NumSkips )
-{
-	local int i;
-	
-	i = Lines.Length;
-	Lines.Length = i+1;
-	Lines[i].Text = Input;
-	Lines[i].Color = TextColor;
-	Lines[i].Align = TextAlign;
-	Lines[i].FontSize = FontSize;
-	Lines[i].LineSkips = NumSkips;
-	Lines[i].Tab = CurTab;
-	NumSkips = 0;
-	return i;
-}
-final function string ParseLinkType( string URL )
-{
-	if( InStr(URL,"//")>0 )
-		return URL;
-	if( Left(URL,4)~="ftp." )
-		return "ftp://"$URL;
-	return "http://"$URL;
-}
-final function AddImage( string Input )
-{
-	local string Temp;
-	local byte Align,Sty;
-	local Material M;
-	local int X,Y,XS,YS,i,j,z;
-
-	Align = 3;
-	Temp = GetOption(Input, "ALIGN=");
-	if (Temp != "")
-	{
-		switch( Caps(Temp) )
-		{
-		case "LEFT":
-		case "0":
-			Align = 0;
-			break;
-		case "CENTER":
-		case "1":
-			Align = 1;
-			break;
-		case "RIGHT":
-		case "2":
-			Align = 2;
-			break;
-		}
-	}
-	Temp = GetOption(Input, "STYLE=");
-	if (Temp != "")
-	{
-		switch( Caps(Temp) )
-		{
-		case "NORMAL":
-		case "0":
-			Sty = 0;
-			break;
-		case "STRETCH":
-		case "1":
-			Sty = 1;
-			break;
-		case "TILEDX":
-		case "2":
-			Sty = 2;
-			break;
-		case "TILEDY":
-		case "3":
-			Sty = 3;
-			break;
-		case "TILED":
-		case "4":
-			Sty = 4;
-			break;
-		}
-	}
-	Temp = GetOption(Input, "SRC=");
-	if (Temp != "")
-		M = Surface(DynamicLoadObject(Temp,Class'Surface'));
-	if( M==None )
-		M = class'Canvas'.Default.DefaultTexture;
-	X = int(GetOption(Input, "VSPACE="));
-	Y = int(GetOption(Input, "HSPACE="));
-	XS = int(GetOption(Input, "WIDTH="));
-	YS = int(GetOption(Input, "HEIGHT="));
-	
-	if( XS==0 )
-		XS = M.GetSurfaceWidth();
-	if( YS==0 )
-		YS = M.GetSurfaceHeight();
-
-	i = Images.Length;
-	Images.Length = i+1;
-	Images[i].Img = M;
-	Images[i].XOffset = X;
-	Images[i].YOffset = Y;
-	Images[i].XS = XS;
-	Images[i].YS = YS;
-	Images[i].Style = Sty;
-	Images[i].Align = Align;
-	j = Lines.Length-1;
-	z = Lines[j].ImgList.Length;
-	Lines[j].ImgList.Length = z+1;
-	Lines[j].ImgList[z] = i;
-}
-final function SetContents( string Input )
-{
-	local string LeftText,HTML,RightText,Output,Temp,Link;
-	local int Index;
-	local color TextColor,LinkColor,ALinkColor,OrgTextColor;
-	local byte Alignment,FontScaler,NextLineSkips;
-
-	CurTab = 0;
-	BGColor.A = 0;
-	BgImage.Img = None;
-	Lines.Length = 0;
-	Images.Length = 0;
-	TitleString = "";
-	bHasSplitLines = false;
-	bNeedsInit = true;
-	
-	// First remove new liners
-	Input = Repl(Input, Chr(13)$Chr(10), "");
-	Input = Repl(Input, Chr(13), "");
-	Input = Repl(Input, Chr(10), "");
-	Input = Repl(Input, Chr(9), "    ");
-	Input = Repl(Input, "\\n", "<BR>");
-	
-	TextColor = WhiteColor;
-	OrgTextColor = WhiteColor;
-	LinkColor = BlueColor;
-	ALinkColor = RedColor;
-	FontScaler = 3;
-	DefaultFontSize = 3;
-	Index = -1;
-
-	while (Input != "")
-	{
-		ParseHTML(Input, LeftText, HTML, RightText);
-
-		switch (GetTag(HTML))
-		{
-			// multiline HTML tags
-		case "P":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				NextLineSkips = 2;
-				Output = "";
-			}
-			else ++NextLineSkips;
-			break;
-		case "BR":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				NextLineSkips = 1;
-				Output = "";
-			}
-			else ++NextLineSkips;
-			break;
-		case "BODY":
-			Temp = GetOption(HTML, "BGCOLOR=");
-			if (Temp != "")
-				BGColor = ParseColor(Temp);
-
-			Temp = GetOption(HTML, "LINK=");
-			if (Temp != "")
-				LinkColor = ParseColor(Temp);
-
-			Temp = GetOption(HTML, "ALINK=");
-			if (Temp != "")
-				ALinkColor = ParseColor(Temp);
-
-			Temp = GetOption(HTML, "TEXT=");
-			if (Temp != "")
-			{
-				TextColor = ParseColor(Temp);
-				OrgTextColor = TextColor;
-			}
-			
-			Temp = GetOption(HTML, "SIZE=");
-			if (Temp != "")
-			{
-				FontScaler = int(Temp);
-				DefaultFontSize = FontScaler;
-			}
-			
-			Temp = GetOption(Input, "IMG=");
-			if (Temp != "")
-			{
-				if( BGColor.A==0 )
-					BGColor = Class'Hud'.Default.WhiteColor;
-				BgImage.Img = Surface(DynamicLoadObject(Temp,Class'Surface'));
-				if( BgImage.Img==None )
-					BgImage.Img = Class'Canvas'.Default.DefaultTexture;
-				BgImage.X = BgImage.Img.GetSurfaceWidth();
-				BgImage.Y = BgImage.Img.GetSurfaceHeight();
-				switch( Caps(GetOption(Input, "IMGSTYLE=")) )
-				{
-				case "TILED":
-					BgImage.XS = BgImage.X;
-					BgImage.YS = BgImage.Y;
-					BgImage.Style = 1;
-					Temp = GetOption(Input, "TILEX=");
-					if (Temp != "")
-						BgImage.XS = int(Temp);
-					Temp = GetOption(Input, "TILEY=");
-					if (Temp != "")
-						BgImage.YS = int(Temp);
-					break;
-				case "FITX":
-					BgImage.Style = 2;
-					break;
-				case "FITY":
-					BgImage.Style = 3;
-					break;
-				default: // FIT
-					BgImage.Style = 0;
-				}
-				BgImage.Align = 0;
-				if( GetOption(Input, "IMGLOCK=")=="0" )
-					BgImage.Align = 1;
-			}
-			Output $= LeftText;
-			break;
-		case "CENTER":
-			Output $= LeftText;
-			if ( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			NextLineSkips = Max(NextLineSkips,1);
-			Alignment = 1;
-			break;
-		case "RIGHT":
-			Output $= LeftText;
-			if ( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			NextLineSkips = Max(NextLineSkips,1);
-			Alignment = 2;
-			break;
-		case "/CENTER":
-		case "/RIGHT":
-			Index = AddText(Output $ LeftText,TextColor,Alignment,FontScaler,NextLineSkips);
-			++NextLineSkips;
-			Alignment = 0;
-			Output = "";
-			break;
-			// Inline HTML tags
-		case "H1":
-			Output $= LeftText;
-			if ( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			NextLineSkips = Max(NextLineSkips,1);
-			FontScaler = 5;
-			Alignment = 1;
-			break;
-		case "/H1":
-			Index = AddText(Output $ LeftText,TextColor,Alignment,FontScaler,NextLineSkips);
-			++NextLineSkips;
-			Output = "";
-			FontScaler = DefaultFontSize;
-			Alignment = 0;
-			break;
-		case "FONT":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			Temp = GetOption(HTML, "COLOR=");
-			if (Temp != "")
-				TextColor = ParseColor(Temp);
-			Temp = GetOption(HTML, "SIZE=");
-			if (Temp != "")
-				FontScaler = int(Temp);
-			break;
-		case "/FONT":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			TextColor = OrgTextColor;
-			FontScaler = DefaultFontSize;
-			break;
-		case "TAB":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			CurTab = int(GetOption(HTML, "X="));
-			break;
-		case "/TAB":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			CurTab = 0;
-			break;
-		case "TITLE":
-			Output $= LeftText;
-			break;
-		case "/TITLE":
-			TitleString = LeftText;
-			break;
-		case "A":
-			Output $= LeftText;
-			if( Output!="" )
-			{
-				Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-				Output = "";
-			}
-			Link = GetOption(HTML, "HREF=");
-			break;
-		case "/A":
-			Output $= LeftText;
-			Index = AddText(Output,LinkColor,Alignment,FontScaler,NextLineSkips);
-			Lines[Index].ALColor = ALinkColor;
-			Lines[Index].bHasURL = true;
-			if( Link=="" )
-				Lines[Index].URL = ParseLinkType(Output);
-			else Lines[Index].URL = ParseLinkType(Link);
-			Output = "";
-			FontScaler = DefaultFontSize;
-			Alignment = 0;
-			break;
-		case "IMG":
-			Output $= LeftText;
-			if( Output!="" || NextLineSkips>0 )
-				AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-			Output = "";
-			AddImage(HTML);
-			break;
-		default:
-			Output = Output $ LeftText;
-			break;
-		}
-		Input = RightText;
-	}
-	AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
-}
-
-// Get the next HTML tag, the text before it and everthing after it.
-final function ParseHTML(string Input, out string LeftText, out string HTML, out string RightText)
-{
-	local int i;
-
-	i = InStr(Input, "<");
-	if (i == -1)
-	{
-		LeftText = Input;
-		HTML = "";
-		RightText = "";
-		return;
-	}
-
-	LeftText = Left(Input, i);
-	HTML = Mid(Input, i);
-
-	i = InStr(HTML, ">");
-	if (i == -1)
-	{
-		RightText = "";
-		return;
-	}
-
-	RightText = Mid(HTML, i+1);
-	HTML = Left(HTML, i+1);
-}
-final function string GetTag(string HTML)
-{
-	local int i;
-
-	if (HTML == "")
-		return "";
-
-	HTML = Mid(HTML, 1); // lose <
-
-	i = FirstMatching(InStr(HTML, ">"), InStr(HTML, " "));
-	if (i == -1)
-		return Caps(HTML);
-	else
-		return Caps(Left(HTML, i));
-}
-final function string GetOption(string HTML, string Option)
-{
-	local int i, j;
-	local string s;
-
-	i = InStr(Caps(HTML), Caps(Option));
-
-	if (i == 1 || Mid(HTML, i-1, 1) == " ")
-	{
-		s = Mid(HTML, i+Len(Option));
-		j = FirstMatching(InStr(s, ">"), InStr(s, " "));
-		s = Left(s, j);
-
-		if (Left(s, 1) == "\"")
-			s = Mid(s, 1);
-
-		if (Right(s, 1) == "\"")
-			s = Left(s, Len(s) - 1);
-
-		return s;
-	}
-	return "";
-}
-final function int FirstMatching(int i, int j)
-{
-	if (i == -1)
-		return j;
-	if (j == -1)
-		return i;
-	return Min(i, j);
-}
-final function Color ParseColor(string S)
-{
-	local Color C;
-	local int i;
-
-	S = Caps(S);
-	if (Left(S, 1) == "#")
-	{
-		C.R = (GetHexDigit(Mid(S, 1, 1)) << 4) + GetHexDigit(Mid(S, 2, 1));
-		C.G = (GetHexDigit(Mid(S, 3, 1)) << 4) + GetHexDigit(Mid(S, 4, 1));
-		C.B = (GetHexDigit(Mid(S, 5, 1)) << 4) + GetHexDigit(Mid(S, 6, 1));
-	}
-	else if (Left(S, 4) == "RGB(")
-	{
-		S = Mid(S, 4);
-		i = InStr(S,",");
-		C.R = int(Left(S,i));
-		S = Mid(S,i+1);
-		i = InStr(S,",");
-		C.G = int(Left(S,i));
-		C.B = int(Mid(S,i+1));
-	}
-	else
-	{
-		switch( S )
-		{
-		case "RED":
-			C.R = 255;
-			C.G = 0;
-			C.B = 0;
-			break;
-		case "BLUE":
-			C.R = 0;
-			C.G = 0;
-			C.B = 255;
-			break;
-		case "GREEN":
-			C.R = 0;
-			C.G = 255;
-			C.B = 0;
-			break;
-		case "YELLOW":
-			C.R = 255;
-			C.G = 255;
-			C.B = 0;
-			break;
-		case "BLACK":
-			C.R = 0;
-			C.G = 0;
-			C.B = 0;
-			break;
-		default: // WHITE
-			C.R = 255;
-			C.G = 255;
-			C.B = 255;
-		}
-	}
-	C.A = 255;
-
-	return C;
-}
-final function byte GetHexDigit(string D)
-{
-	local byte i;
-	
-	i = Asc(D);
-	if( i>=48 && i<=57 ) // i>='0' && i<='9'
-		return (i-48); // i-'0'
-	return Min(i-55,15); // i-('A'-10)
-}
-
-final function SplitLine( int iLine, int iOffset )
-{
-	local int i;
-	local string S;
-
-	++iLine;
-	Lines.Insert(iLine,1);
-	S = Lines[iLine-1].Text;
-	for( i=iOffset; i<Len(S); ++i )
-		if( Mid(S,i,1)!=" " )
-			break;
-	Lines[iLine].Text = Mid(S,i);
-	Lines[iLine-1].Text = Left(S,iOffset);
-	Lines[iLine].URL = Lines[iLine-1].URL;
-	Lines[iLine].Color = Lines[iLine-1].Color;
-	Lines[iLine].ALColor = Lines[iLine-1].ALColor;
-	Lines[iLine].Align = Lines[iLine-1].Align;
-	Lines[iLine].FontSize = Lines[iLine-1].FontSize;
-	Lines[iLine].Tab = Lines[iLine-1].Tab;
-	Lines[iLine].LineSkips = 1;
-	Lines[iLine].bHasURL = Lines[iLine-1].bHasURL;
-	Lines[iLine].bSplit = true;
-	bHasSplitLines = true;
-}
-final protected function InitHTMLArea()
-{
-	local float XS,YS;
-	local int i,j,X,Y,iStart,BestHeight,FontSize,PrevY,Remain,iLastWord,iLen,z,ImgHeight;
-
-	// Used to detect resolution changes when text needs realignment.
-	OldXSize = CompPos[2];
-	OldYSize = CompPos[3];
-
-	// Merge splitted lines again
-	if( bHasSplitLines )
-	{
-		bHasSplitLines = false;
-		for( i=1; i<Lines.Length; ++i )
-		{
-			if( Lines[i].bSplit )
-			{
-				Lines[i-1].Text @= Lines[i].Text;
-				Lines.Remove(i--,1);
-			}
-		}
-	}
-	
-	// Setup background image scaling
-	if( BgImage.Img!=None )
-	{
-		switch( BgImage.Style )
-		{
-		case 1: // Tiled
-			if( BgImage.X==BgImage.XS )
-				BgImage.XOffset = Canvas.ClipX;
-			else
-			{
-				XS = Canvas.ClipX / float(BgImage.XS) * float(BgImage.X);
-				BgImage.XOffset = XS;
-			}
-			if( BgImage.Y==BgImage.YS )
-				BgImage.YOffset = Canvas.ClipY;
-			else
-			{
-				XS = Canvas.ClipY / float(BgImage.YS) * float(BgImage.Y);
-				BgImage.YOffset = XS;
-			}
-			break;
-		case 2: // Fit X
-			XS = Canvas.ClipY * (Canvas.ClipX / float(BgImage.X));
-			BgImage.YS = XS;
-			break;
-		case 3: // Fit Y
-			XS = Canvas.ClipX * (Canvas.ClipY / float(BgImage.Y));
-			BgImage.XS = XS;
-			break;
-		}
-	}
-	
-	FontSize = Owner.CurrentStyle.DefaultFontSize;
-
-	Canvas.SetPos(0,0);
-	if( Lines.Length>0 )
-	{
-		while( true )
-		{
-			if( i>=Lines.Length || (i>0 && Lines[i].LineSkips>0) )
-			{
-				for( j=iStart; j<i; ++j )
-				{
-					switch( Lines[j].Align )
-					{
-					case 0: // Left
-						Lines[j].X = Lines[j].TOffset;
-						break;
-					case 1: // Center
-						Lines[j].X = (Canvas.ClipX-X+Lines[j].TOffset)/2;
-						break;
-					case 2: // Right
-						Lines[j].X = Canvas.ClipX-X+Lines[j].TOffset;
-						break;
-					}
-				}
-				if( i>=Lines.Length )
-					break;
-				X = 0;
-				iStart = i;
-				PrevY = BestHeight;
-				BestHeight = 0;
-			}
-			if( Lines[i].FontSize>=247 )
-				Lines[i].Font = Owner.CurrentStyle.PickFont(Max(Lines[i].FontSize-247,0),Lines[i].FontScale);
-			else Lines[i].Font = Owner.CurrentStyle.PickFont(Max(FontSize+Lines[i].FontSize,0),Lines[i].FontScale);
-			Canvas.Font = Lines[i].Font;
-			if( Lines[i].Text=="" )
-			{
-				Canvas.TextSize("ABC",XS,YS,Lines[i].FontScale,Lines[i].FontScale);
-				XS = 0;
-			}
-			else Canvas.TextSize(Lines[i].Text,XS,YS,Lines[i].FontScale,Lines[i].FontScale);
-			if( Lines[i].LineSkips>0 )
-			{
-				if( PrevY==0 )
-					PrevY = YS;
-				Y+=(PrevY*Lines[i].LineSkips);
-			}
-			X = Max(X,Lines[i].Tab);
-			Lines[i].TOffset = X;
-			Lines[i].Y = Y;
-			Lines[i].YS = YS;
-			BestHeight = Max(BestHeight,YS);
-			if( (X+XS)>Canvas.ClipX )
-			{
-				// Split to next row.
-				Remain = Canvas.ClipX-X;
-				iLastWord = 0;
-				iLen = Len(Lines[i].Text);
-				for( j=1; j<iLen; ++j )
-				{
-					Canvas.TextSize(Left(Lines[i].Text,j),XS,YS,Lines[i].FontScale,Lines[i].FontScale);
-					if( Remain<XS )
-					{
-						if( iLastWord==0 ) // Must cut off a word now.
-							SplitLine(i,Max(j-1,0));
-						else SplitLine(i,iLastWord);
-						break;
-					}
-					if( Mid(Lines[i].Text,j,1)==" " )
-						iLastWord = j+1;
-				}
-				Canvas.TextSize(Lines[i].Text,XS,YS,Lines[i].FontScale,Lines[i].FontScale);
-			}
-			Lines[i].XS = XS;
-			X+=XS;
-			
-			for( j=0; j<Lines[i].ImgList.Length; ++j )
-			{
-				z = Lines[i].ImgList[j];
-				if( Images[z].Align==3 )
-					Images[z].X = X+Images[z].XOffset;
-				else Images[z].X = Images[z].XOffset;
-				Images[z].Y = Y+Images[z].YOffset;
-				ImgHeight = Max(ImgHeight,Images[z].Y+Images[z].YS);
-			}
-			++i;
-		}
-		YSize = Max(Y+BestHeight,ImgHeight);
-	}
-	else YSize = 0;
-
-	bNeedScrollbar = (YSize>Canvas.ClipY);
-	if( bNeedScrollbar )
-	{
-		MyScrollBar.SetDisabled(false);
-		MyScrollBar.UpdateScrollSize(0,YSize,Canvas.ClipY,512);
-	}
-	else MyScrollBar.SetDisabled(true);
-}
-simulated final function DrawTileStretchedClipped( Surface M, float XS, float YS )
-{
-	Canvas.CurX += Canvas.OrgX;
-	Canvas.CurY += Canvas.OrgY;
-	if( Canvas.CurX<Canvas.OrgX )
-	{
-		XS-=(Canvas.OrgX-Canvas.CurX);
-		Canvas.CurX = Canvas.OrgX;
-	}
-	if( Canvas.CurY<Canvas.OrgY )
-	{
-		YS-=(Canvas.OrgY-Canvas.CurY);
-		Canvas.CurY = Canvas.OrgY;
-	}
-	if( (Canvas.CurX+XS)>Canvas.ClipX )
-		XS = (Canvas.ClipX-Canvas.CurX);
-	if( (Canvas.CurY+YS)>Canvas.ClipY )
-		YS = (Canvas.ClipY-Canvas.CurY);
-	if( Texture(M)!=None )
-		Canvas.DrawTileStretched(Texture(M),XS,YS);
-}
-function DrawMenu()
-{
-	local float YS;
-	local int i,YOffset,MX,MY;
-	local bool bMouseOnClient;
-
-	if( bNeedsInit || OldXSize!=CompPos[2] || OldYSize!=CompPos[3] )
-	{
-		bNeedsInit = false;
-		InitHTMLArea();
-	}
-	if( bNeedScrollbar )
-		YOffset = MyScrollBar.CurrentScroll;
-
-	if( BGColor.A>0 )
-	{
-		C.SetPos(0,0);
-		C.DrawColor = BGColor;
-		
-		if( BgImage.Img!=None )
-		{
-			if( BgImage.Align==1 ) // not locked on screen.
-				MX = YOffset;
-			switch( BgImage.Style )
-			{
-			case 0: // Stretched to fit
-				C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.X,BgImage.Y);
-				break;
-			case 1: // Tiled
-				C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.XOffset,BgImage.YOffset);
-				break;
-			case 2: // Fit X
-				C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.X,BgImage.YS);
-				break;
-			case 3: // Fit Y
-				C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.XS,BgImage.Y);
-				break;
-			}
-		}
-		else C.DrawTile(Texture'WhiteTexture',C.ClipX,C.ClipY,0,0,1,1);
-	}
-	MX = Controller.MouseX-C.OrgX;
-	MY = Controller.MouseY-C.OrgY;
-	bMouseOnClient = (MX>=0 && MX<=C.ClipX && MY>=0 && MY<=C.ClipY);
-	HoverOverLinkLine = -1;
-	MY+=YOffset;
-
-	C.DrawColor = Class'HUD'.Default.WhiteColor;
-	for( i=0; i<Images.Length; ++i )
-	{
-		C.CurY = Images[i].Y-YOffset;
-		if( (C.CurY+Images[i].YS)<0 || C.CurY>C.ClipY )
-			continue;
-		switch( Images[i].Align )
-		{
-		case 0: // Left
-		case 3: // Unaligned, postition after text.
-			C.CurX = 0;
-			break;
-		case 1: // Center
-			C.CurX = (C.ClipX-Images[i].XS)/2;
-			break;
-		case 1: // Right
-			C.CurX = C.ClipX-Images[i].XS;
-			break;
-		}
-		C.CurX += Images[i].X;
-		switch( Images[i].Style )
-		{
-		case 1: // Stretched
-			DrawTileStretchedClipped(C,Images[i].Img,Images[i].XS,Images[i].YS);
-			break;
-		case 2: // Tiled on X axis
-			C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].XS,Images[i].Img.MaterialVSize());
-			break;
-		case 3: // Tiled on Y axis
-			C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].Img.MaterialUSize(),Images[i].YS);
-			break;
-		case 4: // Fully tiled
-			C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].XS,Images[i].YS);
-			break;
-		default: // Normal
-			C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].Img.MaterialUSize(),Images[i].Img.MaterialVSize());
-		}
-	}
-
-	for( i=0; i<Lines.Length; ++i )
-	{
-		C.SetPos(Lines[i].X,Lines[i].Y-YOffset);
-		if( (C.CurY+Lines[i].YS)<0 || Lines[i].Text=="" )
-			continue;
-		if( C.CurY>C.ClipY )
-			break;
-		
-		// Check if mouse hovers over URL
-		if( bMouseOnClient && Lines[i].bHasURL && MX>=Lines[i].X && MX<=(Lines[i].X+Lines[i].XS)
-												&& MY>=Lines[i].Y && MY<=(Lines[i].Y+Lines[i].YS) )
-		{
-			HoverOverLinkLine = i;
-			bMouseOnClient = false; // No need to check on rest anymore.
-			C.DrawColor = Lines[i].ALColor;
-		}
-		else C.DrawColor = Lines[i].Color;
-
-		C.Font = Lines[i].Font;
-		C.DrawTextClipped(Lines[i].Text);
-		if( Lines[i].bHasURL )
-		{
-			YS = Max(Lines[i].YS/15,1);
-			C.SetPos(Lines[i].X,Lines[i].Y+Lines[i].YS-(YS*2)-YOffset);
-			if( C.CurY<C.ClipY )
-				C.DrawTileClipped(Texture'WhiteTexture',Lines[i].XS,YS,0,0,1,1);
-		}
-	}
-
-	if( OldHoverLine!=HoverOverLinkLine )
-	{
-		OldHoverLine = HoverOverLinkLine;
-		if( HoverOverLinkLine>=0 )
-		{
-			Controller.PlayInterfaceSound(CS_Hover);
-			SetToolTipText(Lines[HoverOverLinkLine].URL);
-		}
-		else SetToolTipText("");
-	}
-}
-
-function bool LaunchURL(GUIComponent Sender)
-{
-	if( HoverOverLinkLine>=0 )
-	{
-		if( Left(Lines[HoverOverLinkLine].URL,8)~="kfurl://" )
-			LaunchKFURL(Mid(Lines[HoverOverLinkLine].URL,8));
-		else if( Left(Lines[HoverOverLinkLine].URL,5)~="kf://" )
-			ChangeGameURL(Mid(Lines[HoverOverLinkLine].URL,5));
-		else LaunchURLPage(Lines[HoverOverLinkLine].URL);
-	}
-}
-
-delegate LaunchKFURL( string URL );
-delegate ChangeGameURL( string URL )
-{
-	Class'SRLevelCleanup'.Static.AddSafeCleanup(PlayerOwner(),URL);
-}
-delegate LaunchURLPage( string URL )
-{
-	PlayerOwner().Player.Console.DelayedConsoleCommand("START "$URL);
-}
-
-defaultproperties
-{
-	bNeedsInit=true
-
-	PropagateVisibility=true
-	OnDraw=RenderHTMLText
-	OnClick=LaunchURL
-	Begin Object Class=GUIVertScrollBar Name=TheScrollbar
-		bBoundToParent=true
-		bScaleToParent=true
-		WinWidth=0.03
-		WinLeft=0.97
-		WinTop=0.0
-		WinHeight=1.0
-		bVisible=true
-		PropagateVisibility=true
-		OnPreDraw=TheScrollbar.GripPreDraw
-	End Object
-	MyScrollBar=TheScrollbar
-	StyleName="NoBackground"
-	bAcceptsInput=True
-	Begin Object Class=GUIToolTip Name=GUIListBoxBaseToolTip
-		ExpirationSeconds=0
-	End Object
-	ToolTip=GUIListBoxBaseToolTip
-	
-	WhiteColor=(R=255,G=255,B=255,A=255)
-	BlueColor=(R=0,G=0,B=255,A=255)
-	RedColor=(R=255,G=0,B=0,A=255)
-}
--- a/ServerExt/Classes/KFGUI_RightClickMenu_CD.uc
+++ b/ServerExt/Classes/KFGUI_RightClickMenu_CD.uc
@ -64,4 +64,5 @@ function DrawMenu()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_ScrollBarH.uc
+++ b/ServerExt/Classes/KFGUI_ScrollBarH.uc
@ -2,4 +2,5 @@ Class KFGUI_ScrollBarH extends KFGUI_ScrollBarBase;

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_ScrollBarV_CD.uc
+++ b/ServerExt/Classes/KFGUI_ScrollBarV_CD.uc
@ -49,4 +49,5 @@ function DrawMenu()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/KFGUI_Tooltip_CD.uc
+++ b/ServerExt/Classes/KFGUI_Tooltip_CD.uc
@ -64,4 +64,5 @@ function PreDraw()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/MS_HUD.uc
+++ b/ServerExt/Classes/MS_HUD.uc
@ -68,4 +68,5 @@ final function RenderProgress()

 defaultproperties
 {
+
 }
--- a/ServerExt/Classes/SRPerkManager.uc
+++ b/ServerExt/Classes/SRPerkManager.uc
@ -2,4 +2,5 @@ Class SRPerkManager extends ExtPerkManager;

 defaultproperties
 {
+
 }
--- a/ServerExtMut/Classes/ExtPlayerStat.uc
+++ b/ServerExtMut/Classes/ExtPlayerStat.uc
@ -257,4 +257,5 @@ function SetSaveVersion(int Num)

 defaultproperties
 {
+
 }
--- a/ServerExtMut/Classes/ServerExtMut.uc
+++ b/ServerExtMut/Classes/ServerExtMut.uc
@ -26,7 +26,7 @@ struct FSavedInvEntry
 };
 var array<FSavedInvEntry> PlayerInv;

-var config array<string> PerkClasses,CustomChars,AdminCommands,CustomItems,BonusGameSongs,BonusGameFX;
+var config array<string> PerkClasses,CustomChars,AdminCommands,BonusGameSongs,BonusGameFX;
 var config array<CFGCustomZedXP> CustomZedXP;
 var array< class<Ext_PerkBase> > LoadedPerks;
 var array<FCustomCharEntry> CustomCharList;
@ -44,9 +44,6 @@ var transient class<DamageType> LastKillDamageType;
 var SoundCue BonusGameCue;
 var Object BonusGameFXObj;

-var array<FCustomTraderItem> CustomItemList;
-var KFGFxObject_TraderItems CustomTrader;
-
 const SettingsTagVer=14;
 var KFGameReplicationInfo KF;
 var config int SettingsInit;
@ -58,9 +55,6 @@ var int LastWaveNum,NumWaveSwitches;
 var ExtSpawnPointHelper SpawnPointer;
 var bool bRespawnCheck,bSpecialSpawn,bGameHasEnded,bIsPostGame;
 var config bool bKillMessages,bDamageMessages,bEnableMapVote,bNoAdminCommands,bNoWebAdmin,bNoBoomstickJumping,bDumpXMLStats,bRagdollFromFall,bRagdollFromMomentum,bRagdollFromBackhit,bAddCountryTags,bThrowAllWeaponsOnDeath;
-var config bool bDontUseOriginalWeaponry;
-var config bool bAllowStandartPistolUpgrade;
-var config bool bDisableCustomTrader;

 var KFGI_Access KFGIA;

@ -114,13 +108,6 @@ function PostBeginPlay()

 	KFGIA = new(KFGameInfo(WorldInfo.Game)) class'KFGI_Access';

-	// trader things
-	if (!bDisableCustomTrader && CustomTrader==None)
-	{
-		CustomTrader = class'ExtPlayerReplicationInfo'.Static.CreateNewList();
-		SetTimer(0.001, false, 'EditTraiderItems');
-	}
-
 	if (ServerMOTD=="")
 		ServerMOTD = "Message of the Day";
 	if (StatFileDir=="")
@ -177,11 +164,6 @@ function PostBeginPlay()
 		if (SettingsInit<9)
 			MaxTopPlayers = 50;

-		if (SettingsInit < 13)
-		{
-			bAllowStandartPistolUpgrade = True;
-			bDisableCustomTrader = False;
-		}
 		if (SettingsInit < 14)
 		{
 			bThrowAllWeaponsOnDeath = False;
@ -293,96 +275,6 @@ function UpdateCustomZedXPArray()
 	}
 }

-// function CheckPickupFactories()
-// {
-// 	local KFPickupFactory_Item ItemFactory;
-
-// 	// Disable 9mm and medpistol in all PickupFactories
-// 	foreach AllActors(class'KFPickupFactory_Item', ItemFactory)
-// 	{
-// 		for (i=0;i<ItemFactory.ItemPickups.Length;i++)
-// 		{
-// 			if (ItemFactory.ItemPickups[i].ItemClass == class'KFGameContent.KFWeap_Pistol_9mm'
-// 				|| ItemFactory.ItemPickups[i].ItemClass == class'KFGameContent.KFWeap_Pistol_Medic')
-// 			{
-// 				ItemFactory.ItemPickups.Remove(i, 1);
-// 				break;
-// 			}
-// 		}
-// 	}
-// }
-
-function EditTraiderItems()
-{
-	local int i;
-	local KFGFxObject_TraderItems Trad;
-
-	if (!bDontUseOriginalWeaponry)
-	{
-		Trad = KFGameReplicationInfo(WorldInfo.GRI).TraderItems;
-		// Remove dual 9mm, 9mm, medpistol
-		for (i=0;i<Trad.SaleItems.Length;i++)
-		{
-			if (string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Pistol_Dual9mm"
-				|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Pistol_Medic"
-				|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Pistol_9mm")
-			{
-				// Remove pistols
-				continue;
-			}
-
-			// Adding original weapon
-			AddCIToTraderEx(Trad.SaleItems[i].WeaponDef);
-		}
-	}
-
-	// Reinfo and resorting items
-	// MyKFGI.MyKFGRI.TraderItems.SetItemsInfo(MyKFGI.MyKFGRI.TraderItems.SaleItems);
-	// MyKFGI.MyKFGRI.TraderItems.SortItemsInfo(MyKFGI.MyKFGRI.TraderItems.SaleItems);
-
-	if (bAllowStandartPistolUpgrade)
-	{
-		// Add custom 9mm for upgrades
-		AddCIToTrader("ServerExt.ExtWeapDef_9mm");
-		
-		// Add custom medpistol for upgrades
-		AddCIToTrader("ServerExt.ExtWeapDef_MedicPistol");
-	}
-
-	// Add custom items from WebAdmin
-	for (i=0; i<CustomItems.Length; ++i)
-	{
-		AddCIToTrader(CustomItems[i]);
-	}
-	InitGRIList();
-}
-
-function AddCIToTrader(string weapdef)
-{
-	local FCustomTraderItem CI;
-	CI.WeaponDef = class<KFWeaponDefinition>(DynamicLoadObject(weapdef,class'Class'));
-	if (CI.WeaponDef == None)
-		return;
-	CI.WeaponClass = class<KFWeapon>(DynamicLoadObject(CI.WeaponDef.Default.WeaponClassPath,class'Class'));
-	if (CI.WeaponClass == None)
-		return;
-	CustomItemList.AddItem(CI);
-	class'ExtPlayerReplicationInfo'.Static.SetWeaponInfo(WorldInfo.NetMode==NM_DedicatedServer,CustomTrader.SaleItems.Length,CI,CustomTrader);
-}
-
-function AddCIToTraderEx(class<KFWeaponDefinition> weapdef)
-{
-	local FCustomTraderItem CI;
-	CI.WeaponDef = weapdef;
-	if (CI.WeaponDef == None)
-		return;
-	CI.WeaponClass = class<KFWeapon>(DynamicLoadObject(CI.WeaponDef.Default.WeaponClassPath,class'Class'));
-	if (CI.WeaponClass == None)
-		return;
-	CustomItemList.AddItem(CI);
-	class'ExtPlayerReplicationInfo'.Static.SetWeaponInfo(WorldInfo.NetMode==NM_DedicatedServer,CustomTrader.SaleItems.Length,CI,CustomTrader);
-}
-
 static final function string GetStatFile(const out UniqueNetId UID)
 {
 	return Repl(Default.StatFileDir,"%s","U_"$class'OnlineSubsystem'.Static.UniqueNetIdToString(UID));
@ -398,21 +290,6 @@ final function bool IsDev(const out UniqueNetId UID)
 	return false;
 }

-function InitGRIList()
-{
-	local ExtPlayerController PC;
-
-	KFGameReplicationInfo(WorldInfo.GRI).TraderItems = CustomTrader;
-
-	// Must sync up local client.
-	if (WorldInfo.NetMode==NM_StandAlone)
-	{
-		foreach LocalPlayerControllers(class'ExtPlayerController',PC)
-			if (PC.PurchaseHelper!=None)
-				PC.PurchaseHelper.TraderItems = CustomTrader;
-	}
-}
-
 function CheckWave()
 {
 	if (KF==None)
@ -881,8 +758,6 @@ function NotifyLogin(Controller NewPlayer)
 		if (bAddCountryTags && NetConnection(PlayerController(NewPlayer).Player)!=None)
 			ExtPlayerReplicationInfo(NewPlayer.PlayerReplicationInfo).SetPlayerNameTag(class'CtryDatabase'.Static.GetClientCountryStr(PlayerController(NewPlayer).GetPlayerNetworkAddress()));
 		ExtPlayerReplicationInfo(NewPlayer.PlayerReplicationInfo).bIsDev = IsDev(NewPlayer.PlayerReplicationInfo.UniqueId);
-		if (WorldInfo.NetMode!=NM_StandAlone)
-			ExtPlayerReplicationInfo(NewPlayer.PlayerReplicationInfo).OnRepNextItem = GetNextItem;
 		if (BonusGameCue!=None || BonusGameFXObj!=None)
 			ExtPlayerController(NewPlayer).ClientSetBonus(BonusGameCue,BonusGameFXObj);
 		if (bRespawnCheck)
@ -1518,7 +1393,7 @@ final function InitCustomChars(ExtPlayerReplicationInfo PRI)

 final function bool HasPrivs(ExtPlayerReplicationInfo P)
 {
-	return WorldInfo.NetMode==NM_StandAlone || (P!=None && P.ShowAdminName() && (P.AdminType<=1 || P.AdminType==255));
+	return WorldInfo.NetMode==NM_StandAlone || (P != None && P.ShowAdminName() && (P.AdminType <= AT_Admin || P.AdminType == AT_Player));
 }

 function AdminCommand(ExtPlayerController PC, int PlayerID, int Action)
@ -1703,14 +1578,6 @@ function PlayerChangeSpec(ExtPlayerController PC, bool bSpectator)
 	}
 }

-function bool GetNextItem(ExtPlayerReplicationInfo PRI, int RepIndex)
-{
-	if (RepIndex>=CustomItemList.Length)
-		return false;
-	PRI.ClientAddTraderItem(RepIndex,CustomItemList[RepIndex]);
-	return true;
-}
-
 function InitWebAdmin(ExtWebAdmin_UI UI)
 {
 	local int i;
@ -1760,12 +1627,6 @@ function string WebAdminGetValue(name PropName, int ElementIndex)
 		return string(MaxTopPlayers);
 	case 'MinUnloadPerkLevel':
 		return string(MinUnloadPerkLevel);
-	case 'bDontUseOriginalWeaponry':
-		return string(bDontUseOriginalWeaponry);
-	case 'bDisableCustomTrader':
-		return string(bDisableCustomTrader);
-	case 'bAllowStandartPistolUpgrade':
-		return string(bAllowStandartPistolUpgrade);
 	case 'UnloadPerkExpCost':
 		return string(UnloadPerkExpCost);
 	case 'PerkClasses':
@ -1774,8 +1635,6 @@ function string WebAdminGetValue(name PropName, int ElementIndex)
 		return (ElementIndex==-1 ? string(CustomChars.Length) : CustomChars[ElementIndex]);
 	case 'AdminCommands':
 		return (ElementIndex==-1 ? string(AdminCommands.Length) : AdminCommands[ElementIndex]);
-	case 'CustomItems':
-		return (ElementIndex==-1 ? string(CustomItems.Length) : CustomItems[ElementIndex]);
 	case 'ServerMOTD':
 		return Repl(ServerMOTD,"|",Chr(10));
 	case 'BonusGameSongs':
@ -1837,12 +1696,6 @@ function WebAdminSetValue(name PropName, int ElementIndex, string Value)
 		bRagdollFromMomentum = bool(Value);	break;
 	case 'bRagdollFromBackhit':
 		bRagdollFromBackhit = bool(Value);	break;
-	case 'bDontUseOriginalWeaponry':
-		bDontUseOriginalWeaponry = bool(Value);	break;
-	case 'bDisableCustomTrader':
-		bDisableCustomTrader = bool(Value);	break;
-	case 'bAllowStandartPistolUpgrade':
-		bAllowStandartPistolUpgrade = bool(Value);	break;
 	case 'bAddCountryTags':
 		bAddCountryTags = bool(Value);		break;
 	case 'MaxTopPlayers':
@ -1855,8 +1708,6 @@ function WebAdminSetValue(name PropName, int ElementIndex, string Value)
 		UpdateArray(CustomChars,ElementIndex,Value);	break;
 	case 'AdminCommands':
 		UpdateArray(AdminCommands,ElementIndex,Value);	break;
-	case 'CustomItems':
-		UpdateArray(CustomItems,ElementIndex,Value);	break;
 	case 'BonusGameSongs':
 		UpdateArray(BonusGameSongs,ElementIndex,Value);	break;
 	case 'BonusGameFX':
@ -1871,6 +1722,8 @@ function WebAdminSetValue(name PropName, int ElementIndex, string Value)

 defaultproperties
 {
+	GroupNames.Add("ServerExt")
+
 	// Main devs
 	DevList.Add("0x0110000100E8984E") // Marco
 	DevList.Add("0x01100001023DF8A8") // ForrestMarkX
@ -1905,9 +1758,4 @@ defaultproperties
 	WebConfigs.Add((PropType=3,PropName="ServerMOTD",UIName="MOTD",UIDesc="Message of the Day"))
 	WebConfigs.Add((PropType=2,PropName="BonusGameSongs",UIName="Bonus Game Songs",UIDesc="List of custom musics to play during level change pong game.",NumElements=-1))
 	WebConfigs.Add((PropType=2,PropName="BonusGameFX",UIName="Bonus Game FX",UIDesc="List of custom FX to play on pong game.",NumElements=-1))
-
-	WebConfigs.Add((PropType=1,PropName="bDisableCustomTrader",UIName="Disable custom trader",UIDesc="Warning! That option will disable all settings below"))
-	WebConfigs.Add((PropType=2,PropName="CustomItems",UIName="Custom Inventory",UIDesc="List of custom inventory to add to trader (must be KFWeaponDefinition class).",NumElements=-1))
-	WebConfigs.Add((PropType=1,PropName="bDontUseOriginalWeaponry",UIName="Disable original weapons",UIDesc="Allows to buy default weapons"))
-	WebConfigs.Add((PropType=1,PropName="bAllowStandartPistolUpgrade",UIName="Standard pistol upgrades",UIDesc="Allows to upgrade standard pistol"))
 }
--- a/ServerExtMut/Classes/xVoteBroadcast.uc
+++ b/ServerExtMut/Classes/xVoteBroadcast.uc
@ -34,4 +34,5 @@ event AllowBroadcastLocalizedTeam(int TeamIndex, actor Sender, class<LocalMessag

 defaultproperties
 {
+
 }
--- a/builder.cfg
+++ b/builder.cfg
@ -11,6 +11,15 @@ StripSource="True"
 PackageBuildOrder="ServerExt ServerExtMut"


+### Brew parameters ###
+
+# Packages you want to brew using @peelz's patched KFEditor.
+# Useful for cases where regular brew doesn't put *.upk inside the package.
+# Specify them with a space as a separator,
+# The order doesn't matter
+PackagePeelzBrew=""
+
+
 ### Steam Workshop upload parameters ###

 # Mutators that will be uploaded to the workshop
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2f173aad7a6f4578574764801136a0d86e830653
+Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
Author	SHA1	Message	Date
GenZmeY	ab48db0206	Merge pull request #49 from zeno0207/master fix Ext_TraitDemoProfessional	2024-09-14 18:14:38 +03:00
zeno0207	eaa67d7c97	Update Ext_TraitDemoProfessional.uc fix error	2024-08-21 22:59:18 +08:00
GenZmeY	8d8a20b755	fix ServerExt.chn encoding (utf8 -> utf16le)	2024-07-22 16:14:05 +03:00
GenZmeY	0273fa9520	Merge pull request #47 from zeno0207/master Update ServerExt.chn	2024-07-21 23:10:13 +03:00
zeno0207	873c9a37ee	Update ServerExt.chn Update translation	2024-07-14 15:58:02 +08:00
GenZmeY	b5597ce5f8	update ci/cd	2023-12-31 23:21:19 +03:00
GenZmeY	55b82bbc3a	update dead links	2023-12-31 20:58:21 +03:00
GenZmeY	84c5673b76	update ci/cd	2023-12-31 20:57:45 +03:00
GenZmeY	d0e38b6ec8	update github gist link to make steam happy	2023-09-10 00:56:55 +03:00
GenZmeY	58ec5f101e	fix code style	2023-09-10 00:06:06 +03:00
GenZmeY	d5673b1887	Update README.md	2023-09-10 00:04:08 +03:00
GenZmeY	ef199d64dd	add translations of new firebug perks for languages: chn, cht, esn, jpn, rus	2023-09-09 23:54:30 +03:00
GenZmeY	b7468d4f7e	remove fake changes from ServerExt.int	2023-09-09 23:34:03 +03:00
GenZmeY	fe47ba73e4	update KFServerExt.ini template	2023-09-09 23:23:22 +03:00
GenZmeY	62e0ed28ee	Merge pull request #45 from GenZmeY/i18n-chn add Simplified Chinese translation	2023-09-09 23:21:06 +03:00
GenZmeY	e7916876d0	Merge pull request #42 from GenZmeY/group-names add mutator group name	2023-09-09 23:20:56 +03:00
GenZmeY	55567f1933	Merge pull request #40 from GenZmeY/v1137-bugsplat-fix client-side "Access None" fixes	2023-09-09 23:20:46 +03:00
GenZmeY	53b8933952	Merge pull request #44 from secretagentjr/master Update Recoil / Spread to be flat reduction, capping out at 100%, allow knockback to go above 100%	2023-09-09 23:20:34 +03:00
GenZmeY	f30a7fcf2a	fix EOL	2023-09-09 21:16:24 +03:00
GenZmeY	99dacdf004	add Simplified Chinese translation	2023-09-09 19:28:17 +03:00
secretagentjr	1e7bcd732c	Remove Function	2023-07-29 18:27:35 -07:00
secretagentjr	d38f165464	Revert Health back to regular	2023-07-29 17:24:31 -07:00
secretagentjr	daa0bd72e9	Add Some Firebug Traits	2023-07-23 17:43:50 -07:00
secretagentjr	53f63934b1	Fix Health Not Displaying Properly past 255	2023-07-20 12:18:08 -07:00
secretagentjr	b2d0d28946	Allow Knockdown "Knockback" to go above 100%	2023-07-18 18:06:15 -07:00
secretagentjr	0a8d4bb38c	Update Recoil / Spread to be flat	2023-07-17 19:11:20 -07:00
GenZmeY	6da2b47013	add mutator group name	2023-06-03 17:09:10 +03:00
GenZmeY	06c326507e	Update README.md	2023-05-14 09:19:44 +03:00
GenZmeY	64a4edf178	Merge pull request #41 from GenZmeY/MegaLinter add Mega linter	2023-05-14 06:45:50 +03:00
GenZmeY	67baea9f2c	exclude upk	2023-05-14 06:37:40 +03:00
GenZmeY	fbca6b98f5	fix indent	2023-05-14 06:08:37 +03:00
GenZmeY	9c72778720	more style fixes	2023-05-14 06:01:17 +03:00
GenZmeY	bababdc366	rm issue_template	2023-05-14 05:52:55 +03:00
GenZmeY	2aad26f273	add MegaLinter badge	2023-05-14 05:51:51 +03:00
GenZmeY	7175a6c7b6	fix style	2023-05-14 05:49:12 +03:00
GenZmeY	47ed596664	upd mega-linter.yml	2023-05-14 05:26:15 +03:00
GenZmeY	a57d5781d6	update README.md	2023-05-14 05:25:08 +03:00
GenZmeY	6ccd5381fc	add MegaLinter	2023-05-14 05:16:54 +03:00
GenZmeY	97928b1d47	add .editorconfig	2023-05-14 05:15:46 +03:00
GenZmeY	6df0b69568	update build tools to v1.9.2-1-gfb458ac	2023-05-14 05:14:52 +03:00
GenZmeY	84ce5f6804	client-side "Access None" fixes	2022-12-25 01:31:24 +03:00
GenZmeY	3387658793	update build tools	2022-10-13 23:23:23 +03:00
GenZmeY	96438eb969	Merge branch 'master' into RemoveTrader	2022-09-16 06:36:36 +03:00
GenZmeY	771f6708f1	fix admin status	2022-09-16 06:36:06 +03:00
GenZmeY	19759b99e2	update build tools	2022-09-16 05:51:19 +03:00
GenZmeY	a273c2607d	remove custom items	2022-09-16 05:50:42 +03:00
GenZmeY	5fd2af5f59	update build tools	2022-09-02 16:08:18 +03:00
GenZmeY	4cdbf18761	update description	2022-08-30 08:50:36 +03:00