From 22b297a648c8960068374756f7d5219a6937142e Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Wed, 9 Jun 2021 18:35:01 -0300
Subject: [PATCH 01/26] replace give admin button with permissions widget

---
 [admin]/admin/client/gui/admin_main.lua       |  17 +--
 [admin]/admin/client/gui/admin_messagebox.lua |   2 +
 .../admin/client/gui/admin_permissions.lua    | 121 ++++++++++++++++++
 [admin]/admin/meta.xml                        |   1 +
 [admin]/admin/server/admin_server.lua         |  25 +++-
 5 files changed, 155 insertions(+), 11 deletions(-)
 create mode 100644 [admin]/admin/client/gui/admin_permissions.lua

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 854c02d65..035f00213 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -75,7 +75,7 @@ function aAdminMenu ()
 
 		aTab1.Nick			= guiCreateButton ( 0.71, 0.260, 0.13, 0.04, "Set Nick", true, aTab1.Tab )
 		aTab1.Shout			= guiCreateButton ( 0.85, 0.260, 0.13, 0.04, "Shout!", true, aTab1.Tab, "shout" )
-		aTab1.Admin			= guiCreateButton ( 0.71, 0.305, 0.27, 0.04, "Give admin rights", true, aTab1.Tab, "setgroup" )
+		aTab1.ManagePerms   = guiCreateButton ( 0.71, 0.305, 0.27, 0.04, "Manage permissions", true, aTab1.Tab, "setgroup" )
 
 		local y = 0.03		-- Start y coord
 		local A = 0.045		-- Large line gap
@@ -538,11 +538,6 @@ function aAdminRefresh ()
 				guiSetText ( aTab1.Vehicle, "Vehicle: Foot" )
 				guiSetText ( aTab1.VehicleHealth, "Vehicle Health: 0%" )
 			end
-			if ( aPlayers[player]["admin"] ) then
-				guiSetText(aTab1.Admin, "Revoke admin rights")
-			else
-				guiSetText(aTab1.Admin, "Give admin rights")
-			end
 			return player
 		end
 	end
@@ -1041,9 +1036,12 @@ function aClientClick ( button )
 					elseif ( source == aTab1.VehicleBlow ) then triggerServerEvent ( "aVehicle", localPlayer, player, "blowvehicle" )
 					elseif ( source == aTab1.VehicleDestroy ) then triggerServerEvent ( "aVehicle", localPlayer, player, "destroyvehicle" )
 					elseif ( source == aTab1.VehicleCustomize ) then aVehicleCustomize ( player )
-					elseif ( source == aTab1.Admin ) then
-						if ( aPlayers[player]["admin"] ) then aMessageBox ( "warning", "Revoke admin rights from "..name.."?", "revokeAdmin", player )
-						else aMessageBox ( "warning", "Give admin rights to "..name.."?", "giveAdmin", player ) end
+					elseif ( source == aTab1.ManagePerms ) then
+						if (aPlayers[player]['accountname'] ~= 'guest') then
+							aPermissions.Show(player)
+						else
+							aMessageBox ( "error", "This player is not logged in!" )	
+						end
 					elseif ( source == aTab1.ACModDetails ) then
 						aViewModdetails(player)
 					end
@@ -1290,7 +1288,6 @@ function aAdminReloadInfos()
 		guiSetText ( aTab1.ACModInfo, "Img Mods: N/A" )
 		guiSetText ( aTab1.Mute, "Mute" )
 		guiSetText ( aTab1.Freeze, "Freeze" )
-		guiSetText ( aTab1.Admin, "Give admin rights" )
 		guiSetText ( aTab1.Health, "Health: 0%" )
 		guiSetText ( aTab1.Armour, "Armour: 0%" )
 		guiSetText ( aTab1.Skin, "Skin: N/A" )
diff --git a/[admin]/admin/client/gui/admin_messagebox.lua b/[admin]/admin/client/gui/admin_messagebox.lua
index 4a416266e..aec97d8ca 100644
--- a/[admin]/admin/client/gui/admin_messagebox.lua
+++ b/[admin]/admin/client/gui/admin_messagebox.lua
@@ -147,6 +147,8 @@ function runMessageAction(action)
 		aSpectator.Close(false)
 	elseif (action == "deleteTeam") then
 		triggerServerEvent("aTeam", localPlayer, "destroyteam", varOne)
+	elseif (action == "updatePlayerACLGroup") then
+		aPermissions.PerformAction(varOne, varTwo, varThree)
 	end
 end
 
diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
new file mode 100644
index 000000000..0ca59210c
--- /dev/null
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -0,0 +1,121 @@
+--[[**********************************
+*
+*	Multi Theft Auto - Admin Panel
+*
+*	client\gui\admin_permissions.lua
+*
+*	Original File by lil_Toady
+*
+**************************************]]
+aPermissions = {
+    Form = nil,
+    SelectedPlayer = nil,
+}
+
+addEvent('aPermissionsSync', true)
+addEvent('aOnPermissionsChange', true)
+
+function aPermissions.Show(player)
+    if (not aPermissions.Form) then
+        local x, y = guiGetScreenSize()
+        aPermissions.Form = guiCreateWindow(x / 2 - 130, y / 2 - 125, 260, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
+        guiSetAlpha(aPermissions.Form, 1)
+        
+        aPermissions.Label = guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Use double-click to change the current state", true, aPermissions.Form)
+        guiLabelSetHorizontalAlign(aPermissions.Label, "center")
+
+        aPermissions.List = guiCreateGridList(0.03, 0.18, 0.94, 0.70, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.List, "ACL Group", 0.65)
+        guiGridListAddColumn(aPermissions.List, "Has?", 0.2)
+
+        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.47, 0.09, "Refresh", true, aPermissions.Form)
+        aPermissions.Hide = guiCreateButton(0.5, 0.88, 0.47, 0.09, "Close", true, aPermissions.Form)
+        
+        addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
+        addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
+        addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
+        addEventHandler("onClientGUIDoubleClick", aPermissions.Form, aPermissions.onDoubleClick)
+        
+        --Register With Admin Form
+        aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
+    end
+    aPermissions.SelectedPlayer = player
+    aPermissions.Refresh()
+    guiSetVisible(aPermissions.Form, true)
+    guiBringToFront(aPermissions.Form)
+end
+
+function aPermissions.onSync(targetPlayer, permissions)
+    if (targetPlayer == aPermissions.SelectedPlayer) then
+        guiGridListClear(aPermissions.List)
+        for group, state in pairs(permissions) do
+            local row = guiGridListAddRow(aPermissions.List)
+            guiGridListSetItemText(aPermissions.List, row, 1, group, false, false)
+            guiGridListSetItemText(aPermissions.List, row, 2, state and 'Yes' or 'No', false, false)
+            guiGridListSetItemData(aPermissions.List, row, 1, group)
+            guiGridListSetItemData(aPermissions.List, row, 2, state)
+        end
+    end
+end
+
+function aPermissions.Close(destroy)
+    if (destroy) then
+        if (aPermissions.Form) then
+            destroyElement(aPermissions.Form)
+            aPermissions.Form = nil
+            removeEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
+            removeEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
+        end
+    else
+        guiSetVisible(aPermissions.Form, false)
+    end
+    aPermissions.SelectedPlayer = nil
+end
+
+function aPermissions.onClick(button)
+    if (button == 'left') then
+        if (source == aPermissions.Hide) then
+            aPermissions.Close()
+        elseif (source == aPermissions.Update) then
+            aPermissions.Refresh()
+        end
+    end
+end
+
+function aPermissions.onDoubleClick(button)
+    if (button == 'left') then
+        local player = aPermissions.SelectedPlayer
+        if isElement(player) then
+            local selectedItem = guiGridListGetSelectedItem(aPermissions.List)
+            if (selectedItem > -1) then
+                local selectedGroup = guiGridListGetItemData(aPermissions.List, selectedItem, 1)
+                local currentState = guiGridListGetItemData(aPermissions.List, selectedItem, 2)
+                local confirmStr
+                if currentState then
+                    confirmStr = ('Are you sure you want to remove "%s" from the "%s" group?'):format(getPlayerName(player), selectedGroup)
+                else
+                    confirmStr = ('Are you sure you want to add "%s" to the "%s" group?'):format(getPlayerName(player), selectedGroup)
+                end
+                aMessageBox ( "question", confirmStr, "updatePlayerACLGroup", player, selectedGroup, not currentState )
+            end
+        else
+            aPermissions.Close(false)
+            messageBox("Player not found!", MB_WARNING)
+        end
+    end
+end
+
+function aPermissions.PerformAction(player, groupName, newState)
+    local playerAccount = player and aPlayers[player] and aPlayers[player]['accountname']
+    if playerAccount and (playerAccount ~= 'guest') then
+        triggerServerEvent('aAdmin', localPlayer, newState and 'acladd' or 'aclremove', 'object', groupName, 'user.'..playerAccount, true)
+    end
+end
+
+function aPermissions.Refresh()
+    local player = aPermissions.SelectedPlayer
+    if isElement(player) and (aPermissions.List) then
+        guiGridListClear(aPermissions.List)
+        triggerServerEvent('aAdmin', localPlayer, "sync", "playeraclgroups", player)
+    end
+end
diff --git a/[admin]/admin/meta.xml b/[admin]/admin/meta.xml
index 6f28e0a25..212e8818b 100644
--- a/[admin]/admin/meta.xml
+++ b/[admin]/admin/meta.xml
@@ -26,6 +26,7 @@
   <script src="client/admin_ACL.lua" type="client" />
   <script src="client/gui/admin_main.lua" type="client" />
   <script src="client/gui/admin_performance.lua" type="client" />
+  <script src="client/gui/admin_permissions.lua" type="client" />
   <script src="client/gui/admin_maps.lua" type="client" />
   <script src="client/gui/admin_messages.lua" type="client" />
   <script src="client/gui/admin_message.lua" type="client" />
diff --git a/[admin]/admin/server/admin_server.lua b/[admin]/admin/server/admin_server.lua
index 845a244ef..d76fc3d5f 100644
--- a/[admin]/admin/server/admin_server.lua
+++ b/[admin]/admin/server/admin_server.lua
@@ -681,6 +681,7 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 			for id, acl in ipairs ( aclList() ) do
 				table.insert ( tableOut["acl"] ,aclGetName ( acl ) )
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 		elseif ( type == "aclobjects" ) then
 			local group = aclGetGroup ( tostring ( arg[2] ) )
 			if ( group ) then
@@ -691,6 +692,7 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					table.insert ( tableOut["acl"], aclGetName ( acl ) )
 				end
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 		elseif ( type == "aclrights" ) then
 			local acl = aclGet ( tostring ( arg[2] ) )
 			if ( acl ) then
@@ -700,8 +702,23 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					tableOut["rights"][name] = aclGetRight ( acl, name )
 				end
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
+		elseif ( type == 'playeraclgroups') then
+			local player = arg[2]
+			if isElement(player) then
+				local ignoredGroups = {
+					['Everyone'] = true,
+					['autoGroup_irc'] = true,
+				}
+				for _, v in ipairs(aclGroupList()) do
+					local groupName = aclGroupGetName(v)
+					if (not ignoredGroups[groupName]) then
+						tableOut[groupName] = isObjectInACLGroup('user.'..getAccountName(getPlayerAccount(player)), v)
+					end
+				end
+			end
+			triggerClientEvent ( source, "aPermissionsSync", _root, player, tableOut )
 		end
-		triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 	elseif ( action == "aclcreate" ) then
 		local name = arg[2]
 		if ( ( name ) and ( string.len ( name ) >= 1 ) ) then
@@ -759,6 +776,9 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					mdata2 = "Object '"..arg[3].."'"
 				outputServerLog ("ACL: "..getPlayerName(source).."["..getAccountName (getPlayerAccount(source)).."] ["..getPlayerSerial (source).."] ["..getPlayerIP (source).."] added "..object.." to ACL Group "..arg[2])
 					triggerEvent ( "aAdmin", source, "sync", "aclobjects", arg[2] )
+					if arg[4] then
+						triggerClientEvent ( source, "aOnPermissionsChange", source )
+					end
 				end
 			elseif ( arg[1] == "acl" ) then
 				local group = aclGetGroup ( arg[2] )
@@ -802,6 +822,9 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					mdata2 = "Object '"..arg[3].."'"
 					triggerEvent ( "aAdmin", source, "sync", "aclobjects", arg[2] )
 				outputServerLog ("ACL: "..getPlayerName(source).."["..getAccountName (getPlayerAccount(source)).."] ["..getPlayerSerial (source).."] ["..getPlayerIP (source).."] removed "..mdata2)
+					if arg[4] then
+						triggerClientEvent ( source, "aOnPermissionsChange", source )
+					end
 				end
 			elseif ( arg[1] == "acl" ) then
 				local group = aclGetGroup ( arg[2] )

From 20822316f72c9bcbd88666365ed9dc40363af660 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Wed, 9 Jun 2021 18:36:15 -0300
Subject: [PATCH 02/26] fix warning message when change player's ACL

---
 [admin]/admin/client/gui/admin_acl.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/[admin]/admin/client/gui/admin_acl.lua b/[admin]/admin/client/gui/admin_acl.lua
index d18461643..63276a875 100644
--- a/[admin]/admin/client/gui/admin_acl.lua
+++ b/[admin]/admin/client/gui/admin_acl.lua
@@ -11,6 +11,8 @@
 aAclForm = nil
 aAclData = {}
 
+addEvent ( "aAdminACL", true )
+
 function aManageACL ()
 	if ( aAclForm == nil ) then
 		aAclData["group_objects"] = {}
@@ -47,7 +49,6 @@ function aManageACL ()
 		aACLExit		= guiCreateButton ( 0.75, 0.90, 0.27, 0.04, "Close", true, aAclForm )
 		aclDisplayOptions ( "", "" )
 
-		addEvent ( "aAdminACL", true )
 		addEventHandler ( "aAdminACL", localPlayer, aAdminACL )
 		addEventHandler ( "onClientGUIClick", aAclForm, aClientACLClick )
 		addEventHandler ( "onClientGUIDoubleClick", aAclForm, aClientACLDoubleClick )

From af5decbbcd950c856a62c54fe3b59bd403f07b46 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Fri, 25 Jun 2021 07:26:51 -0300
Subject: [PATCH 03/26] refactor killmessages

---
 [gameplay]/killmessages/definitions.lua       | 519 ------------------
 [gameplay]/killmessages/gui.lua               | 271 ---------
 [gameplay]/killmessages/icons/aaa.js          |   9 +
 .../killmessages/killmessages_client.lua      |  55 --
 .../killmessages/killmessages_server.lua      | 192 -------
 [gameplay]/killmessages/meta.xml              | 257 +++++----
 .../scripts/client/c.killmessages.lua         |  51 ++
 .../scripts/client/c.settings.lua             |  16 +
 .../killmessages/scripts/client/c.ui.lua      | 112 ++++
 .../killmessages/scripts/client/c.utils.lua   | 194 +++++++
 .../scripts/server/s.killmessages.lua         | 140 +++++
 .../scripts/server/s.settings.lua             |  28 +
 [gameplay]/killmessages/utils/imagelib.lua    | 140 -----
 [gameplay]/killmessages/utils/textlib.lua     | 335 -----------
 14 files changed, 685 insertions(+), 1634 deletions(-)
 delete mode 100644 [gameplay]/killmessages/definitions.lua
 delete mode 100644 [gameplay]/killmessages/gui.lua
 create mode 100644 [gameplay]/killmessages/icons/aaa.js
 delete mode 100644 [gameplay]/killmessages/killmessages_client.lua
 delete mode 100644 [gameplay]/killmessages/killmessages_server.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.killmessages.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.settings.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.ui.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.utils.lua
 create mode 100644 [gameplay]/killmessages/scripts/server/s.killmessages.lua
 create mode 100644 [gameplay]/killmessages/scripts/server/s.settings.lua
 delete mode 100644 [gameplay]/killmessages/utils/imagelib.lua
 delete mode 100644 [gameplay]/killmessages/utils/textlib.lua

diff --git a/[gameplay]/killmessages/definitions.lua b/[gameplay]/killmessages/definitions.lua
deleted file mode 100644
index 932eaac32..000000000
--- a/[gameplay]/killmessages/definitions.lua
+++ /dev/null
@@ -1,519 +0,0 @@
-iconWidths = {
-[0] = 21,
-[1] = 15,
-[2] = 97,
-[3] = 55,
-[4] = 83,
-[5] = 72,
-[6] = 55,
-[7] = 138,
-[8] = 104,
-[9] = 59,
-[10] =40,
-[11] =31,
-[12] =41,
-[14] =10,
-[15] =71,
-[16] =13,
-[17] =10,
-[18] =4,
-[19] =17,
-[22] =35,
-[23] =50,
-[24] =37,
-[25] =75,
-[26] =67,
-[27] =66,
-[28] =17,
-[29] =35,
-[30] =70,
-[31] =71,
-[32] =22,
-[33] =75,
-[34] =86,
-[35] =74,
-[36] =75,
-[37] =19,
-[38] =54,
-[39] =8,
-[42] = 14,
-[49] = 86,
-[50] = 34,
-[51] = 17,
-[53] = 22,
-[54] = 15,
-[255] = 17,
-[256] = 20,
-[406] = 42,
-[408] = 47,
-[416] = 46,
-[417] = 33,
-[423] = 31,
-[424] = 39,
-[427] = 52,
-[428] = 43,
-[429] = 51,
-[432] = 61,
-[433] = 56,
-[434] = 45,
-[441] = 50,
-[443] = 49,
-[448] = 31,
-[457] = 26,
-[460] = 50,
-[462] = 27,
-[463] = 37,
-[464] = 43,
-[468] = 36,
-[470] = 49,
-[471] = 30,
-[480] = 52,
-[485] = 45,
-[486] = 39,
-[508] = 45,
-[511] = 49,
-[512] = 37,
-[513] = 48,
-[520] = 61,
-[524] = 41,
-[528] = 49,
-[530] = 27,
-[531] = 40,
-[532] = 42,
-[539] = 46,
-[564] = 48,
-[568] = 47,
-[571] = 41,
-[572] = 32,
-[573] = 37,
-[574] = 30,
-[578] = 37,
-[588] = 35,
-[593] = 40,
-[599] = 43,
-[601] = 48,
---
-[400]=36,
-[401]=36,
-[402]=36,
-[403]=36,
-[404]=36,
-[405]=36,
-[409]=36,
-[410]=36,
-[411]=36,
-[412]=36,
-[413]=36,
-[415]=36,
-[418]=36,
-[419]=36,
-[420]=36,
-[421]=36,
-[422]=36,
-[426]=36,
-[435]=36,
-[436]=36,
-[438]=36,
-[439]=36,
-[445]=36,
-[449]=36,
-[450]=36,
-[451]=36,
-[458]=36,
-[466]=36,
-[467]=36,
-[474]=36,
-[475]=36,
-[477]=36,
-[478]=36,
-[479]=36,
-[489]=36,
-[490]=36,
-[491]=36,
-[492]=36,
-[494]=36,
-[495]=36,
-[496]=36,
-[500]=36,
-[503]=36,
-[504]=36,
-[505]=36,
-[506]=36,
-[507]=36,
-[516]=36,
-[517]=36,
-[518]=36,
-[525]=36,
-[526]=36,
-[527]=36,
-[529]=36,
-[533]=36,
-[534]=36,
-[535]=36,
-[536]=36,
-[540]=36,
-[541]=36,
-[542]=36,
-[543]=36,
-[545]=36,
-[546]=36,
-[547]=36,
-[549]=36,
-[550]=36,
-[551]=36,
-[552]=36,
-[554]=36,
-[555]=36,
-[558]=36,
-[559]=36,
-[560]=36,
-[561]=36,
-[562]=36,
-[565]=36,
-[566]=36,
-[567]=36,
-[575]=36,
-[576]=36,
-[579]=36,
-[580]=36,
-[583]=36,
-[584]=36,
-[585]=36,
-[587]=36,
-[589]=36,
-[591]=36,
-[594]=36,
-[600]=36,
-[602]=36,
-[603]=36,
-[604]=36,
-[605]=36,
-[606]=36,
-[607]=36,
-[608]=36,
-[610]=36,
-[611]=36,
---
-[431]=44,
-[437]=44,
-[430]=61,
-[446]=61,
-[452]=61,
-[453]=61,
-[454]=61,
-[472]=61,
-[473]=61,
-[484]=61,
-[493]=61,
-[595]=61,
-[414]=37,
-[456]=37,
-[498]=37,
-[499]=37,
-[609]=37,
-[440]=46,
-[459]=46,
-[482]=46,
-[483]=46,
-[582]=46,
-[447]=39,
-[469]=39,
-[487]=42,
-[488]=42,
-[497]=42,
-[548]=42,
-[563]=42,
-[465]=32,
-[501]=32,
-[481]=30,
-[509]=30,
-[510]=30,
-[514]=46,
-[515]=46,
-[461]=35,
-[521]=35,
-[522]=35,
-[523]=35,
-[581]=35,
-[586]=35,
-[537]=41,
-[569]=41,
-[570]=41,
-[590]=41,
-[407]=55,
-[544]=55,
-[519]=44,
-[553]=44,
-[577]=44,
-[592]=44,
-[444]=39,
-[556]=39,
-[557]=39,
-[596]=48,
-[597]=48,
-[598]=48,
-[425]=34,
---
-[999] = 20
-}
---49 rammed, 50 heli blades, 53 drowning,  54 fall, 31 seaskimmer/rustler/rcbaron, hunter 38, death in vehicle no id, 52 predator
---kill in vehicle, warp to driver
-
-icons = {
-[0] =  "icons/fist.png",
-[1] =  "icons/brassknuckle.png",
-[2] =  "icons/golfclub.png",
-[3] =  "icons/nitestick.png",
-[4] =  "icons/knifecur.png",
-[5] =  "icons/bat.png",
-[6] =  "icons/shovel.png",
-[7] =  "icons/poolcue.png",
-[8] =  "icons/katana.png",
-[9] =  "icons/chnsaw.png",
-[10] =  "icons/gun_dildo1.png",
-[11] =  "icons/gun_dildo2.png",
-[12] =  "icons/gun_vibe1.png",
-[14] =  "icons/flowera.png",
-[15] =  "icons/gun_cane.png",
-[16] =  "icons/grenade.png",
-[17] =  "icons/teargas.png",
-[18] =  "icons/molotov.png",
-[19] =  "icons/explosion.png",
-[22] =  "icons/colt45.png",
-[23] =  "icons/Silenced.png",
-[24] =  "icons/desert_eagle.png",
-[25] =  "icons/chromegun.png",
-[26] =  "icons/sawnoff.png",
-[27] =  "icons/shotgspa.png",
-[28] =  "icons/micro_uzi.png",
-[29] =  "icons/mp5lng.png",
-[30] =  "icons/ak47.png",
-[31] =  "icons/m4.png",
-[32] =  "icons/tec9.png",
-[33] =  "icons/cuntgun.png",
-[34] =  "icons/sniper.png",
-[35] =  "icons/rocketla.png",
-[36] =  "icons/heatseek.png",
-[37] =  "icons/flame.png",
-[38] =  "icons/minigun.png",
-[39] =  "icons/satchel.png",
-[42] =  "icons/fireextinguisher.png",
-[49] =  "icons/rammed.png",
-[50] =  "icons/maverick.png",
-[51] =  "icons/explosion.png",
-[53] =  "icons/drowned.png",
-[54] =  "icons/fall.png",
-[255] = "icons/suicide.png",
-[256] = "icons/headshot.png",
------------vehicle specific icons, according to their vehicle id---------
-[400]="icons/cars.png",
-[401]="icons/cars.png",
-[402]="icons/cars.png",
-[403]="icons/cars.png",
-[404]="icons/cars.png",
-[405]="icons/cars.png",
-[409]="icons/cars.png",
-[410]="icons/cars.png",
-[411]="icons/cars.png",
-[412]="icons/cars.png",
-[413]="icons/cars.png",
-[415]="icons/cars.png",
-[418]="icons/cars.png",
-[419]="icons/cars.png",
-[420]="icons/cars.png",
-[421]="icons/cars.png",
-[422]="icons/cars.png",
-[426]="icons/cars.png",
-[435]="icons/cars.png",
-[436]="icons/cars.png",
-[438]="icons/cars.png",
-[439]="icons/cars.png",
-[445]="icons/cars.png",
-[449]="icons/cars.png",
-[450]="icons/cars.png",
-[451]="icons/cars.png",
-[458]="icons/cars.png",
-[466]="icons/cars.png",
-[467]="icons/cars.png",
-[474]="icons/cars.png",
-[475]="icons/cars.png",
-[477]="icons/cars.png",
-[478]="icons/cars.png",
-[479]="icons/cars.png",
-[489]="icons/cars.png",
-[490]="icons/cars.png",
-[491]="icons/cars.png",
-[492]="icons/cars.png",
-[494]="icons/cars.png",
-[495]="icons/cars.png",
-[496]="icons/cars.png",
-[500]="icons/cars.png",
-[503]="icons/cars.png",
-[504]="icons/cars.png",
-[505]="icons/cars.png",
-[506]="icons/cars.png",
-[507]="icons/cars.png",
-[516]="icons/cars.png",
-[517]="icons/cars.png",
-[518]="icons/cars.png",
-[525]="icons/cars.png",
-[526]="icons/cars.png",
-[527]="icons/cars.png",
-[529]="icons/cars.png",
-[533]="icons/cars.png",
-[534]="icons/cars.png",
-[535]="icons/cars.png",
-[536]="icons/cars.png",
-[540]="icons/cars.png",
-[541]="icons/cars.png",
-[542]="icons/cars.png",
-[543]="icons/cars.png",
-[545]="icons/cars.png",
-[546]="icons/cars.png",
-[547]="icons/cars.png",
-[549]="icons/cars.png",
-[550]="icons/cars.png",
-[551]="icons/cars.png",
-[552]="icons/cars.png",
-[554]="icons/cars.png",
-[555]="icons/cars.png",
-[558]="icons/cars.png",
-[559]="icons/cars.png",
-[560]="icons/cars.png",
-[561]="icons/cars.png",
-[562]="icons/cars.png",
-[565]="icons/cars.png",
-[566]="icons/cars.png",
-[567]="icons/cars.png",
-[575]="icons/cars.png",
-[576]="icons/cars.png",
-[579]="icons/cars.png",
-[580]="icons/cars.png",
-[583]="icons/cars.png",
-[584]="icons/cars.png",
-[585]="icons/cars.png",
-[587]="icons/cars.png",
-[589]="icons/cars.png",
-[591]="icons/cars.png",
-[594]="icons/cars.png",
-[600]="icons/cars.png",
-[602]="icons/cars.png",
-[603]="icons/cars.png",
-[604]="icons/cars.png",
-[605]="icons/cars.png",
-[606]="icons/cars.png",
-[607]="icons/cars.png",
-[608]="icons/cars.png",
-[610]="icons/cars.png",
-[611]="icons/cars.png",
---
-[431]="icons/bus.png",
-[437]="icons/bus.png",
-[430]="icons/boat.png",
-[446]="icons/boat.png",
-[452]="icons/boat.png",
-[453]="icons/boat.png",
-[454]="icons/boat.png",
-[472]="icons/boat.png",
-[473]="icons/boat.png",
-[484]="icons/boat.png",
-[493]="icons/boat.png",
-[595]="icons/boat.png",
-[414]="icons/boxtruck.png",
-[456]="icons/boxtruck.png",
-[498]="icons/boxtruck.png",
-[499]="icons/boxtruck.png",
-[609]="icons/boxtruck.png",
-[440]="icons/roundvan.png",
-[459]="icons/roundvan.png",
-[482]="icons/roundvan.png",
-[483]="icons/roundvan.png",
-[582]="icons/roundvan.png",
-[447]="icons/sparrow.png",
-[469]="icons/sparrow.png",
-[487]="icons/maverick.png",
-[488]="icons/maverick.png",
-[497]="icons/maverick.png",
-[548]="icons/maverick.png",
-[563]="icons/maverick.png",
-[465]="icons/rccopter.png",
-[501]="icons/rccopter.png",
-[481]="icons/bike.png",
-[509]="icons/bike.png",
-[510]="icons/bike.png",
-[514]="icons/bigtruck.png",
-[515]="icons/bigtruck.png",
-[461]="icons/crotchrocket.png",
-[521]="icons/crotchrocket.png",
-[522]="icons/crotchrocket.png",
-[523]="icons/crotchrocket.png",
-[581]="icons/crotchrocket.png",
-[586]="icons/crotchrocket.png",
-[537]="icons/train.png",
-[569]="icons/train.png",
-[570]="icons/train.png",
-[590]="icons/train.png",
-[407]="icons/firetruck.png",
-[544]="icons/firetruck.png",
-[519]="icons/plane.png",
-[553]="icons/plane.png",
-[577]="icons/plane.png",
-[592]="icons/plane.png",
-[444]="icons/monstertruck.png",
-[556]="icons/monstertruck.png",
-[557]="icons/monstertruck.png",
-[596]="icons/copcar.png",
-[597]="icons/copcar.png",
-[598]="icons/copcar.png",
-[425]="icons/hunter.png",
---
-[406]="icons/406.png",
-[408]="icons/408.png",
-[416]="icons/416.png",
-[417]="icons/417.png",
-[423]="icons/423.png",
-[424]="icons/424.png",
-[427]="icons/427.png",
-[428]="icons/428.png",
-[429]="icons/429.png",
-[432]="icons/432.png",
-[433]="icons/433.png",
-[434]="icons/434.png",
-[441]="icons/441.png",
-[443]="icons/443.png",
-[448]="icons/448.png",
-[457]="icons/457.png",
-[460]="icons/460.png",
-[462]="icons/462.png",
-[463]="icons/463.png",
-[464]="icons/464.png",
-[468]="icons/468.png",
-[470]="icons/470.png",
-[471]="icons/471.png",
-[480]="icons/480.png",
-[485]="icons/485.png",
-[486]="icons/486.png",
-[508]="icons/508.png",
-[511]="icons/511.png",
-[512]="icons/512.png",
-[513]="icons/513.png",
-[520]="icons/520.png",
-[524]="icons/524.png",
-[528]="icons/528.png",
-[530]="icons/530.png",
-[531]="icons/531.png",
-[532]="icons/532.png",
-[539]="icons/539.png",
-[564]="icons/564.png",
-[568]="icons/568.png",
-[571]="icons/571.png",
-[572]="icons/572.png",
-[573]="icons/573.png",
-[574]="icons/574.png",
-[578]="icons/578.png",
-[588]="icons/588.png",
-[593]="icons/593.png",
-[599]="icons/599.png",
---
-[999]="icons/generic.png"
-}
diff --git a/[gameplay]/killmessages/gui.lua b/[gameplay]/killmessages/gui.lua
deleted file mode 100644
index 96b00722a..000000000
--- a/[gameplay]/killmessages/gui.lua
+++ /dev/null
@@ -1,271 +0,0 @@
-local customKills = {}
-local config = {
-["lines"] = 5,
-["startY"] = 0.35,
-["textHeight"] = 16,
-["iconPosOffY"] = -10,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local default = {
-["lines"] = 5,
-["startY"] = 0.25,
-["textHeight"] = 16,
-["iconPosOffY"] = -10,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local endTime
-local screenX,screenY = guiGetScreenSize ()
-local contentMessages = {}
-local fadingLines = {}
----
-local iconOrder = {}
-
-
-function setupTextOnStart ( resource )
-	if resource ~= getThisResource() then return end
-	triggerServerEvent ( "onClientKillmessagesLoaded", getLocalPlayer() )
-end
-addEventHandler ( "onClientResourceStart", getRootElement(), setupTextOnStart )
-
-addEvent ("doSetKillMessageStyle",true)
-function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
-	if ( not startX ) then startX = default.startX end
-	if ( not startY ) then startY = default.startY end
-	if ( not align ) then align = default.align end
-	if ( not lines ) then lines = default.lines end
-	if ( not fadeStart ) then fadeStart = default.startFade end
-	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
-	config.startX = startX
-	config.startY = startY
-	config.align = align
-	config.lines = lines
-	config.startFade = fadeStart
-	config.fadeTime = fadeAnimTime
-	if #contentMessages ~= 0 then
-		for i=1,config.lines do
-			if contentMessages[i] then
-				destroyLine ( i )
-			end
-		end
-	end
-	fadingLines = {}
-	killMessages = {}
-	if ( config.startY < 0 ) then
-		config.startY = screenY - math.abs(config.startY*screenY) - (config.iconHeight*config.lines)
-		config.startY = config.startY/screenY
-	end
-	createKillMessageGUI()
-	return true
-end
-addEventHandler ( "doSetKillMessageStyle",getRootElement(),setKillMessageStyle)
-
-function createKillMessageGUI()
-	local gap = config.iconHeight - config.textHeight
-	gap = gap/2
-	for i=1,config.lines do
-		local y = config.startY*screenY + (config.iconHeight*(i-1))
-		y = y + gap
-		contentMessages[i] = { dxText:create("",0,y) }
-	end
-	endTime = config.fadeTime + config.startFade
-end
-
-function shiftUpGUI()
-	local i = 1
-	for i=config.lines,2,-1 do
-		local y = config.startY*screenY + (config.iconHeight*(i-1)) + (config.iconHeight - config.textHeight)/2
-		local targetY = config.startY*screenY + (config.iconHeight*(i-2)) + (config.iconHeight - config.textHeight)/2
-		if contentMessages[i] then
-			for k,part in ipairs(contentMessages[i]) do
-				local x,realY = getWidgetPosition(part)
-
-				local diffY = realY - y
-				setWidgetPosition(part,x,targetY + diffY)
-			end
-		end
-	end
-	for i=1,config.lines-1 do
-		---shift up the alpha too
-		local tick = fadingLines[i+1]
-		fadingLines[i] = tick
-		fadingLines[i+1] = nil
-	end
-end
-
-addEvent ( "doOutputMessage", true )
-function outputMessage ( message, r, g, b, font )
-	if type(message) ~= "string" and type(message) ~= "table" then
-		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
-		return false
-	end
-	if type(font) ~= "string" then
-		font = "default"
-	end
-	r = tonumber(r) or 255
-	g = tonumber(g) or 255
-	b = tonumber(b) or 255
-	---shift everything up
-	shiftUpGUI()
-	--Delete the first line
-	destroyLine (1)
-	table.remove ( contentMessages, 1 )
-	if type(message) == "string" then
-		message = {message}
-	end
-	local y = config.startY*screenY + (config.iconHeight*(config.lines-1)) + (config.iconHeight - config.textHeight)/2
-	local startX = config.startX
-	if startX < 1 and startX > -1 then --auto calculate whether its relative or absolute
-		startX = screenX/startX --make it relative
-	end
-	if startX < 0 then
-		startX = screenX + startX
-	end
-
-	for i,part in ipairs(message) do
-		if type(part) == "table" and part[1] == "image" then
-			if not part.resource and not part.resourceName then
-				part.resource = sourceResource
-			end
-		end
-	end
-
-	drawLine ( message, startX, y, config.align, config.lines, r, g, b, font, 1 )
-	fadeLine ( config.lines )
-end
-addEventHandler ( "doOutputMessage", getRootElement(), outputMessage )
-
-function drawLine ( message, x,y, align, line, r, g, b, font, scale )
-	--First draw it and work out the width
-	local width = 0
-	contentMessages[line] = {}
-	for i,part in ipairs(message) do
-		if type(part) == "string" then
-			local text = dxText:create ( part, width, y, false )
-			text:font ( font )
-			text:scale ( scale )
-			text:type("shadow",1)
-			text:align"left"
-			text:color ( r,g,b )
-			table.insert ( contentMessages[line], text )
-			width = width + text:extent()
-		elseif part[1] == "icon" then
-			local iconWidth = part.width or iconWidths[part.id or -1] or iconWidths[255]
-			local iconHeight = part.height or config.iconHeight
-			local image = dxImage:create ( icons[part.id or 0] or icons[255], width, y + (part.posOffY or config.iconPosOffY), iconWidth, iconHeight, false )
-			image:color ( part.r or 255, part.g or 255, part.b or 255 )
-			image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
-			width = width + iconWidth
-			table.insert ( contentMessages[line], image )
-		elseif part[1] == "image" then
-			if part.width and part.path then
-				if part.resourceName then
-					part.resource = getResourceFromName(tostring(part.resourceName)) or part.resource
-				end
-				local image = dxImage:create ( ":"..getResourceName(part.resource).."/"..part.path, width, y + (part.posOffY or config.iconPosOffY), part.width, part.height or config.iconHeight, false )
-				image:color ( part.r or 255, part.g or 255, part.b or 255 )
-				image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
-				width = width + part.width
-				table.insert ( contentMessages[line], image )
-			end
-		elseif part[1] == "color" or part[1] == "colour" then
-			r = part.r or r
-			g = part.g or g
-			b = part.b or b
-		elseif part[1] == "padding" then
-			width = width + part.width or 0
-		end
-		contentMessages[line].scale = scale
-	end
-	--Now reposition everything properly
-	if align == "center" or align == "centre" then
-		x = x - width/2
-	elseif align == "right" then
-		x = x - width
-	end
-	for i,widget in ipairs(contentMessages[line]) do
-		local wx,wy = getWidgetPosition ( widget )
-		setWidgetPosition ( widget, x + wx, wy )
-	end
-	return true
-end
-
-function fadeLine ( line )
-	setLineAlpha ( line, 1 )
-	fadingLines[line] = getTickCount()
-end
------
-addEventHandler ( "onClientRender",getRootElement(),
-function()
-	for line,originalTick in pairs(fadingLines) do
-		local tickDifference = getTickCount() - originalTick
-		if tickDifference > endTime then
-			destroyLine ( line )
-			setLineAlpha ( line, 1 )
-			fadingLines[line] = nil
-		elseif tickDifference >  config.startFade then
-			local fadeTimeDifference = tickDifference - config.startFade
-			--calculate the alpha
-			local newAlpha = 1 - fadeTimeDifference/config.fadeTime
-			--Set all the alphas
-			setLineAlpha ( line, newAlpha )
-		end
-	end
-end )
-
-function setLineAlpha ( line, alpha )
-	for i,part in ipairs(contentMessages[line]) do
-		setWidgetAlpha ( part, alpha )
-	end
-end
-
-function destroyLine ( line )
-	for k,part in ipairs(contentMessages[line]) do
-		destroyWidget(part)
-	end
-	contentMessages[line] = {}
-end
-
-function destroyWidget ( widget )
-	if isElement(widget) then
-		destroyElement ( widget )
-	elseif type(widget) == "table" and widget.destroy then
-		widget:destroy()
-	end
-end
-
-function getWidgetPosition ( widget )
-	if isElement(widget) then
-		return guiGetPosition ( widget, false )
-	elseif type(widget) == "table" and widget.position then
-		return widget:position()
-	end
-end
-
-function setWidgetPosition ( widget, x, y )
-	if isElement(widget) then
-		return guiSetPosition ( widget, x, y, false )
-	elseif type(widget) == "table" and widget.position then
-		return widget:position(x,y,false)
-	end
-end
-
-function setWidgetAlpha ( widget, alpha )
-	if isElement(widget) then
-		guiSetAlpha ( widget, alpha )
-	elseif type(widget) == "table" and widget.color then
-		local r,g,b = widget:color()
-		widget:color(r,g,b,alpha*255)
-	end
-end
diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
new file mode 100644
index 000000000..ac3f974a0
--- /dev/null
+++ b/[gameplay]/killmessages/icons/aaa.js
@@ -0,0 +1,9 @@
+const fs = require('fs')
+
+const path = 'icons'
+
+fs.readdir('./' + path, 'ascii', (_, files) => {
+    for (let name of files.filter(a => a != 'index.js')) {
+        console.log(`	<file src='${path}/${name}'/>`)
+    }
+})
diff --git a/[gameplay]/killmessages/killmessages_client.lua b/[gameplay]/killmessages/killmessages_client.lua
deleted file mode 100644
index 0907c2d4b..000000000
--- a/[gameplay]/killmessages/killmessages_client.lua
+++ /dev/null
@@ -1,55 +0,0 @@
-addEvent ("onClientPlayerKillMessage",true)
-function onClientPlayerKillMessage ( killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
-	if wasEventCancelled() then return end
-	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-end
-addEventHandler ("onClientPlayerKillMessage",getRootElement(),onClientPlayerKillMessage)
-
-function outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-	if not iconWidths[weapon] then
-		if type(weapon) ~= "string" then
-			weapon = 999
-		end
-	end
-	local killerName
-	local wastedName
-	if not tonumber(wr) then wr = 255 end
-	if not tonumber(wg) then wg = 255 end
-	if not tonumber(wb) then wb = 255 end
-	if not tonumber(kr) then kr = 255 end
-	if not tonumber(kg) then kg = 255 end
-	if not tonumber(kb) then kb = 255 end
-	if ( source ) then
-		if isElement ( source ) then
-			if getElementType ( source ) == "player" then
-				wastedName = getPlayerName ( source )
-			else
-			outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-			return false end
-		elseif type(source) == "string" then
-			wastedName = source
-		end
-	else
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-	return false end
-	if ( killer ) then
-		if isElement ( killer ) then
-			if getElementType ( killer ) == "player" then
-				killerName = getPlayerName ( killer )
-			else
-				outputDebugString ( "outputKillMessage - Invalid 'killer' player specified",0,0,0,100)
-			return false end
-		elseif type(killer) == "string" then
-			killerName = killer
-		else
-			killerName = ""
-		end
-	else killerName = "" end
-	--create the new text
-	if not killerName then
-		killerName = ""
-	end
-	return outputMessage ( {killerName, {"padding",width=3}, {"icon",id=weapon},
-		{"padding",width=3},{"color",r=wr,g=wg,b=wb}, wastedName},
-		kr,kg,kb )
-end
diff --git a/[gameplay]/killmessages/killmessages_server.lua b/[gameplay]/killmessages/killmessages_server.lua
deleted file mode 100644
index 9c910d651..000000000
--- a/[gameplay]/killmessages/killmessages_server.lua
+++ /dev/null
@@ -1,192 +0,0 @@
-local config = {
-["lines"] = 5,
-["startY"] = 0.35,
-["textHeight"] = 16,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local default = {
-["lines"] = 5,
-["startY"] = 0.25,
-["textHeight"] = 16,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-
-function KillMessages_onPlayerWasted(totalammo, killer, killerweapon, bodypart)
-	local usedVehicle = nil
-	local killerType = nil
-	local killerweapon = killerweapon or 255
-	-- In very rare cases killer isn't nil or false but isn't an element.
-	if (killer and not isElement(killer)) then
-		killer = nil
-	end
-	if (killer) then
-		killerType = getElementType(killer)
-	end
-	-- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
-	if (killerType == "player") then
-		local vehicle = getPedOccupiedVehicle(killer)
-		if (vehicle and getPedWeapon(killer) == 0) then
-			usedVehicle = getElementModel(vehicle)
-		end
-	end
-	-- Change the killer into the vehicle controller
-	if (killer and killerType == "vehicle") then
-		usedVehicle = getElementModel(killer)
-		killer = getVehicleController(killer) or killer
-		killerType = getElementType(killer)
-	end
-	-- If killed by rocket and was on foot player turn it into their current weapon
-	if (killerweapon == 19 and killerType == "player" and not isPedInVehicle(killer)) then
-		killerweapon = getPedWeapon(killer) or 51
-	end
-	-- Got a killer? Print the normal "* X died" if not
-	if (killer and killerType == "player") then
-		local kr, kg, kb = getPlayerNametagColor(killer)
-		if (getPlayerTeam(killer)) then
-			kr, kg, kb = getTeamColor(getPlayerTeam(killer))
-		end
-		-- Suicide?
-		if (source == killer) then
-			local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
-			--outputDebugString("Cancelled: "..tostring(triggered))
-			if (triggered) then
-				eventTriggered(source, false, killerweapon, bodypart, true, usedVehicle)
-				return
-			end
-		end
-		local triggered = triggerEvent("onPlayerKillMessage", source, killer, killerweapon, bodypart)
-		--outputDebugString("Cancelled: "..tostring(triggered))
-		if (triggered) then
-			eventTriggered(source, killer, killerweapon, bodypart, false, usedVehicle)
-		end
-	else
-		local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
-		--outputDebugString("Cancelled: "..tostring(triggered))
-		if (triggered) then
-			eventTriggered(source, false, killerweapon, bodypart, false, usedVehicle)
-		end
-	end
-end
-addEventHandler("onPlayerWasted", root, KillMessages_onPlayerWasted)
-
-addEvent ( "onPlayerKillMessage" )
-function eventTriggered ( source,killer,weapon,bodypart,suicide,usedVehicle )
-	local wr,wg,wb = getPlayerNametagColor	( source )
-	if getPlayerTeam ( source ) then
-		wr,wg,wb = getTeamColor ( getPlayerTeam ( source ) )
-	end
-	local kr,kg,kb = false,false,false
-	if ( killer ) then
-		kr,kg,kb = getPlayerNametagColor	( killer )
-		if getPlayerTeam ( killer ) then
-			kr,kg,kb = getTeamColor ( getPlayerTeam ( killer ) )
-		end
-	end
-	if ( usedVehicle ) then
-		weapon = usedVehicle
-	end
-	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon )
-	--
-	local extra = ""
-	if ( usedVehicle ) then
-	extra = " (Vehicle)"
-	end
-	if ( killer ) then
-		if suicide then
-			local weaponName = getWeaponNameFromID ( weapon )
-			if weaponName then
-				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself. ("..weaponName..")" )
-			else
-				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself."..extra )
-			end
-		else
-			local weaponName = getWeaponNameFromID ( weapon )
-			if weaponName then
-				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source)..". ("..weaponName..")" )
-			else
-				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source).."."..extra )
-			end
-		end
-	else
-		outputConsoleKillMessage ( "* "..getPlayerName(source).." died."..extra )
-	end
-	--
-end
-
-function outputConsoleKillMessage ( text )
-	outputConsole ( text )
-end
-
-function outputKillMessage ( killed, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-	if ( resource ) then resource = getResourceName(resource) end
-	if not isElement(killed) then
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-		return false
-	end
-	if not getElementType(killed) == "player" then
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-		return false
-	end
-	return triggerClientEvent(getRootElement(),"onClientPlayerKillMessage",killed,killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
-end
-
-function outputMessage ( message, visibleTo, r, g, b, font )
-	if type(message) ~= "string" and type(message) ~= "table" then
-		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
-		return false
-	end
-	if not isElement(visibleTo) then
-		outputDebugString ( "outputMessage - Bad argument", 0, 112, 112, 112 )
-		return false
-	end
-	--Turn any resources into resource names
-	if type(message) == "table" then
-		for i,part in ipairs(message) do
-			if type(part) == "table" and part[1] == "image" then
-				if part.resource then
-					message[i].resourceName = getResourceName(part.resource)
-				else
-					part.resourceName = getResourceName(sourceResource)
-				end
-			end
-		end
-	end
-	return triggerClientEvent ( visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font )
-end
-
-function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
-	if ( not startX ) then startX = default.startX end
-	if ( not startY ) then startY = default.startY end
-	if ( not align ) then startY = align.startY end
-	if ( not lines ) then lines = default.lines end
-	if ( not fadeStart ) then fadeStart = default.startFade end
-	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
-	config.startX = startX
-	config.startY = startY
-	config.align = align
-	config.lines = lines
-	config.startFade = fadeStart
-	config.fadeTime = fadeAnimTime
-	for k,v in ipairs(getElementsByType"player") do
-		triggerClientEvent(v,"doSetKillMessageStyle",v,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
-	end
-	return true
-end
-
-addEvent ("onClientKillmessagesLoaded",true)
-addEventHandler ( "onClientKillmessagesLoaded", getRootElement(),
-function()
-	triggerClientEvent(client,"doSetKillMessageStyle",client,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
-end )
diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index 99993348a..d59e083e4 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -1,125 +1,138 @@
 <meta>
-	<info author="Talidan + Iggy" type="script" version="2.0.1"/>
-	<script src="utils/textlib.lua" type="client"/>
-	<script src="utils/imagelib.lua" type="client"/>
-	<script src="killmessages_client.lua" type="client"/>
-	<script src="killmessages_server.lua" type="server"/>
-	<script src="gui.lua" type="client"/>
-	<script src="definitions.lua" type="client"/>
-	<!--All icons courtesy of Iggy-->
-	<file src="icons/fist.png"/>
-	<file src="icons/brassknuckle.png"/>
-	<file src="icons/golfclub.png"/>
-	<file src="icons/nitestick.png"/>
-	<file src="icons/knifecur.png"/>
-	<file src="icons/bat.png"/>
-	<file src="icons/shovel.png"/>
-	<file src="icons/poolcue.png"/>
-	<file src="icons/katana.png"/>
-	<file src="icons/chnsaw.png"/>
-	<file src="icons/gun_dildo1.png"/>
-	<file src="icons/gun_dildo2.png"/>
-	<file src="icons/gun_vibe1.png"/>
-	<file src="icons/flowera.png"/>
-	<file src="icons/gun_cane.png"/>
-	<file src="icons/grenade.png"/>
-	<file src="icons/teargas.png"/>
-	<file src="icons/molotov.png"/>
-	<file src="icons/colt45.png"/>
-	<file src="icons/Silenced.png"/>
-	<file src="icons/desert_eagle.png"/>
-	<file src="icons/chromegun.png"/>
-	<file src="icons/sawnoff.png"/>
-	<file src="icons/shotgspa.png"/>
-	<file src="icons/micro_uzi.png"/>
-	<file src="icons/mp5lng.png"/>
-	<file src="icons/ak47.png"/>
-	<file src="icons/m4.png"/>
-	<file src="icons/tec9.png"/>
-	<file src="icons/cuntgun.png"/>
-	<file src="icons/sniper.png"/>
-	<file src="icons/rocketla.png"/>
-	<file src="icons/heatseek.png"/>
-	<file src="icons/flame.png"/>
-	<file src="icons/minigun.png"/>
-	<file src="icons/satchel.png"/>
-	<file src="icons/explosion.png"/>
-	<file src="icons/suicide.png"/>
-	<file src="icons/rammed.png"/>
-	<file src="icons/hunter.png"/>
-	<file src="icons/fall.png"/>
-	<file src="icons/drowned.png"/>
-	<file src="icons/generic.png"/>
-	<file src="icons/headshot.png"/>
-	<file src="icons/406.png"/>
-	<file src="icons/408.png"/>
-	<file src="icons/416.png"/>
-	<file src="icons/417.png"/>
-	<file src="icons/423.png"/>
-	<file src="icons/424.png"/>
-	<file src="icons/427.png"/>
-	<file src="icons/428.png"/>
-	<file src="icons/429.png"/>
-	<file src="icons/432.png"/>
-	<file src="icons/433.png"/>
-	<file src="icons/434.png"/>
-	<file src="icons/441.png"/>
-	<file src="icons/443.png"/>
-	<file src="icons/448.png"/>
-	<file src="icons/457.png"/>
-	<file src="icons/460.png"/>
-	<file src="icons/462.png"/>
-	<file src="icons/463.png"/>
-	<file src="icons/464.png"/>
-	<file src="icons/468.png"/>
-	<file src="icons/470.png"/>
-	<file src="icons/471.png"/>
-	<file src="icons/480.png"/>
-	<file src="icons/485.png"/>
-	<file src="icons/486.png"/>
-	<file src="icons/508.png"/>
-	<file src="icons/511.png"/>
-	<file src="icons/512.png"/>
-	<file src="icons/513.png"/>
-	<file src="icons/520.png"/>
-	<file src="icons/524.png"/>
-	<file src="icons/528.png"/>
-	<file src="icons/530.png"/>
-	<file src="icons/531.png"/>
-	<file src="icons/532.png"/>
-	<file src="icons/539.png"/>
-	<file src="icons/564.png"/>
-	<file src="icons/568.png"/>
-	<file src="icons/571.png"/>
-	<file src="icons/572.png"/>
-	<file src="icons/573.png"/>
-	<file src="icons/574.png"/>
-	<file src="icons/578.png"/>
-	<file src="icons/588.png"/>
-	<file src="icons/593.png"/>
-	<file src="icons/599.png"/>
-	<file src="icons/bigtruck.png"/>
-	<file src="icons/bike.png"/>
-	<file src="icons/boat.png"/>
-	<file src="icons/boxtruck.png"/>
-	<file src="icons/bus.png"/>
-	<file src="icons/cars.png"/>
-	<file src="icons/copcar.png"/>
-	<file src="icons/crotchrocket.png"/>
-	<file src="icons/firetruck.png"/>
-	<file src="icons/maverick.png"/>
-	<file src="icons/monstertruck.png"/>
-	<file src="icons/plane.png"/>
-	<file src="icons/rccopter.png"/>
-	<file src="icons/roundvan.png"/>
-	<file src="icons/sparrow.png"/>
-	<file src="icons/train.png"/>
-	<file src="icons/fireextinguisher.png"/>
+    <info author="Talidan + Iggy" type="script" version="2.0.2"/>
+    <min_mta_version client="1.5.7-9.20447"></min_mta_version>
 
-	<export function="outputMessage" type="server"/>
-	<export function="outputMessage" type="client"/>
-	<export function="outputKillMessage" type="server"/>
-	<export function="outputKillMessage" type="client"/>
-	<export function="setKillMessageStyle" type="client"/>
-	<export function="setKillMessageStyle" type="server"/>
+    <script type="server" src="scripts/server/s.killmessages.lua"/>
+    <script type="server" src="scripts/server/s.settings.lua"/>
+
+    <script type="client" src="scripts/client/c.killmessages.lua"/>
+    <script type="client" src="scripts/client/c.ui.lua"/>
+    <script type="client" src="scripts/client/c.settings.lua"/>
+    <script type="client" src="scripts/client/c.utils.lua"/>
+
+    <export type="shared" function="outputMessage"/>
+    <export type="shared" function="outputKillMessage"/>
+
+    <!--All icons courtesy of Iggy-->
+    <file src="icons/406.png"/>
+    <file src="icons/408.png"/>
+    <file src="icons/416.png"/>
+    <file src="icons/417.png"/>
+    <file src="icons/423.png"/>
+    <file src="icons/424.png"/>
+    <file src="icons/427.png"/>
+    <file src="icons/428.png"/>
+    <file src="icons/429.png"/>
+    <file src="icons/432.png"/>
+    <file src="icons/433.png"/>
+    <file src="icons/434.png"/>
+    <file src="icons/441.png"/>
+    <file src="icons/443.png"/>
+    <file src="icons/448.png"/>
+    <file src="icons/457.png"/>
+    <file src="icons/460.png"/>
+    <file src="icons/462.png"/>
+    <file src="icons/463.png"/>
+    <file src="icons/464.png"/>
+    <file src="icons/468.png"/>
+    <file src="icons/470.png"/>
+    <file src="icons/471.png"/>
+    <file src="icons/480.png"/>
+    <file src="icons/485.png"/>
+    <file src="icons/486.png"/>
+    <file src="icons/508.png"/>
+    <file src="icons/511.png"/>
+    <file src="icons/512.png"/>
+    <file src="icons/513.png"/>
+    <file src="icons/520.png"/>
+    <file src="icons/524.png"/>
+    <file src="icons/528.png"/>
+    <file src="icons/530.png"/>
+    <file src="icons/531.png"/>
+    <file src="icons/532.png"/>
+    <file src="icons/532b.png"/>
+    <file src="icons/539.png"/>
+    <file src="icons/564.png"/>
+    <file src="icons/568.png"/>
+    <file src="icons/571.png"/>
+    <file src="icons/572.png"/>
+    <file src="icons/573.png"/>
+    <file src="icons/574.png"/>
+    <file src="icons/578.png"/>
+    <file src="icons/588.png"/>
+    <file src="icons/593.png"/>
+    <file src="icons/599.png"/>
+    <file src="icons/601.png"/>
+    <file src="icons/ak47.png"/>
+    <file src="icons/bat.png"/>
+    <file src="icons/bigtruck.png"/>
+    <file src="icons/bike.png"/>
+    <file src="icons/boat.png"/>
+    <file src="icons/boxtruck.png"/>
+    <file src="icons/brassknuckle.png"/>
+    <file src="icons/bus.png"/>
+    <file src="icons/cars.png"/>
+    <file src="icons/chnsaw.png"/>
+    <file src="icons/chromegun.png"/>
+    <file src="icons/colt45.png"/>
+    <file src="icons/copcar.png"/>
+    <file src="icons/crotchrocket.png"/>
+    <file src="icons/cuntgun.png"/>
+    <file src="icons/desert_eagle.png"/>
+    <file src="icons/drowned.png"/>
+    <file src="icons/explosion.png"/>
+    <file src="icons/fall.png"/>
+    <file src="icons/fireextinguisher.png"/>
+    <file src="icons/firetruck.png"/>
+    <file src="icons/fist.png"/>
+    <file src="icons/flame.png"/>
+    <file src="icons/flowera.png"/>
+    <file src="icons/generic.png"/>
+    <file src="icons/golfclub.png"/>
+    <file src="icons/grenade.png"/>
+    <file src="icons/gun_cane.png"/>
+    <file src="icons/gun_dildo1.png"/>
+    <file src="icons/gun_dildo2.png"/>
+    <file src="icons/gun_vibe1.png"/>
+    <file src="icons/gun_vibe2.png"/>
+    <file src="icons/headshot.png"/>
+    <file src="icons/heatseek.png"/>
+    <file src="icons/hunter.png"/>
+    <file src="icons/katana.png"/>
+    <file src="icons/knifecur.png"/>
+    <file src="icons/m4.png"/>
+    <file src="icons/maverick.png"/>
+    <file src="icons/micro_uzi.png"/>
+    <file src="icons/minigun.png"/>
+    <file src="icons/missile.png"/>
+    <file src="icons/molotov.png"/>
+    <file src="icons/monstertruck.png"/>
+    <file src="icons/mp5lng.png"/>
+    <file src="icons/nitestick.png"/>
+    <file src="icons/plane.png"/>
+    <file src="icons/poolcue.png"/>
+    <file src="icons/rammed.png"/>
+    <file src="icons/rccopter.png"/>
+    <file src="icons/rocketla.png"/>
+    <file src="icons/roundvan.png"/>
+    <file src="icons/satchel.png"/>
+    <file src="icons/sawnoff.png"/>
+    <file src="icons/shotgspa.png"/>
+    <file src="icons/shovel.png"/>
+    <file src="icons/Silenced.png"/>
+    <file src="icons/sniper.png"/>
+    <file src="icons/sparrow.png"/>
+    <file src="icons/suicide.png"/>
+    <file src="icons/teargas.png"/>
+    <file src="icons/tec9.png"/>
+    <file src="icons/train.png"/>
+
+    <settings>
+        <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
+        <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
+        <setting name="*drawMarginBottom" value="0.35" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
+        <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
+        <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
+        <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>
+    </settings>
 </meta>
diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
new file mode 100644
index 000000000..dd54ac4d3
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
@@ -0,0 +1,51 @@
+addEvent('onClientPlayerKillMessage', true)
+addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
+    if wasEventCancelled() then return end
+    outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
+end)
+
+function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    pR = tonumber(pR) or 255
+    pG = tonumber(pG) or 255
+    pB = tonumber(pB) or 255
+    
+    kR = tonumber(kR) or 255
+    kG = tonumber(kG) or 255
+    kB = tonumber(kB) or 255
+    
+    if (not player) or (not isElement(player)) or (getElementType(player) ~= 'player') then
+        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
+        return false
+    end
+    
+    local killerName
+    
+    if isElement(killer) then
+        if (getElementType(killer) ~= 'player') then
+            outputDebugString("outputKillMessage - Invalid 'killer' player specified", 0, 0, 0, 100)
+            return false
+        end
+        killerName = getPlayerName(killer)
+
+    elseif (type(killer) == 'string') then
+        killerName = killer
+        
+    end
+    
+    local message = {
+        icon = getMessageIcon(weapon, killer),
+        victim = {
+            text = getPlayerName(player),
+            color = {pR, pG, pB},
+        }
+    }
+    
+    if (type(killerName) == 'string') then
+        message.killer = {
+            text = killerName,
+            color = {kR, kG, kB},
+        }
+    end
+    
+    return outputMessage(message)
+end
diff --git a/[gameplay]/killmessages/scripts/client/c.settings.lua b/[gameplay]/killmessages/scripts/client/c.settings.lua
new file mode 100644
index 000000000..5ec940689
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.settings.lua
@@ -0,0 +1,16 @@
+local settings = {}
+
+function getSetting(name)
+    return settings[name] or false
+end
+
+addEvent('receiveKillMessagesSettings', true)
+addEventHandler('receiveKillMessagesSettings', localPlayer, function(received)
+    for k, v in pairs(received) do -- replace only received settings.
+        settings[k] = tonumber(v)
+    end
+end)
+
+addEventHandler('onClientResourceStart', resourceRoot, function()
+    triggerServerEvent('requestKillMessagesSettings', localPlayer)
+end)
diff --git a/[gameplay]/killmessages/scripts/client/c.ui.lua b/[gameplay]/killmessages/scripts/client/c.ui.lua
new file mode 100644
index 000000000..de7ec0470
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.ui.lua
@@ -0,0 +1,112 @@
+local messages = {}
+local sW, sH = guiGetScreenSize()
+
+function outputMessage(new)
+    if (type(new) == 'string') then
+        new = {
+            victim = {
+                text = new,
+                color = {255, 255, 255},
+            },
+        }
+    end
+    
+    new.initTick = getTickCount()
+    
+    table.insert(messages, new)
+    
+    local displayLines = tonumber(getSetting('displayLines')) or 5
+    
+    local quantity = #messages
+    
+    if (quantity == 1) then
+        addEventHandler('onClientRender', root, renderMessages)
+    
+    elseif (quantity > displayLines) then
+        table.remove(messages, 1)
+    
+    end
+    
+    return true
+end
+addEvent('doOutputMessage', true)
+addEventHandler('doOutputMessage', root, outputMessage)
+
+function renderMessages()
+    local now = getTickCount()
+    
+    local lineHeight = 20
+    local font = 'default'
+    
+    local marginRight = tonumber(getSetting('drawMarginRight')) or 0.01
+    local marginBottom = tonumber(getSetting('drawMarginBottom')) or 0.035
+    local fadeTime = tonumber(getSetting('fadeTime')) or 1
+    local duration = tonumber(getSetting('duration')) or 10
+    
+    fadeTime = fadeTime * 1000
+    duration = duration * 1000
+    
+    local y = sH - (sH * marginBottom)
+    
+    local padding = 5 -- distance between texts and icon
+    
+    for k, v in ipairs(messages) do
+        local passed = now - v.initTick
+        if (passed <= duration) then
+            local alpha = 255
+            
+            if (passed <= fadeTime) then
+                alpha = 255 * passed / fadeTime
+            
+            elseif (passed >= (duration - fadeTime)) then
+                alpha = 255 - 255 * ((now - duration + fadeTime) - v.initTick) / fadeTime
+            
+            end
+            
+            local victim = v.victim
+            local victimText = victim.text
+            local victimColor = victim.color
+            victimColor = tocolor(victimColor[1], victimColor[2], victimColor[3], alpha)
+            
+            local victimWidth = dxGetTextSize(victimText, 0, 1, 1, font, false, true)
+            
+            local x = sW - (sW * marginRight) - victimWidth
+            
+            dxDrawText(victimText, x + 2, y + 2, x + victimWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
+            dxDrawText(victimText, x, y, x + victimWidth, y + lineHeight, victimColor, 1, font, 'center', 'center')
+            
+            local icon = v.icon
+            
+            if icon then
+                local texture = icon.texture
+                local iconWidth = icon.width
+                x = x - padding - iconWidth
+                dxDrawImage(x, y, iconWidth, lineHeight, texture, 0, 0, 0, tocolor(255, 255, 255, alpha))
+            end
+            
+            local killer = v.killer
+            
+            if killer then
+                local killerText = killer.text
+                local killerColor = killer.color
+                killerColor = tocolor(killerColor[1], killerColor[2], killerColor[3], alpha)
+                
+                local killerWidth = dxGetTextSize(killerText, 0, 1, 1, font, false, true)
+                
+                x = x - padding - killerWidth
+                
+                dxDrawText(killerText, x + 2, y + 2, x + killerWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
+                dxDrawText(killerText, x, y, x + killerWidth, y + lineHeight, killerColor, 1, font, 'center', 'center')
+            end
+            
+            y = y - lineHeight - padding
+        else
+            table.remove(messages, k)
+            
+            if (#messages == 0) then
+                removeEventHandler('onClientRender', root, renderMessages)
+            end
+        
+        end
+    end
+end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
new file mode 100644
index 000000000..07476187d
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.utils.lua
@@ -0,0 +1,194 @@
+local defaultIconsByVehType = {
+    ['Automobile'] = 'icons/cars.png',
+    ['Boat'] = 'icons/boat.png',
+    ['Plane'] = 'icons/plane.png',
+    ['Train'] = 'icons/train.png',
+}
+
+local customIcons = {
+    [0] = "icons/fist.png",
+    [1] = "icons/brassknuckle.png",
+    [2] = "icons/golfclub.png",
+    [3] = "icons/nitestick.png",
+    [4] = "icons/knifecur.png",
+    [5] = "icons/bat.png",
+    [6] = "icons/shovel.png",
+    [7] = "icons/poolcue.png",
+    [8] = "icons/katana.png",
+    [9] = "icons/chnsaw.png",
+    [10] = "icons/gun_dildo1.png",
+    [11] = "icons/gun_dildo2.png",
+    [12] = "icons/gun_vibe1.png",
+    [14] = "icons/flowera.png",
+    [15] = "icons/gun_cane.png",
+    [16] = "icons/grenade.png",
+    [17] = "icons/teargas.png",
+    [18] = "icons/molotov.png",
+    [19] = "icons/explosion.png",
+    [63] = "icons/explosion.png",
+    [22] = "icons/colt45.png",
+    [23] = "icons/Silenced.png",
+    [24] = "icons/desert_eagle.png",
+    [25] = "icons/chromegun.png",
+    [26] = "icons/sawnoff.png",
+    [27] = "icons/shotgspa.png",
+    [28] = "icons/micro_uzi.png",
+    [29] = "icons/mp5lng.png",
+    [30] = "icons/ak47.png",
+    [31] = "icons/m4.png",
+    [32] = "icons/tec9.png",
+    [33] = "icons/cuntgun.png",
+    [34] = "icons/sniper.png",
+    [35] = "icons/rocketla.png",
+    [36] = "icons/heatseek.png",
+    [37] = "icons/flame.png",
+    [38] = "icons/minigun.png",
+    [39] = "icons/satchel.png",
+    [42] = "icons/fireextinguisher.png",
+    [49] = "icons/rammed.png",
+    [50] = "icons/maverick.png",
+    [51] = "icons/explosion.png",
+    [53] = "icons/drowned.png",
+    [54] = "icons/fall.png",
+    [255] = "icons/suicide.png",
+    [256] = "icons/headshot.png",
+    
+    -----------vehicle specific icons, according to their vehicle id---------
+    [431] = "icons/bus.png",
+    [437] = "icons/bus.png",
+    [414] = "icons/boxtruck.png",
+    [456] = "icons/boxtruck.png",
+    [498] = "icons/boxtruck.png",
+    [499] = "icons/boxtruck.png",
+    [609] = "icons/boxtruck.png",
+    [440] = "icons/roundvan.png",
+    [459] = "icons/roundvan.png",
+    [482] = "icons/roundvan.png",
+    [483] = "icons/roundvan.png",
+    [582] = "icons/roundvan.png",
+    [447] = "icons/sparrow.png",
+    [469] = "icons/sparrow.png",
+    [487] = "icons/maverick.png",
+    [488] = "icons/maverick.png",
+    [497] = "icons/maverick.png",
+    [548] = "icons/maverick.png",
+    [563] = "icons/maverick.png",
+    [465] = "icons/rccopter.png",
+    [501] = "icons/rccopter.png",
+    [481] = "icons/bike.png",
+    [509] = "icons/bike.png",
+    [510] = "icons/bike.png",
+    [514] = "icons/bigtruck.png",
+    [515] = "icons/bigtruck.png",
+    [461] = "icons/crotchrocket.png",
+    [521] = "icons/crotchrocket.png",
+    [522] = "icons/crotchrocket.png",
+    [523] = "icons/crotchrocket.png",
+    [581] = "icons/crotchrocket.png",
+    [586] = "icons/crotchrocket.png",
+    [407] = "icons/firetruck.png",
+    [544] = "icons/firetruck.png",
+    [444] = "icons/monstertruck.png",
+    [556] = "icons/monstertruck.png",
+    [557] = "icons/monstertruck.png",
+    [596] = "icons/copcar.png",
+    [597] = "icons/copcar.png",
+    [598] = "icons/copcar.png",
+    [425] = "icons/hunter.png",
+    [406] = "icons/406.png",
+    [408] = "icons/408.png",
+    [416] = "icons/416.png",
+    [417] = "icons/417.png",
+    [423] = "icons/423.png",
+    [424] = "icons/424.png",
+    [427] = "icons/427.png",
+    [428] = "icons/428.png",
+    [429] = "icons/429.png",
+    [432] = "icons/432.png",
+    [433] = "icons/433.png",
+    [434] = "icons/434.png",
+    [441] = "icons/441.png",
+    [443] = "icons/443.png",
+    [448] = "icons/448.png",
+    [457] = "icons/457.png",
+    [460] = "icons/460.png",
+    [462] = "icons/462.png",
+    [463] = "icons/463.png",
+    [464] = "icons/464.png",
+    [468] = "icons/468.png",
+    [470] = "icons/470.png",
+    [471] = "icons/471.png",
+    [480] = "icons/480.png",
+    [485] = "icons/485.png",
+    [486] = "icons/486.png",
+    [508] = "icons/508.png",
+    [511] = "icons/511.png",
+    [512] = "icons/512.png",
+    [513] = "icons/513.png",
+    [520] = "icons/520.png",
+    [524] = "icons/524.png",
+    [528] = "icons/528.png",
+    [530] = "icons/530.png",
+    [531] = "icons/531.png",
+    [532] = "icons/532.png",
+    [539] = "icons/539.png",
+    [564] = "icons/564.png",
+    [568] = "icons/568.png",
+    [571] = "icons/571.png",
+    [572] = "icons/572.png",
+    [573] = "icons/573.png",
+    [574] = "icons/574.png",
+    [578] = "icons/578.png",
+    [588] = "icons/588.png",
+    [593] = "icons/593.png",
+    [599] = "icons/599.png",
+}
+
+function getMessageIcon(weapon, attacker)
+    local path
+    
+    if weapon then
+        path = customIcons[weapon] or 'icons/generic.png'
+    end
+    
+    local elemType = isElement(attacker) and getElementType(attacker)
+    
+    if (elemType == 'vehicle') then
+        local model = getElementModel(attacker)
+        path = customIcons[model] or defaultIconsByVehType[getVehicleType(attacker)] or 'icons/generic.png'
+    
+    elseif (elemType == 'player') then
+        local vehicle = getPedOccupiedVehicle(attacker)
+        if vehicle then
+            return getMessageIcon(vehicle)
+        end
+    
+    end
+    
+    local texture = getTexture(path)
+    
+    if texture then
+        return {
+            texture = texture,
+            width = dxGetMaterialSize(texture)
+        }
+    end
+    
+    return false
+end
+
+local textures = {}
+
+function getTexture(path)
+    if (type(path) ~= 'string') then
+        return false
+    end
+    
+    if (textures[path] ~= nil) then
+        return textures[path]
+    end
+    
+    textures[path] = dxCreateTexture(path)
+    
+    return textures[path]
+end
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
new file mode 100644
index 000000000..33f910e8e
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
@@ -0,0 +1,140 @@
+addEvent("onPlayerKillMessage")
+
+function createKillMessage(_, killer, weapon, bodypart, stealth)
+    local usedVehicle, killerType
+    local weapon = weapon or 255
+    
+    -- In very rare cases killer isn't nil or false but isn't an element.
+    if killer and (not isElement(killer)) then
+        killer = nil
+    end
+    
+    if killer then
+        killerType = getElementType(killer)
+        
+        -- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
+        if (killerType == 'player') then
+            local veh = getPedOccupiedVehicle(killer)
+            if veh and (getPedWeapon(killer) == 0) then
+                usedVehicle = veh
+            end
+        
+        -- Change the killer into the vehicle controller
+        elseif (killerType == 'vehicle') then
+            usedVehicle = killer
+            local controller = getVehicleController(killer)
+            if controller then
+                killer = controller
+                killerType = getElementType(killer)
+            end
+        
+        end
+    end
+    
+    -- If killed by rocket and was on foot player turn it into their current weapon
+    if (weapon == 19) and ((killerType == 'player') and (not isPedInVehicle(killer))) then
+        weapon = getPedWeapon(killer) or 51
+    end
+    
+    if killer and (killerType == 'player') then
+        -- Suicide?
+        if (source == killer) then
+            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
+                eventTriggered(source, false, weapon, bodypart, usedVehicle)
+            end
+        else
+            if triggerEvent("onPlayerKillMessage", source, killer, weapon, bodypart) then
+                eventTriggered(source, killer, weapon, bodypart, usedVehicle)
+            end
+        end
+    else
+        if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
+            eventTriggered(source, false, weapon, bodypart, usedVehicle)
+        end
+    end
+end
+addEventHandler('onPlayerWasted', root, createKillMessage)
+
+function eventTriggered(player, killer, weapon, bodypart, vehicle)
+    outputConsoleMessage(player, killer, vehicle, weapon)
+    
+    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
+        weapon = getElementModel(vehicle)
+    end
+    
+    local pR, pG, pB = getPlayerColor(player)
+    local kR, kG, kB = getPlayerColor(killer)
+    
+    outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    
+    return true
+end
+
+function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    if (not isElement(player)) or (getElementType(player) ~= 'player') then
+        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
+        return false
+    end
+    
+    return triggerClientEvent(root, 'onClientPlayerKillMessage', player, killer, weapon, pR, pG, pB, kR, kG, kB)
+end
+
+function outputMessage(message, visibleTo, r, g, b, font)
+    if (type(message) ~= "string") and (type(message) ~= "table") then
+        outputDebugString("outputMessage - Bad 'message' argument", 0, 112, 112, 112)
+        return false
+    end
+    if (not isElement(visibleTo)) then
+        outputDebugString("outputMessage - Bad 'visibleTo' argument", 0, 112, 112, 112)
+        return false
+    end
+    return triggerClientEvent(visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font)
+end
+
+function outputConsoleMessage(player, killer, vehicle, weapon)
+    if (get('outputConsole') ~= 'true') then
+        return false
+    end
+    
+    local extra = ''
+    
+    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
+        extra = (' (%s)'):format(getVehicleName(vehicle))
+    end
+    
+    local msg
+    if killer then
+        if (player == killer) then
+            msg = ('* %s killed himself.'):format(getPlayerName(player))
+        else
+            msg = ('* %s killed %s.'):format(getPlayerName(killer), getPlayerName(player))
+        end
+        local weaponName = getWeaponNameFromID(weapon)
+        if weaponName then
+            msg = msg .. (' (%s)'):format(weaponName)
+        else
+            msg = msg .. extra
+        end
+    else
+        msg = ('* %s died.%s'):format(getPlayerName(player), extra)
+    end
+    
+    if msg then
+        outputConsole(msg)
+    end
+    
+    return true
+end
+
+function getPlayerColor(player)
+    local r, g, b
+    if isElement(player) then
+        local team = getPlayerTeam(player)
+        if team then
+            r, g, b = getTeamColor(team)
+        else
+            r, g, b = getPlayerNametagColor(player)
+        end
+    end
+    return r, g, b
+end
diff --git a/[gameplay]/killmessages/scripts/server/s.settings.lua b/[gameplay]/killmessages/scripts/server/s.settings.lua
new file mode 100644
index 000000000..12850cf2c
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/server/s.settings.lua
@@ -0,0 +1,28 @@
+local settings = {}
+
+addEventHandler('onResourceStart', resourceRoot, function()
+    local allSettings = {'displayLines', 'drawMarginRight', 'drawMarginBottom', 'fadeTime', 'duration', 'outputConsole'}
+    for k, v in ipairs(allSettings) do
+        settings[v] = get(v)
+    end
+end)
+
+addEvent('requestKillMessagesSettings', true)
+addEventHandler('requestKillMessagesSettings', root, function()
+    triggerClientEvent(client, 'receiveKillMessagesSettings', client, settings)
+end)
+
+addEventHandler('onSettingChange', root, function(name, _, value)
+    name = name:gsub('[%*%#%@](.*)', '%1')-- Remove leading '*','#' or '@'
+    name = name:gsub(getResourceName(resource) .. '%.(.*)', '%1')-- Remove leading 'resName.'
+    
+    if (not settings[name]) then return end
+
+    value = fromJSON(value)
+    settings[name] = value
+    
+    -- send only the changed setting
+    triggerClientEvent(root, 'receiveKillMessagesSettings', root, {
+        [name] = value
+    })
+end)
diff --git a/[gameplay]/killmessages/utils/imagelib.lua b/[gameplay]/killmessages/utils/imagelib.lua
deleted file mode 100644
index fa2d75b24..000000000
--- a/[gameplay]/killmessages/utils/imagelib.lua
+++ /dev/null
@@ -1,140 +0,0 @@
-dxImage = {}
-dxImage_mt = { __index = dxImage }
-local g_screenX,g_screenY = guiGetScreenSize()
-local visibleImages = {}
-------
-local defaults = {
-	fX							= 0.5,
-	fY							= 0.5,
-	fWidth						= 0,
-	fHeight						= 0,
-	bRelativePosition			= true,
-	bRelativeSize				= true,
-	fRot						= 0,
-	fRotXOff					= 0,
-	fRotYOff					= 0,
-	strPath						= "",
-	tColor 						= {255,255,255,255},
-	bPostGUI 					= false,
-	bVisible 					= true,
-}
-
-function dxImage:create( path, x, y, width, height, relative )
-	assert(not self.fX, "attempt to call method 'create' (a nil value)")
-	if ( type(path) ~= "string" ) or ( not tonumber(x) ) or ( not tonumber(y) ) then
-		outputDebugString ( "dxImage:create - Bad argument", 0, 112, 112, 112 )
-		return false
-	end
-    local new = {}
-	setmetatable( new, dxImage_mt )
-	--Add default settings
-	for i,v in pairs(defaults) do
-		new[i] = v
-	end
-	new.fX = x or new.fX
-	new.fY = y or new.fY
-	new.strPath = path
-	new.fWidth = width or new.fWidth
-	new.fHeight = height or new.fHeight
-	if type(relative) == "boolean" then
-		new.bRelativePosition = relative
-		new.bRelativeSize = relative
-	end
-	visibleImages[new] = true
-	return new
-end
-
-function dxImage:path(path)
-	if type(path) ~= "string" then return self.strPath end
-	self.strPath = path
-	return true
-end
-
-function dxImage:position(x,y,relative)
-	if not tonumber(x) then return self.fX, self.fY end
-	self.fX = x
-	self.fY = y
-	if type(relative) == "boolean" then
-		self.bRelativePosition = relative
-	else
-		self.bRelativePosition = true
-	end
-	return true
-end
-
-function dxImage:size(x,y,relative)
-	if not tonumber(x) then return self.fWidth, self.fHeight end
-	self.fWidth = x
-	self.fHeight = y
-	if type(relative) == "boolean" then
-		self.bRelativeSize = relative
-	else
-		self.bRelativeSize = true
-	end
-	return true
-end
-
-function dxImage:color(r,g,b,a)
-	if not tonumber(r) then return unpack(self.tColor) end
-	g = g or self.tColor[2]
-	b = b or self.tColor[3]
-	a = a or self.tColor[4]
-	self.tColor = { r,g,b,a }
-	return true
-end
-
-function dxImage:rotation(rot,xoff,yoff)
-	if not tonumber(rot) then return self.fRot,self.fRotXOff,self.fRotYOff end
-	self.fRot = rot or self.fRot
-	self.fRotXOff = xoff or self.fRotXOff
-	self.fRotYOff = yoff or self.fRotYOff
-	return true
-end
-
-function dxImage:visible(bool)
-	if type(bool) ~= "boolean" then return self.bVisible end
-	self.bVisible = bool
-	if bool then
-		visibleImages[self] = true
-	else
-		visibleImages[self] = nil
-	end
-	return true
-end
-
-function dxImage:destroy()
-	self.bDestroyed = true
-	setmetatable( self, self )
-	return true
-end
-
-function dxImage:postGUI(bool)
-	if type(bool) ~= "boolean" then return self.bPostGUI end
-	self.bPostGUI = bool
-	return true
-end
-
-addEventHandler ( "onClientRender", getRootElement(),
-	function()
-		for self,_ in pairs(visibleImages) do
-			while true do
-				if self.bDestroyed then
-					visibleImages[self] = nil
-					break
-				end
-				local x,y,width,height = self.fX,self.fY,self.fWidth,self.fHeight
-				if self.bRelativePosition then
-					x = x/g_screenX
-					y = y/g_screenY
-				end
-				if self.bRelativeSize then
-					width = width/g_screenX
-					height = height/g_screenY
-				end
-				dxDrawImage ( x,y, width, height, self.strPath, self.fRot, self.fRotXOff, self.fRotYOff, tocolor(unpack(self.tColor)), self.bPostGUI )
-				break
-			end
-		end
-	end
-)
-
diff --git a/[gameplay]/killmessages/utils/textlib.lua b/[gameplay]/killmessages/utils/textlib.lua
deleted file mode 100644
index e72ea9eac..000000000
--- a/[gameplay]/killmessages/utils/textlib.lua
+++ /dev/null
@@ -1,335 +0,0 @@
-dxText = {}
-dxText_mt = { __index = dxText }
-local idAssign,idPrefix = 0,"c"
-local g_screenX,g_screenY = guiGetScreenSize()
-local visibleText = {}
-------
-local defaults = {
-	fX						= 0.5,
-	fY						= 0.5,
-	bRelativePosition				= true,
-	strText						= "",
-	bVerticalAlign 					= "center",
-	bHorizontalAlign 				= "center",
-	tColor 						= {255,255,255,255},
-	fScale 						= 1,
-	strFont 					= "default",
-	strType						= "normal",
-	tAttributes					= {},
-	bPostGUI 					= false,
-	bColorCoded					= true,
-	bClip 						= false,
-	bWordWrap	 				= true,
-	bVisible 					= true,
-	tBoundingBox					= false, --If a bounding box is not set, it will not be used.
-	bRelativeBoundingBox				= true,
-}
-
-local validFonts = {
-	default						= true,
-	["default-bold"]				= true,
-	clear						= true,
-	arial						= true,
-	pricedown					= true,
-	bankgothic					= true,
-	diploma						= true,
-	beckett						= true,
-}
-
-local validTypes = {
-	normal						= true,
-	shadow						= true,
-	border						= true,
-	stroke						= true, --Clone of border
-}
-
-local validAlignTypes = {
-	center						= true,
-	left						= true,
-	right						= true,
-}
-
-function dxText:create(text, x, y, relative)
-	assert(not self.fX, "attempt to call method 'create' (a nil value)")
-	if type(text) ~= "string" or not tonumber(x) or not tonumber(y) then
-		outputDebugString("dxText:create - Bad argument",0,112,112,112)
-		return false
-	end
-    local new = {}
-	setmetatable(new, dxText_mt)
-	--Add default settings
-	for i,v in pairs(defaults) do
-		new[i] = v
-	end
-	idAssign = idAssign+1
-	new.id = idPrefix..idAssign
-	new.strText = text or new.strText
-	new.fX = x or new.fX
-	new.fY = y or new.fY
-	if type(relative) == "boolean" then
-		new.bRelativePosition = relative
-	end
-	visibleText[new] = true
-	return new
-end
-
-function dxText:text(text)
-	if type(text) ~= "string" then return self.strText end
-	self.strText = text
-	return true
-end
-
-function dxText:position(x,y,relative)
-	if not tonumber(x) then return self.fX,self.fY end
-	self.fX = x
-	self.fY = y
-	if type(relative) == "boolean" then
-		self.bRelativePosition = relative
-	else
-		self.bRelativePosition = true
-	end
-	return true
-end
-
-function dxText:color(r,g,b,a)
-	if not tonumber(r) then return unpack(self.tColor) end
-	g = g or self.tColor[2]
-	b = b or self.tColor[3]
-	a = a or self.tColor[4]
-	self.tColor = {r,g,b,a}
-	return true
-end
-
-function dxText:scale(scale)
-	if not tonumber(scale) then return self.fScale end
-	self.fScale = scale
-	return true
-end
-
-function dxText:visible(bool)
-	if type(bool) ~= "boolean" then return self.bVisible end
-	self.bVisible = bool
-	if bool then
-		visibleText[self] = true
-	else
-		visibleText[self] = nil
-	end
-	return true
-end
-
-function dxText:destroy()
-	self.bDestroyed = true
-	setmetatable( self, self )
-	return true
-end
-
-function dxText:extent()
-	if self.bColorCoded then
-		text = string.gsub(self.strText,"#%x%x%x%x%x%x","")
-	else
-		text = self.strText
-	end
-	local extent = dxGetTextWidth(text,self.fScale,self.strFont)
-	if self.strType == "stroke" or self.strType == "border" then
-		extent = extent + self.tAttributes[1]
-	end
-	return extent
-end
-
-function dxText:height()
-	local height = dxGetFontHeight(self.fScale, self.strFont)
-	if self.strType == "stroke" or self.strType == "border" then
-		height = height + self.tAttributes[1]
-	end
-	return height
-end
-
-function dxText:font(font)
-	if not validFonts[font] then return self.strFont end
-	self.strFont = font
-	return true
-end
-
-function dxText:postGUI(bool)
-	if type(bool) ~= "boolean" then return self.bPostGUI end
-	self.bPostGUI = bool
-	return true
-end
-
-function dxText:clip(bool)
-	if type(bool) ~= "boolean" then return self.bClip end
-	self.bClip = bool
-	return true
-end
-
-function dxText:wordWrap(bool)
-	if type(bool) ~= "boolean" then return self.bWordWrap end
-	self.bWordWrap = bool
-	return true
-end
-
-function dxText:type(type,...)
-	if not validTypes[type] then return self.strType,unpack(self.tAttributes) end
-	self.strType = type
-	self.tAttributes = {...}
-	return true
-end
-
-function dxText:align(horzA, vertA)
-	if not validAlignTypes[horzA] then return self.bHorizontalAlign,self.bVerticalAlign end
-	vertA = vertA or self.bVerticalAlign
-	self.bHorizontalAlign,self.bVerticalAlign = horzA,vertA
-	return true
-end
-
-function dxText:boundingBox(left,top,right,bottom,relative)
-	if left == nil then
-		if self.tBoundingBox then
-			return unpack(boundingBox)
-		else
-			return false
-		end
-	elseif tonumber(left) and tonumber(right) and tonumber(top) and tonumber(bottom) then
-		self.tBoundingBox = {left,top,right,bottom}
-		if type(relative) == "boolean" then
-			self.bRelativeBoundingBox = relative
-		else
-			self.bRelativeBoundingBox = true
-		end
-	else
-		self.tBoundingBox = false
-	end
-	return true
-end
-
-function dxCreateCustomDX(text,left,top,right,bottom,color,scale,font,alignX,alignY,clip,wordBreak,postGUI)
-	if not text or not left or not top then
-		return false
-	end
-	local xOffset = nil
-	local fpat = "(.-)#(%x%x%x%x%x%x)"
-	local s,e,cap,col = text:find(fpat,1)
-	local last_end = 1
-	if not alignX then
-		alignX = "left"
-	elseif alignX == "center" then
-		xOffset = -(dxGetTextWidth(string.gsub(text,"#%x%x%x%x%x%x",""),scale,font)/2)
-	else
-		xOffset = 0
-	end
-	while s do
-		if cap == "" and col then
-			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
-		end
-		if s ~= 1 or cap ~= "" then
-			dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
-			xOffset = xOffset+dxGetTextWidth(cap,scale,font)
-			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
-		end
-		last_end = e+1
-		s,e,cap,col = text:find(fpat,last_end)
-	end
-	if last_end <= #text then
-		cap = text:sub(last_end)
-		dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
-		xOffset = xOffset+dxGetTextWidth(cap,scale,font)
-	end
-	return true
-end
-
-addEventHandler("onClientRender",getRootElement(),
-	function()
-		for self,_ in pairs(visibleText) do
-			while true do
-				if self.bDestroyed then
-					visibleText[self] = nil
-					break
-				end
-				local l,t,r,b
-				--If we arent using a bounding box
-				if not self.tBoundingBox then
-					--Decide if we use relative or absolute
-					local p_screenX,p_screenY = 1,1
-					if self.bRelativePosition then
-						p_screenX,p_screenY = g_screenX,g_screenY
-					end
-					local fX,fY = (self.fX)*p_screenX,(self.fY)*p_screenY
-					if self.bHorizontalAlign == "left" then
-						l = fX
-						r = fX + g_screenX
-					elseif self.bHorizontalAlign == "right" then
-						l = fX - g_screenX
-						r = fX
-					else
-						l = fX - g_screenX
-						r = fX + g_screenX
-					end
-					if self.bVerticalAlign == "top" then
-						t = fY
-						b = fY + g_screenY
-					elseif self.bVerticalAlign == "bottom" then
-						t = fY - g_screenY
-						b = fY
-					else
-						t = fY - g_screenY
-						b = fY + g_screenY
-					end
-				elseif type(self.tBoundingBox) == "table" then
-					local b_screenX,b_screenY = 1,1
-					if self.bRelativeBoundingBox then
-						b_screenX,b_screenY = g_screenX,g_screenY
-					end
-					l,t,r,b = self.tBoundingBox[1],self.tBoundingBox[2],self.tBoundingBox[3],self.tBoundingBox[4]
-					l = l*b_screenX
-					t = t*b_screenY
-					r = r*b_screenX
-					b = b*b_screenY
-				end
-				local type,att1,att2,att3,att4,att5 = self:type()
-				if type == "border" or type == "stroke" then
-					att2 = att2 or 0
-					att3 = att3 or 0
-					att4 = att4 or 0
-					att5 = att5 or self.tColor[4]
-					outlinesize = att1 or 2
-					outlinesize = math.min(self.fScale,outlinesize) --Make sure the outline size isnt thicker than the size of the label
-					if outlinesize > 0 then
-						for offsetX=-outlinesize,outlinesize,outlinesize do
-							for offsetY=-outlinesize,outlinesize,outlinesize do
-								if not offsetX == 0 and offsetY == 0 then
-									dxCreateCustomDX(self.strText,l+offsetX,t+offsetY,r+offsetX,b+offsetY,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-								end
-							end
-						end
-					end
-				elseif type == "shadow" then
-					local shadowDist = att1
-					att2 = att2 or 0
-					att3 = att3 or 0
-					att4 = att4 or 0
-					att5 = att5 or self.tColor[4]
-					dxCreateCustomDX(self.strText,l+shadowDist,t+shadowDist,r+shadowDist,b+shadowDist,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-				end
-				dxCreateCustomDX(self.strText,l,t,r,b,tocolor(unpack(self.tColor)),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-				break
-			end
-		end
-	end
-)
-
-if addEvent("updateDisplays",true) then
-	addEventHandler("updateDisplays",getRootElement(),
-		function(self)
-			setmetatable(self,dxText_mt)
-			--Remove any old ones with the same id
-			for text,_ in pairs(visibleText) do
-				if text.id == self.id then
-					visibleText[text] = nil
-				end
-			end
-			if self.bVisible and not self.bDestroyed then
-				visibleText[self] = true
-			end
-		end
-	)
-end

From 1cea5eceb137ec6cf234c5be4905be644abc6b3d Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Fri, 25 Jun 2021 07:27:21 -0300
Subject: [PATCH 04/26] Delete aaa.js

---
 [gameplay]/killmessages/icons/aaa.js | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 [gameplay]/killmessages/icons/aaa.js

diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
deleted file mode 100644
index ac3f974a0..000000000
--- a/[gameplay]/killmessages/icons/aaa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const fs = require('fs')
-
-const path = 'icons'
-
-fs.readdir('./' + path, 'ascii', (_, files) => {
-    for (let name of files.filter(a => a != 'index.js')) {
-        console.log(`	<file src='${path}/${name}'/>`)
-    }
-})

From 6bc01eb4f934170d8d83d6c8bc834fd6b423e28d Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Fri, 25 Jun 2021 08:23:52 -0300
Subject: [PATCH 05/26] remove hex from names

---
 .../killmessages/scripts/client/c.killmessages.lua       | 4 ++--
 [gameplay]/killmessages/scripts/client/c.utils.lua       | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
index dd54ac4d3..6ab7e5ed2 100644
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
@@ -35,14 +35,14 @@ function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
     local message = {
         icon = getMessageIcon(weapon, killer),
         victim = {
-            text = getPlayerName(player),
+            text = removeHex(getPlayerName(player)),
             color = {pR, pG, pB},
         }
     }
     
     if (type(killerName) == 'string') then
         message.killer = {
-            text = killerName,
+            text = removeHex(killerName),
             color = {kR, kG, kB},
         }
     end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
index 07476187d..cf90ba3df 100644
--- a/[gameplay]/killmessages/scripts/client/c.utils.lua
+++ b/[gameplay]/killmessages/scripts/client/c.utils.lua
@@ -192,3 +192,12 @@ function getTexture(path)
     
     return textures[path]
 end
+
+function removeHex(s)
+    if (type(s) == "string") then
+        while (s ~= s:gsub("#%x%x%x%x%x%x", "")) do
+            s = s:gsub("#%x%x%x%x%x%x", "")
+        end
+    end
+    return s or false
+end

From a3a76e170116325dec3fb81e792c7a1f23539dd3 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Tue, 29 Jun 2021 01:20:50 -0300
Subject: [PATCH 06/26] change default draw position

---
 [gameplay]/killmessages/meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index d59e083e4..fd9ecb86e 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -130,7 +130,7 @@
     <settings>
         <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
         <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
-        <setting name="*drawMarginBottom" value="0.35" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
+        <setting name="*drawMarginBottom" value="0.5" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
         <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
         <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
         <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>

From d343e43c0ea7dac71be78833a90ecb48caf75e67 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Tue, 29 Jun 2021 01:26:34 -0300
Subject: [PATCH 07/26] fix logic error

---
 [gameplay]/killmessages/scripts/client/c.utils.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
index cf90ba3df..4111be0fe 100644
--- a/[gameplay]/killmessages/scripts/client/c.utils.lua
+++ b/[gameplay]/killmessages/scripts/client/c.utils.lua
@@ -160,9 +160,8 @@ function getMessageIcon(weapon, attacker)
     elseif (elemType == 'player') then
         local vehicle = getPedOccupiedVehicle(attacker)
         if vehicle then
-            return getMessageIcon(vehicle)
+            return getMessageIcon(_, vehicle)
         end
-    
     end
     
     local texture = getTexture(path)

From 940c9fb808e111fd31a9eb2dd88c1ede27dbd6d6 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Tue, 29 Jun 2021 01:35:03 -0300
Subject: [PATCH 08/26] add support to vehicle kills

---
 .../scripts/client/c.killmessages.lua         | 110 +++++++++++++++++-
 .../scripts/server/s.killmessages.lua         |  28 ++++-
 2 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
index 6ab7e5ed2..ede2248d7 100644
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
@@ -1,6 +1,8 @@
 addEvent('onClientPlayerKillMessage', true)
 addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
-    if wasEventCancelled() then return end
+    if wasEventCancelled() then
+        return
+    end
     outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
 end)
 
@@ -26,10 +28,10 @@ function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
             return false
         end
         killerName = getPlayerName(killer)
-
+    
     elseif (type(killer) == 'string') then
         killerName = killer
-        
+    
     end
     
     local message = {
@@ -49,3 +51,105 @@ function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
     
     return outputMessage(message)
 end
+
+local possibleKiller
+
+function setPossibleKiller(player)
+    if possibleKiller and isTimer(possibleKiller.timer) then
+        killTimer(possibleKiller.timer)
+    end
+    
+    possibleKiller = {
+        player = player,
+        timer = setTimer(function()
+            possibleKiller = nil
+        end, 7000, 1)
+    }
+end
+
+local validExplosionTypes = {
+    [2] = true, -- rocket
+    [10] = true, -- tank grenade
+}
+
+addEventHandler('onClientExplosion', root, function(x, y, z, explosionType)
+    if (not validExplosionTypes[explosionType]) then
+        return
+    end
+    
+    if (getElementType(source) ~= 'player') then
+        return
+    end
+    
+    if (not getPedOccupiedVehicle(source)) then
+        return
+    end
+    
+    local myVehicle = getPedOccupiedVehicle(localPlayer)
+    
+    if (not myVehicle) then
+        return
+    end
+    
+    if (getDistanceBetweenPoints3D(x, y, z, getElementPosition(myVehicle)) > 10) then
+        return
+    end
+
+    setPossibleKiller(source)
+end)
+
+local vehicleWeapons = {
+    [425] = 38, -- hunter
+    [464] = 31, -- rc baron
+    [476] = 31, -- rustler
+}
+
+addEventHandler('onClientVehicleDamage', root, function(attacker, weapon)
+    if (not weapon) then
+        return
+    end
+    
+    local myVehicle = getPedOccupiedVehicle(localPlayer)
+    
+    if (source ~= myVehicle) then
+        return
+    end
+    
+    if (not attacker) or (getElementType(attacker) ~= 'vehicle') then
+        return
+    end
+    
+    local player = getVehicleOccupant(attacker)
+    
+    if (not player) then
+        return
+    end
+    
+    if (vehicleWeapons[getElementModel(attacker)] ~= weapon) then
+        return
+    end
+    
+    setPossibleKiller(player)
+end)
+
+addEventHandler('onClientPlayerWasted', localPlayer, function()
+    if (not possibleKiller) then
+        return
+    end
+    
+    if (not isElement(possibleKiller.player)) then
+        return
+    end
+    
+    local vehicle = getPedOccupiedVehicle(possibleKiller.player)
+    
+    if isElement(vehicle) then
+        triggerServerEvent('outputKillFromClient', localPlayer, possibleKiller.player, vehicle)
+    end
+    
+    if isTimer(possibleKiller.timer) then
+        killTimer(possibleKiller.timer)
+    end
+    
+    possibleKiller = nil
+end)
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
index 33f910e8e..45ad53536 100644
--- a/[gameplay]/killmessages/scripts/server/s.killmessages.lua
+++ b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
@@ -48,13 +48,37 @@ function createKillMessage(_, killer, weapon, bodypart, stealth)
             end
         end
     else
-        if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-            eventTriggered(source, false, weapon, bodypart, usedVehicle)
+        -- Avoid showing deaths caused by explosions, cuz they are client-side
+        if (weapon ~= 63) then
+            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
+                eventTriggered(source, false, weapon, bodypart, usedVehicle)
+            end
         end
     end
 end
 addEventHandler('onPlayerWasted', root, createKillMessage)
 
+addEvent('outputKillFromClient', true)
+addEventHandler('outputKillFromClient', root, function(killer, veh)
+    if (source ~= client) then
+        return
+    end
+
+    if (not isElement(killer)) then
+        return
+    end
+
+    local killerVehicle = getPedOccupiedVehicle(killer)
+
+    if (killerVehicle ~= veh) then
+        return
+    end
+
+    if triggerEvent("onPlayerKillMessage", client, killer, 19) then
+        eventTriggered(client, killer, 19, nil, veh)
+    end         
+end)
+
 function eventTriggered(player, killer, weapon, bodypart, vehicle)
     outputConsoleMessage(player, killer, vehicle, weapon)
     

From 946a38e66cf174a54a6b7607d3c3d3098d3c0498 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Tue, 29 Jun 2021 01:55:53 -0300
Subject: [PATCH 09/26] add detection to vehicle explosions even without taking
 damage from enemies

---
 .../scripts/client/c.killmessages.lua             |  5 +++++
 .../scripts/server/s.killmessages.lua             | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
index ede2248d7..ddfcfa2be 100644
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
@@ -134,6 +134,11 @@ end)
 
 addEventHandler('onClientPlayerWasted', localPlayer, function()
     if (not possibleKiller) then
+        -- If there is no possible killer and the current vehicle is exploded
+        local myVehicle = getPedOccupiedVehicle(localPlayer)
+        if myVehicle and isVehicleBlown(myVehicle) then
+            triggerServerEvent('outputKillFromClient', localPlayer, localPlayer, myVehicle)
+        end
         return
     end
     
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
index 45ad53536..f60d02a4f 100644
--- a/[gameplay]/killmessages/scripts/server/s.killmessages.lua
+++ b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
@@ -73,10 +73,17 @@ addEventHandler('outputKillFromClient', root, function(killer, veh)
     if (killerVehicle ~= veh) then
         return
     end
-
-    if triggerEvent("onPlayerKillMessage", client, killer, 19) then
-        eventTriggered(client, killer, 19, nil, veh)
-    end         
+    
+    -- If the vehicle exploded without suffering damage from enemies
+    if (killer == source) then
+        if triggerEvent("onPlayerKillMessage", source, false, 63) then
+            eventTriggered(source, false, 63)
+        end
+    else
+        if triggerEvent("onPlayerKillMessage", client, killer, 19) then
+            eventTriggered(client, killer, 19, nil, veh)
+        end 
+    end
 end)
 
 function eventTriggered(player, killer, weapon, bodypart, vehicle)

From bbe62ee8579ba682a695a0b97b6123c52b14ad67 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:15:28 -0300
Subject: [PATCH 10/26] change design

---
 .../admin/client/gui/admin_permissions.lua    | 84 ++++++++++---------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index 0ca59210c..0cd009bb3 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -18,23 +18,25 @@ addEvent('aOnPermissionsChange', true)
 function aPermissions.Show(player)
     if (not aPermissions.Form) then
         local x, y = guiGetScreenSize()
-        aPermissions.Form = guiCreateWindow(x / 2 - 130, y / 2 - 125, 260, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
+        aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
         guiSetAlpha(aPermissions.Form, 1)
         
-        aPermissions.Label = guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Use double-click to change the current state", true, aPermissions.Form)
-        guiLabelSetHorizontalAlign(aPermissions.Label, "center")
-
-        aPermissions.List = guiCreateGridList(0.03, 0.18, 0.94, 0.70, true, aPermissions.Form)
-        guiGridListAddColumn(aPermissions.List, "ACL Group", 0.65)
-        guiGridListAddColumn(aPermissions.List, "Has?", 0.2)
+        aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, ("%s's groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
+        aPermissions.RemoveGroup = guiCreateButton(0.39, 0.18, 0.075, 0.68, '>\n>\n>', true, aPermissions.Form)
+        
+        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Avaiable groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.AllGroups = guiCreateGridList(0.62, 0.18, 0.35, 0.68, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.AllGroups, "Group Name", 0.85)
+        aPermissions.AddGroup = guiCreateButton(0.535, 0.18, 0.075, 0.68, '<\n<\n<', true, aPermissions.Form)
 
-        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.47, 0.09, "Refresh", true, aPermissions.Form)
-        aPermissions.Hide = guiCreateButton(0.5, 0.88, 0.47, 0.09, "Close", true, aPermissions.Form)
+        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form)
+        aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form)
         
         addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
         addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
         addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
-        addEventHandler("onClientGUIDoubleClick", aPermissions.Form, aPermissions.onDoubleClick)
         
         --Register With Admin Form
         aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
@@ -47,13 +49,12 @@ end
 
 function aPermissions.onSync(targetPlayer, permissions)
     if (targetPlayer == aPermissions.SelectedPlayer) then
-        guiGridListClear(aPermissions.List)
+        guiGridListClear(aPermissions.PlayerGroups)
+        guiGridListClear(aPermissions.AllGroups)
+
         for group, state in pairs(permissions) do
-            local row = guiGridListAddRow(aPermissions.List)
-            guiGridListSetItemText(aPermissions.List, row, 1, group, false, false)
-            guiGridListSetItemText(aPermissions.List, row, 2, state and 'Yes' or 'No', false, false)
-            guiGridListSetItemData(aPermissions.List, row, 1, group)
-            guiGridListSetItemData(aPermissions.List, row, 2, state)
+            local gridlist = state and aPermissions.PlayerGroups or aPermissions.AllGroups
+            guiGridListAddRow(gridlist, group)
         end
     end
 end
@@ -78,31 +79,37 @@ function aPermissions.onClick(button)
             aPermissions.Close()
         elseif (source == aPermissions.Update) then
             aPermissions.Refresh()
+        elseif (source == aPermissions.RemoveGroup) then
+            aPermissions.ConfirmChange(false)
+        elseif (source == aPermissions.AddGroup) then
+            aPermissions.ConfirmChange(true)
         end
     end
 end
 
-function aPermissions.onDoubleClick(button)
-    if (button == 'left') then
-        local player = aPermissions.SelectedPlayer
-        if isElement(player) then
-            local selectedItem = guiGridListGetSelectedItem(aPermissions.List)
-            if (selectedItem > -1) then
-                local selectedGroup = guiGridListGetItemData(aPermissions.List, selectedItem, 1)
-                local currentState = guiGridListGetItemData(aPermissions.List, selectedItem, 2)
-                local confirmStr
-                if currentState then
-                    confirmStr = ('Are you sure you want to remove "%s" from the "%s" group?'):format(getPlayerName(player), selectedGroup)
-                else
-                    confirmStr = ('Are you sure you want to add "%s" to the "%s" group?'):format(getPlayerName(player), selectedGroup)
-                end
-                aMessageBox ( "question", confirmStr, "updatePlayerACLGroup", player, selectedGroup, not currentState )
-            end
-        else
-            aPermissions.Close(false)
-            messageBox("Player not found!", MB_WARNING)
-        end
+function aPermissions.ConfirmChange(add)
+    local player = aPermissions.SelectedPlayer
+
+    if (not isElement(player)) then
+        aPermissions.Close(false)
+        messageBox("Player not found!", MB_WARNING)
+        return
+    end
+
+    local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups
+    
+    local selected = guiGridListGetSelectedItem(gridlist)
+
+    if (selected <= -1) then 
+        return 
     end
+    
+    local groupName = guiGridListGetItemText(gridlist, selected, 1)
+
+    local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?'
+    str = str:format(getPlayerName(player), groupName)
+
+    return aMessageBox ( "question", str, "updatePlayerACLGroup", player, groupName, add)
 end
 
 function aPermissions.PerformAction(player, groupName, newState)
@@ -114,8 +121,9 @@ end
 
 function aPermissions.Refresh()
     local player = aPermissions.SelectedPlayer
-    if isElement(player) and (aPermissions.List) then
-        guiGridListClear(aPermissions.List)
+    if isElement(player) and aPermissions.PlayerGroups and aPermissions.AllGroups then
+        guiGridListClear(aPermissions.PlayerGroups)
+        guiGridListClear(aPermissions.AllGroups)
         triggerServerEvent('aAdmin', localPlayer, "sync", "playeraclgroups", player)
     end
 end

From 2078cc802b4da92aa59e83cbca9fcecbecf5b771 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:31:17 -0300
Subject: [PATCH 11/26] Revert "Merge branch 'master' of
 https://github.com/iDannz1/mtasa-resources into admin-replace-give-admin"

This reverts commit 124b058b01692c4b88aff04c0e5da2b177814a00, reversing
changes made to 20822316f72c9bcbd88666365ed9dc40363af660.
---
 [admin]/admin/client/gui/admin_main.lua       |   4 +-
 [gameplay]/killmessages/definitions.lua       | 519 ++++++++++++++++++
 [gameplay]/killmessages/gui.lua               | 271 +++++++++
 .../killmessages/killmessages_client.lua      |  55 ++
 .../killmessages/killmessages_server.lua      | 192 +++++++
 [gameplay]/killmessages/meta.xml              | 257 ++++-----
 .../scripts/client/c.killmessages.lua         | 160 ------
 .../scripts/client/c.settings.lua             |  16 -
 .../killmessages/scripts/client/c.ui.lua      | 112 ----
 .../killmessages/scripts/client/c.utils.lua   | 202 -------
 .../scripts/server/s.killmessages.lua         | 171 ------
 .../scripts/server/s.settings.lua             |  28 -
 [gameplay]/killmessages/utils/imagelib.lua    | 140 +++++
 [gameplay]/killmessages/utils/textlib.lua     | 335 +++++++++++
 [gameplay]/speedometer/client.lua             |  82 ---
 [gameplay]/speedometer/images/disc.png        | Bin 10990 -> 0 bytes
 [gameplay]/speedometer/images/needle.png      | Bin 1560 -> 0 bytes
 [gameplay]/speedometer/meta.xml               |   6 -
 18 files changed, 1636 insertions(+), 914 deletions(-)
 create mode 100644 [gameplay]/killmessages/definitions.lua
 create mode 100644 [gameplay]/killmessages/gui.lua
 create mode 100644 [gameplay]/killmessages/killmessages_client.lua
 create mode 100644 [gameplay]/killmessages/killmessages_server.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.settings.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.ui.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.utils.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.settings.lua
 create mode 100644 [gameplay]/killmessages/utils/imagelib.lua
 create mode 100644 [gameplay]/killmessages/utils/textlib.lua
 delete mode 100644 [gameplay]/speedometer/client.lua
 delete mode 100644 [gameplay]/speedometer/images/disc.png
 delete mode 100644 [gameplay]/speedometer/images/needle.png
 delete mode 100644 [gameplay]/speedometer/meta.xml

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 7dc143a96..035f00213 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -1391,7 +1391,7 @@ end
 
 -- anon admin
 function isAnonAdmin()
-	return (isElement(aTab1.AnonAdmin) and guiCheckBoxGetSelected ( aTab1.AnonAdmin )) or getElementData(localPlayer, 'AnonAdmin')
+	return guiCheckBoxGetSelected ( aTab1.AnonAdmin )
 end
 
 function setAnonAdmin( bOn )
@@ -1402,7 +1402,7 @@ end
 
 -- sensitive data
 function isSensitiveDataHidden()
-	return isElement(aTab1.HideSensitiveData) and guiCheckBoxGetSelected(aTab1.HideSensitiveData)
+	return guiCheckBoxGetSelected(aTab1.HideSensitiveData)
 end
 
 function setHideSensitiveData( bOn )
diff --git a/[gameplay]/killmessages/definitions.lua b/[gameplay]/killmessages/definitions.lua
new file mode 100644
index 000000000..932eaac32
--- /dev/null
+++ b/[gameplay]/killmessages/definitions.lua
@@ -0,0 +1,519 @@
+iconWidths = {
+[0] = 21,
+[1] = 15,
+[2] = 97,
+[3] = 55,
+[4] = 83,
+[5] = 72,
+[6] = 55,
+[7] = 138,
+[8] = 104,
+[9] = 59,
+[10] =40,
+[11] =31,
+[12] =41,
+[14] =10,
+[15] =71,
+[16] =13,
+[17] =10,
+[18] =4,
+[19] =17,
+[22] =35,
+[23] =50,
+[24] =37,
+[25] =75,
+[26] =67,
+[27] =66,
+[28] =17,
+[29] =35,
+[30] =70,
+[31] =71,
+[32] =22,
+[33] =75,
+[34] =86,
+[35] =74,
+[36] =75,
+[37] =19,
+[38] =54,
+[39] =8,
+[42] = 14,
+[49] = 86,
+[50] = 34,
+[51] = 17,
+[53] = 22,
+[54] = 15,
+[255] = 17,
+[256] = 20,
+[406] = 42,
+[408] = 47,
+[416] = 46,
+[417] = 33,
+[423] = 31,
+[424] = 39,
+[427] = 52,
+[428] = 43,
+[429] = 51,
+[432] = 61,
+[433] = 56,
+[434] = 45,
+[441] = 50,
+[443] = 49,
+[448] = 31,
+[457] = 26,
+[460] = 50,
+[462] = 27,
+[463] = 37,
+[464] = 43,
+[468] = 36,
+[470] = 49,
+[471] = 30,
+[480] = 52,
+[485] = 45,
+[486] = 39,
+[508] = 45,
+[511] = 49,
+[512] = 37,
+[513] = 48,
+[520] = 61,
+[524] = 41,
+[528] = 49,
+[530] = 27,
+[531] = 40,
+[532] = 42,
+[539] = 46,
+[564] = 48,
+[568] = 47,
+[571] = 41,
+[572] = 32,
+[573] = 37,
+[574] = 30,
+[578] = 37,
+[588] = 35,
+[593] = 40,
+[599] = 43,
+[601] = 48,
+--
+[400]=36,
+[401]=36,
+[402]=36,
+[403]=36,
+[404]=36,
+[405]=36,
+[409]=36,
+[410]=36,
+[411]=36,
+[412]=36,
+[413]=36,
+[415]=36,
+[418]=36,
+[419]=36,
+[420]=36,
+[421]=36,
+[422]=36,
+[426]=36,
+[435]=36,
+[436]=36,
+[438]=36,
+[439]=36,
+[445]=36,
+[449]=36,
+[450]=36,
+[451]=36,
+[458]=36,
+[466]=36,
+[467]=36,
+[474]=36,
+[475]=36,
+[477]=36,
+[478]=36,
+[479]=36,
+[489]=36,
+[490]=36,
+[491]=36,
+[492]=36,
+[494]=36,
+[495]=36,
+[496]=36,
+[500]=36,
+[503]=36,
+[504]=36,
+[505]=36,
+[506]=36,
+[507]=36,
+[516]=36,
+[517]=36,
+[518]=36,
+[525]=36,
+[526]=36,
+[527]=36,
+[529]=36,
+[533]=36,
+[534]=36,
+[535]=36,
+[536]=36,
+[540]=36,
+[541]=36,
+[542]=36,
+[543]=36,
+[545]=36,
+[546]=36,
+[547]=36,
+[549]=36,
+[550]=36,
+[551]=36,
+[552]=36,
+[554]=36,
+[555]=36,
+[558]=36,
+[559]=36,
+[560]=36,
+[561]=36,
+[562]=36,
+[565]=36,
+[566]=36,
+[567]=36,
+[575]=36,
+[576]=36,
+[579]=36,
+[580]=36,
+[583]=36,
+[584]=36,
+[585]=36,
+[587]=36,
+[589]=36,
+[591]=36,
+[594]=36,
+[600]=36,
+[602]=36,
+[603]=36,
+[604]=36,
+[605]=36,
+[606]=36,
+[607]=36,
+[608]=36,
+[610]=36,
+[611]=36,
+--
+[431]=44,
+[437]=44,
+[430]=61,
+[446]=61,
+[452]=61,
+[453]=61,
+[454]=61,
+[472]=61,
+[473]=61,
+[484]=61,
+[493]=61,
+[595]=61,
+[414]=37,
+[456]=37,
+[498]=37,
+[499]=37,
+[609]=37,
+[440]=46,
+[459]=46,
+[482]=46,
+[483]=46,
+[582]=46,
+[447]=39,
+[469]=39,
+[487]=42,
+[488]=42,
+[497]=42,
+[548]=42,
+[563]=42,
+[465]=32,
+[501]=32,
+[481]=30,
+[509]=30,
+[510]=30,
+[514]=46,
+[515]=46,
+[461]=35,
+[521]=35,
+[522]=35,
+[523]=35,
+[581]=35,
+[586]=35,
+[537]=41,
+[569]=41,
+[570]=41,
+[590]=41,
+[407]=55,
+[544]=55,
+[519]=44,
+[553]=44,
+[577]=44,
+[592]=44,
+[444]=39,
+[556]=39,
+[557]=39,
+[596]=48,
+[597]=48,
+[598]=48,
+[425]=34,
+--
+[999] = 20
+}
+--49 rammed, 50 heli blades, 53 drowning,  54 fall, 31 seaskimmer/rustler/rcbaron, hunter 38, death in vehicle no id, 52 predator
+--kill in vehicle, warp to driver
+
+icons = {
+[0] =  "icons/fist.png",
+[1] =  "icons/brassknuckle.png",
+[2] =  "icons/golfclub.png",
+[3] =  "icons/nitestick.png",
+[4] =  "icons/knifecur.png",
+[5] =  "icons/bat.png",
+[6] =  "icons/shovel.png",
+[7] =  "icons/poolcue.png",
+[8] =  "icons/katana.png",
+[9] =  "icons/chnsaw.png",
+[10] =  "icons/gun_dildo1.png",
+[11] =  "icons/gun_dildo2.png",
+[12] =  "icons/gun_vibe1.png",
+[14] =  "icons/flowera.png",
+[15] =  "icons/gun_cane.png",
+[16] =  "icons/grenade.png",
+[17] =  "icons/teargas.png",
+[18] =  "icons/molotov.png",
+[19] =  "icons/explosion.png",
+[22] =  "icons/colt45.png",
+[23] =  "icons/Silenced.png",
+[24] =  "icons/desert_eagle.png",
+[25] =  "icons/chromegun.png",
+[26] =  "icons/sawnoff.png",
+[27] =  "icons/shotgspa.png",
+[28] =  "icons/micro_uzi.png",
+[29] =  "icons/mp5lng.png",
+[30] =  "icons/ak47.png",
+[31] =  "icons/m4.png",
+[32] =  "icons/tec9.png",
+[33] =  "icons/cuntgun.png",
+[34] =  "icons/sniper.png",
+[35] =  "icons/rocketla.png",
+[36] =  "icons/heatseek.png",
+[37] =  "icons/flame.png",
+[38] =  "icons/minigun.png",
+[39] =  "icons/satchel.png",
+[42] =  "icons/fireextinguisher.png",
+[49] =  "icons/rammed.png",
+[50] =  "icons/maverick.png",
+[51] =  "icons/explosion.png",
+[53] =  "icons/drowned.png",
+[54] =  "icons/fall.png",
+[255] = "icons/suicide.png",
+[256] = "icons/headshot.png",
+-----------vehicle specific icons, according to their vehicle id---------
+[400]="icons/cars.png",
+[401]="icons/cars.png",
+[402]="icons/cars.png",
+[403]="icons/cars.png",
+[404]="icons/cars.png",
+[405]="icons/cars.png",
+[409]="icons/cars.png",
+[410]="icons/cars.png",
+[411]="icons/cars.png",
+[412]="icons/cars.png",
+[413]="icons/cars.png",
+[415]="icons/cars.png",
+[418]="icons/cars.png",
+[419]="icons/cars.png",
+[420]="icons/cars.png",
+[421]="icons/cars.png",
+[422]="icons/cars.png",
+[426]="icons/cars.png",
+[435]="icons/cars.png",
+[436]="icons/cars.png",
+[438]="icons/cars.png",
+[439]="icons/cars.png",
+[445]="icons/cars.png",
+[449]="icons/cars.png",
+[450]="icons/cars.png",
+[451]="icons/cars.png",
+[458]="icons/cars.png",
+[466]="icons/cars.png",
+[467]="icons/cars.png",
+[474]="icons/cars.png",
+[475]="icons/cars.png",
+[477]="icons/cars.png",
+[478]="icons/cars.png",
+[479]="icons/cars.png",
+[489]="icons/cars.png",
+[490]="icons/cars.png",
+[491]="icons/cars.png",
+[492]="icons/cars.png",
+[494]="icons/cars.png",
+[495]="icons/cars.png",
+[496]="icons/cars.png",
+[500]="icons/cars.png",
+[503]="icons/cars.png",
+[504]="icons/cars.png",
+[505]="icons/cars.png",
+[506]="icons/cars.png",
+[507]="icons/cars.png",
+[516]="icons/cars.png",
+[517]="icons/cars.png",
+[518]="icons/cars.png",
+[525]="icons/cars.png",
+[526]="icons/cars.png",
+[527]="icons/cars.png",
+[529]="icons/cars.png",
+[533]="icons/cars.png",
+[534]="icons/cars.png",
+[535]="icons/cars.png",
+[536]="icons/cars.png",
+[540]="icons/cars.png",
+[541]="icons/cars.png",
+[542]="icons/cars.png",
+[543]="icons/cars.png",
+[545]="icons/cars.png",
+[546]="icons/cars.png",
+[547]="icons/cars.png",
+[549]="icons/cars.png",
+[550]="icons/cars.png",
+[551]="icons/cars.png",
+[552]="icons/cars.png",
+[554]="icons/cars.png",
+[555]="icons/cars.png",
+[558]="icons/cars.png",
+[559]="icons/cars.png",
+[560]="icons/cars.png",
+[561]="icons/cars.png",
+[562]="icons/cars.png",
+[565]="icons/cars.png",
+[566]="icons/cars.png",
+[567]="icons/cars.png",
+[575]="icons/cars.png",
+[576]="icons/cars.png",
+[579]="icons/cars.png",
+[580]="icons/cars.png",
+[583]="icons/cars.png",
+[584]="icons/cars.png",
+[585]="icons/cars.png",
+[587]="icons/cars.png",
+[589]="icons/cars.png",
+[591]="icons/cars.png",
+[594]="icons/cars.png",
+[600]="icons/cars.png",
+[602]="icons/cars.png",
+[603]="icons/cars.png",
+[604]="icons/cars.png",
+[605]="icons/cars.png",
+[606]="icons/cars.png",
+[607]="icons/cars.png",
+[608]="icons/cars.png",
+[610]="icons/cars.png",
+[611]="icons/cars.png",
+--
+[431]="icons/bus.png",
+[437]="icons/bus.png",
+[430]="icons/boat.png",
+[446]="icons/boat.png",
+[452]="icons/boat.png",
+[453]="icons/boat.png",
+[454]="icons/boat.png",
+[472]="icons/boat.png",
+[473]="icons/boat.png",
+[484]="icons/boat.png",
+[493]="icons/boat.png",
+[595]="icons/boat.png",
+[414]="icons/boxtruck.png",
+[456]="icons/boxtruck.png",
+[498]="icons/boxtruck.png",
+[499]="icons/boxtruck.png",
+[609]="icons/boxtruck.png",
+[440]="icons/roundvan.png",
+[459]="icons/roundvan.png",
+[482]="icons/roundvan.png",
+[483]="icons/roundvan.png",
+[582]="icons/roundvan.png",
+[447]="icons/sparrow.png",
+[469]="icons/sparrow.png",
+[487]="icons/maverick.png",
+[488]="icons/maverick.png",
+[497]="icons/maverick.png",
+[548]="icons/maverick.png",
+[563]="icons/maverick.png",
+[465]="icons/rccopter.png",
+[501]="icons/rccopter.png",
+[481]="icons/bike.png",
+[509]="icons/bike.png",
+[510]="icons/bike.png",
+[514]="icons/bigtruck.png",
+[515]="icons/bigtruck.png",
+[461]="icons/crotchrocket.png",
+[521]="icons/crotchrocket.png",
+[522]="icons/crotchrocket.png",
+[523]="icons/crotchrocket.png",
+[581]="icons/crotchrocket.png",
+[586]="icons/crotchrocket.png",
+[537]="icons/train.png",
+[569]="icons/train.png",
+[570]="icons/train.png",
+[590]="icons/train.png",
+[407]="icons/firetruck.png",
+[544]="icons/firetruck.png",
+[519]="icons/plane.png",
+[553]="icons/plane.png",
+[577]="icons/plane.png",
+[592]="icons/plane.png",
+[444]="icons/monstertruck.png",
+[556]="icons/monstertruck.png",
+[557]="icons/monstertruck.png",
+[596]="icons/copcar.png",
+[597]="icons/copcar.png",
+[598]="icons/copcar.png",
+[425]="icons/hunter.png",
+--
+[406]="icons/406.png",
+[408]="icons/408.png",
+[416]="icons/416.png",
+[417]="icons/417.png",
+[423]="icons/423.png",
+[424]="icons/424.png",
+[427]="icons/427.png",
+[428]="icons/428.png",
+[429]="icons/429.png",
+[432]="icons/432.png",
+[433]="icons/433.png",
+[434]="icons/434.png",
+[441]="icons/441.png",
+[443]="icons/443.png",
+[448]="icons/448.png",
+[457]="icons/457.png",
+[460]="icons/460.png",
+[462]="icons/462.png",
+[463]="icons/463.png",
+[464]="icons/464.png",
+[468]="icons/468.png",
+[470]="icons/470.png",
+[471]="icons/471.png",
+[480]="icons/480.png",
+[485]="icons/485.png",
+[486]="icons/486.png",
+[508]="icons/508.png",
+[511]="icons/511.png",
+[512]="icons/512.png",
+[513]="icons/513.png",
+[520]="icons/520.png",
+[524]="icons/524.png",
+[528]="icons/528.png",
+[530]="icons/530.png",
+[531]="icons/531.png",
+[532]="icons/532.png",
+[539]="icons/539.png",
+[564]="icons/564.png",
+[568]="icons/568.png",
+[571]="icons/571.png",
+[572]="icons/572.png",
+[573]="icons/573.png",
+[574]="icons/574.png",
+[578]="icons/578.png",
+[588]="icons/588.png",
+[593]="icons/593.png",
+[599]="icons/599.png",
+--
+[999]="icons/generic.png"
+}
diff --git a/[gameplay]/killmessages/gui.lua b/[gameplay]/killmessages/gui.lua
new file mode 100644
index 000000000..96b00722a
--- /dev/null
+++ b/[gameplay]/killmessages/gui.lua
@@ -0,0 +1,271 @@
+local customKills = {}
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local endTime
+local screenX,screenY = guiGetScreenSize ()
+local contentMessages = {}
+local fadingLines = {}
+---
+local iconOrder = {}
+
+
+function setupTextOnStart ( resource )
+	if resource ~= getThisResource() then return end
+	triggerServerEvent ( "onClientKillmessagesLoaded", getLocalPlayer() )
+end
+addEventHandler ( "onClientResourceStart", getRootElement(), setupTextOnStart )
+
+addEvent ("doSetKillMessageStyle",true)
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then align = default.align end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	if #contentMessages ~= 0 then
+		for i=1,config.lines do
+			if contentMessages[i] then
+				destroyLine ( i )
+			end
+		end
+	end
+	fadingLines = {}
+	killMessages = {}
+	if ( config.startY < 0 ) then
+		config.startY = screenY - math.abs(config.startY*screenY) - (config.iconHeight*config.lines)
+		config.startY = config.startY/screenY
+	end
+	createKillMessageGUI()
+	return true
+end
+addEventHandler ( "doSetKillMessageStyle",getRootElement(),setKillMessageStyle)
+
+function createKillMessageGUI()
+	local gap = config.iconHeight - config.textHeight
+	gap = gap/2
+	for i=1,config.lines do
+		local y = config.startY*screenY + (config.iconHeight*(i-1))
+		y = y + gap
+		contentMessages[i] = { dxText:create("",0,y) }
+	end
+	endTime = config.fadeTime + config.startFade
+end
+
+function shiftUpGUI()
+	local i = 1
+	for i=config.lines,2,-1 do
+		local y = config.startY*screenY + (config.iconHeight*(i-1)) + (config.iconHeight - config.textHeight)/2
+		local targetY = config.startY*screenY + (config.iconHeight*(i-2)) + (config.iconHeight - config.textHeight)/2
+		if contentMessages[i] then
+			for k,part in ipairs(contentMessages[i]) do
+				local x,realY = getWidgetPosition(part)
+
+				local diffY = realY - y
+				setWidgetPosition(part,x,targetY + diffY)
+			end
+		end
+	end
+	for i=1,config.lines-1 do
+		---shift up the alpha too
+		local tick = fadingLines[i+1]
+		fadingLines[i] = tick
+		fadingLines[i+1] = nil
+	end
+end
+
+addEvent ( "doOutputMessage", true )
+function outputMessage ( message, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if type(font) ~= "string" then
+		font = "default"
+	end
+	r = tonumber(r) or 255
+	g = tonumber(g) or 255
+	b = tonumber(b) or 255
+	---shift everything up
+	shiftUpGUI()
+	--Delete the first line
+	destroyLine (1)
+	table.remove ( contentMessages, 1 )
+	if type(message) == "string" then
+		message = {message}
+	end
+	local y = config.startY*screenY + (config.iconHeight*(config.lines-1)) + (config.iconHeight - config.textHeight)/2
+	local startX = config.startX
+	if startX < 1 and startX > -1 then --auto calculate whether its relative or absolute
+		startX = screenX/startX --make it relative
+	end
+	if startX < 0 then
+		startX = screenX + startX
+	end
+
+	for i,part in ipairs(message) do
+		if type(part) == "table" and part[1] == "image" then
+			if not part.resource and not part.resourceName then
+				part.resource = sourceResource
+			end
+		end
+	end
+
+	drawLine ( message, startX, y, config.align, config.lines, r, g, b, font, 1 )
+	fadeLine ( config.lines )
+end
+addEventHandler ( "doOutputMessage", getRootElement(), outputMessage )
+
+function drawLine ( message, x,y, align, line, r, g, b, font, scale )
+	--First draw it and work out the width
+	local width = 0
+	contentMessages[line] = {}
+	for i,part in ipairs(message) do
+		if type(part) == "string" then
+			local text = dxText:create ( part, width, y, false )
+			text:font ( font )
+			text:scale ( scale )
+			text:type("shadow",1)
+			text:align"left"
+			text:color ( r,g,b )
+			table.insert ( contentMessages[line], text )
+			width = width + text:extent()
+		elseif part[1] == "icon" then
+			local iconWidth = part.width or iconWidths[part.id or -1] or iconWidths[255]
+			local iconHeight = part.height or config.iconHeight
+			local image = dxImage:create ( icons[part.id or 0] or icons[255], width, y + (part.posOffY or config.iconPosOffY), iconWidth, iconHeight, false )
+			image:color ( part.r or 255, part.g or 255, part.b or 255 )
+			image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+			width = width + iconWidth
+			table.insert ( contentMessages[line], image )
+		elseif part[1] == "image" then
+			if part.width and part.path then
+				if part.resourceName then
+					part.resource = getResourceFromName(tostring(part.resourceName)) or part.resource
+				end
+				local image = dxImage:create ( ":"..getResourceName(part.resource).."/"..part.path, width, y + (part.posOffY or config.iconPosOffY), part.width, part.height or config.iconHeight, false )
+				image:color ( part.r or 255, part.g or 255, part.b or 255 )
+				image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+				width = width + part.width
+				table.insert ( contentMessages[line], image )
+			end
+		elseif part[1] == "color" or part[1] == "colour" then
+			r = part.r or r
+			g = part.g or g
+			b = part.b or b
+		elseif part[1] == "padding" then
+			width = width + part.width or 0
+		end
+		contentMessages[line].scale = scale
+	end
+	--Now reposition everything properly
+	if align == "center" or align == "centre" then
+		x = x - width/2
+	elseif align == "right" then
+		x = x - width
+	end
+	for i,widget in ipairs(contentMessages[line]) do
+		local wx,wy = getWidgetPosition ( widget )
+		setWidgetPosition ( widget, x + wx, wy )
+	end
+	return true
+end
+
+function fadeLine ( line )
+	setLineAlpha ( line, 1 )
+	fadingLines[line] = getTickCount()
+end
+-----
+addEventHandler ( "onClientRender",getRootElement(),
+function()
+	for line,originalTick in pairs(fadingLines) do
+		local tickDifference = getTickCount() - originalTick
+		if tickDifference > endTime then
+			destroyLine ( line )
+			setLineAlpha ( line, 1 )
+			fadingLines[line] = nil
+		elseif tickDifference >  config.startFade then
+			local fadeTimeDifference = tickDifference - config.startFade
+			--calculate the alpha
+			local newAlpha = 1 - fadeTimeDifference/config.fadeTime
+			--Set all the alphas
+			setLineAlpha ( line, newAlpha )
+		end
+	end
+end )
+
+function setLineAlpha ( line, alpha )
+	for i,part in ipairs(contentMessages[line]) do
+		setWidgetAlpha ( part, alpha )
+	end
+end
+
+function destroyLine ( line )
+	for k,part in ipairs(contentMessages[line]) do
+		destroyWidget(part)
+	end
+	contentMessages[line] = {}
+end
+
+function destroyWidget ( widget )
+	if isElement(widget) then
+		destroyElement ( widget )
+	elseif type(widget) == "table" and widget.destroy then
+		widget:destroy()
+	end
+end
+
+function getWidgetPosition ( widget )
+	if isElement(widget) then
+		return guiGetPosition ( widget, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position()
+	end
+end
+
+function setWidgetPosition ( widget, x, y )
+	if isElement(widget) then
+		return guiSetPosition ( widget, x, y, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position(x,y,false)
+	end
+end
+
+function setWidgetAlpha ( widget, alpha )
+	if isElement(widget) then
+		guiSetAlpha ( widget, alpha )
+	elseif type(widget) == "table" and widget.color then
+		local r,g,b = widget:color()
+		widget:color(r,g,b,alpha*255)
+	end
+end
diff --git a/[gameplay]/killmessages/killmessages_client.lua b/[gameplay]/killmessages/killmessages_client.lua
new file mode 100644
index 000000000..0907c2d4b
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_client.lua
@@ -0,0 +1,55 @@
+addEvent ("onClientPlayerKillMessage",true)
+function onClientPlayerKillMessage ( killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+	if wasEventCancelled() then return end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+end
+addEventHandler ("onClientPlayerKillMessage",getRootElement(),onClientPlayerKillMessage)
+
+function outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if not iconWidths[weapon] then
+		if type(weapon) ~= "string" then
+			weapon = 999
+		end
+	end
+	local killerName
+	local wastedName
+	if not tonumber(wr) then wr = 255 end
+	if not tonumber(wg) then wg = 255 end
+	if not tonumber(wb) then wb = 255 end
+	if not tonumber(kr) then kr = 255 end
+	if not tonumber(kg) then kg = 255 end
+	if not tonumber(kb) then kb = 255 end
+	if ( source ) then
+		if isElement ( source ) then
+			if getElementType ( source ) == "player" then
+				wastedName = getPlayerName ( source )
+			else
+			outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+			return false end
+		elseif type(source) == "string" then
+			wastedName = source
+		end
+	else
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+	return false end
+	if ( killer ) then
+		if isElement ( killer ) then
+			if getElementType ( killer ) == "player" then
+				killerName = getPlayerName ( killer )
+			else
+				outputDebugString ( "outputKillMessage - Invalid 'killer' player specified",0,0,0,100)
+			return false end
+		elseif type(killer) == "string" then
+			killerName = killer
+		else
+			killerName = ""
+		end
+	else killerName = "" end
+	--create the new text
+	if not killerName then
+		killerName = ""
+	end
+	return outputMessage ( {killerName, {"padding",width=3}, {"icon",id=weapon},
+		{"padding",width=3},{"color",r=wr,g=wg,b=wb}, wastedName},
+		kr,kg,kb )
+end
diff --git a/[gameplay]/killmessages/killmessages_server.lua b/[gameplay]/killmessages/killmessages_server.lua
new file mode 100644
index 000000000..9c910d651
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_server.lua
@@ -0,0 +1,192 @@
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+
+function KillMessages_onPlayerWasted(totalammo, killer, killerweapon, bodypart)
+	local usedVehicle = nil
+	local killerType = nil
+	local killerweapon = killerweapon or 255
+	-- In very rare cases killer isn't nil or false but isn't an element.
+	if (killer and not isElement(killer)) then
+		killer = nil
+	end
+	if (killer) then
+		killerType = getElementType(killer)
+	end
+	-- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
+	if (killerType == "player") then
+		local vehicle = getPedOccupiedVehicle(killer)
+		if (vehicle and getPedWeapon(killer) == 0) then
+			usedVehicle = getElementModel(vehicle)
+		end
+	end
+	-- Change the killer into the vehicle controller
+	if (killer and killerType == "vehicle") then
+		usedVehicle = getElementModel(killer)
+		killer = getVehicleController(killer) or killer
+		killerType = getElementType(killer)
+	end
+	-- If killed by rocket and was on foot player turn it into their current weapon
+	if (killerweapon == 19 and killerType == "player" and not isPedInVehicle(killer)) then
+		killerweapon = getPedWeapon(killer) or 51
+	end
+	-- Got a killer? Print the normal "* X died" if not
+	if (killer and killerType == "player") then
+		local kr, kg, kb = getPlayerNametagColor(killer)
+		if (getPlayerTeam(killer)) then
+			kr, kg, kb = getTeamColor(getPlayerTeam(killer))
+		end
+		-- Suicide?
+		if (source == killer) then
+			local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+			--outputDebugString("Cancelled: "..tostring(triggered))
+			if (triggered) then
+				eventTriggered(source, false, killerweapon, bodypart, true, usedVehicle)
+				return
+			end
+		end
+		local triggered = triggerEvent("onPlayerKillMessage", source, killer, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, killer, killerweapon, bodypart, false, usedVehicle)
+		end
+	else
+		local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, false, killerweapon, bodypart, false, usedVehicle)
+		end
+	end
+end
+addEventHandler("onPlayerWasted", root, KillMessages_onPlayerWasted)
+
+addEvent ( "onPlayerKillMessage" )
+function eventTriggered ( source,killer,weapon,bodypart,suicide,usedVehicle )
+	local wr,wg,wb = getPlayerNametagColor	( source )
+	if getPlayerTeam ( source ) then
+		wr,wg,wb = getTeamColor ( getPlayerTeam ( source ) )
+	end
+	local kr,kg,kb = false,false,false
+	if ( killer ) then
+		kr,kg,kb = getPlayerNametagColor	( killer )
+		if getPlayerTeam ( killer ) then
+			kr,kg,kb = getTeamColor ( getPlayerTeam ( killer ) )
+		end
+	end
+	if ( usedVehicle ) then
+		weapon = usedVehicle
+	end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon )
+	--
+	local extra = ""
+	if ( usedVehicle ) then
+	extra = " (Vehicle)"
+	end
+	if ( killer ) then
+		if suicide then
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself. ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself."..extra )
+			end
+		else
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source)..". ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source).."."..extra )
+			end
+		end
+	else
+		outputConsoleKillMessage ( "* "..getPlayerName(source).." died."..extra )
+	end
+	--
+end
+
+function outputConsoleKillMessage ( text )
+	outputConsole ( text )
+end
+
+function outputKillMessage ( killed, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if ( resource ) then resource = getResourceName(resource) end
+	if not isElement(killed) then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	if not getElementType(killed) == "player" then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	return triggerClientEvent(getRootElement(),"onClientPlayerKillMessage",killed,killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+end
+
+function outputMessage ( message, visibleTo, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if not isElement(visibleTo) then
+		outputDebugString ( "outputMessage - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+	--Turn any resources into resource names
+	if type(message) == "table" then
+		for i,part in ipairs(message) do
+			if type(part) == "table" and part[1] == "image" then
+				if part.resource then
+					message[i].resourceName = getResourceName(part.resource)
+				else
+					part.resourceName = getResourceName(sourceResource)
+				end
+			end
+		end
+	end
+	return triggerClientEvent ( visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font )
+end
+
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then startY = align.startY end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	for k,v in ipairs(getElementsByType"player") do
+		triggerClientEvent(v,"doSetKillMessageStyle",v,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+	end
+	return true
+end
+
+addEvent ("onClientKillmessagesLoaded",true)
+addEventHandler ( "onClientKillmessagesLoaded", getRootElement(),
+function()
+	triggerClientEvent(client,"doSetKillMessageStyle",client,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+end )
diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index fd9ecb86e..99993348a 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -1,138 +1,125 @@
 <meta>
-    <info author="Talidan + Iggy" type="script" version="2.0.2"/>
-    <min_mta_version client="1.5.7-9.20447"></min_mta_version>
+	<info author="Talidan + Iggy" type="script" version="2.0.1"/>
+	<script src="utils/textlib.lua" type="client"/>
+	<script src="utils/imagelib.lua" type="client"/>
+	<script src="killmessages_client.lua" type="client"/>
+	<script src="killmessages_server.lua" type="server"/>
+	<script src="gui.lua" type="client"/>
+	<script src="definitions.lua" type="client"/>
+	<!--All icons courtesy of Iggy-->
+	<file src="icons/fist.png"/>
+	<file src="icons/brassknuckle.png"/>
+	<file src="icons/golfclub.png"/>
+	<file src="icons/nitestick.png"/>
+	<file src="icons/knifecur.png"/>
+	<file src="icons/bat.png"/>
+	<file src="icons/shovel.png"/>
+	<file src="icons/poolcue.png"/>
+	<file src="icons/katana.png"/>
+	<file src="icons/chnsaw.png"/>
+	<file src="icons/gun_dildo1.png"/>
+	<file src="icons/gun_dildo2.png"/>
+	<file src="icons/gun_vibe1.png"/>
+	<file src="icons/flowera.png"/>
+	<file src="icons/gun_cane.png"/>
+	<file src="icons/grenade.png"/>
+	<file src="icons/teargas.png"/>
+	<file src="icons/molotov.png"/>
+	<file src="icons/colt45.png"/>
+	<file src="icons/Silenced.png"/>
+	<file src="icons/desert_eagle.png"/>
+	<file src="icons/chromegun.png"/>
+	<file src="icons/sawnoff.png"/>
+	<file src="icons/shotgspa.png"/>
+	<file src="icons/micro_uzi.png"/>
+	<file src="icons/mp5lng.png"/>
+	<file src="icons/ak47.png"/>
+	<file src="icons/m4.png"/>
+	<file src="icons/tec9.png"/>
+	<file src="icons/cuntgun.png"/>
+	<file src="icons/sniper.png"/>
+	<file src="icons/rocketla.png"/>
+	<file src="icons/heatseek.png"/>
+	<file src="icons/flame.png"/>
+	<file src="icons/minigun.png"/>
+	<file src="icons/satchel.png"/>
+	<file src="icons/explosion.png"/>
+	<file src="icons/suicide.png"/>
+	<file src="icons/rammed.png"/>
+	<file src="icons/hunter.png"/>
+	<file src="icons/fall.png"/>
+	<file src="icons/drowned.png"/>
+	<file src="icons/generic.png"/>
+	<file src="icons/headshot.png"/>
+	<file src="icons/406.png"/>
+	<file src="icons/408.png"/>
+	<file src="icons/416.png"/>
+	<file src="icons/417.png"/>
+	<file src="icons/423.png"/>
+	<file src="icons/424.png"/>
+	<file src="icons/427.png"/>
+	<file src="icons/428.png"/>
+	<file src="icons/429.png"/>
+	<file src="icons/432.png"/>
+	<file src="icons/433.png"/>
+	<file src="icons/434.png"/>
+	<file src="icons/441.png"/>
+	<file src="icons/443.png"/>
+	<file src="icons/448.png"/>
+	<file src="icons/457.png"/>
+	<file src="icons/460.png"/>
+	<file src="icons/462.png"/>
+	<file src="icons/463.png"/>
+	<file src="icons/464.png"/>
+	<file src="icons/468.png"/>
+	<file src="icons/470.png"/>
+	<file src="icons/471.png"/>
+	<file src="icons/480.png"/>
+	<file src="icons/485.png"/>
+	<file src="icons/486.png"/>
+	<file src="icons/508.png"/>
+	<file src="icons/511.png"/>
+	<file src="icons/512.png"/>
+	<file src="icons/513.png"/>
+	<file src="icons/520.png"/>
+	<file src="icons/524.png"/>
+	<file src="icons/528.png"/>
+	<file src="icons/530.png"/>
+	<file src="icons/531.png"/>
+	<file src="icons/532.png"/>
+	<file src="icons/539.png"/>
+	<file src="icons/564.png"/>
+	<file src="icons/568.png"/>
+	<file src="icons/571.png"/>
+	<file src="icons/572.png"/>
+	<file src="icons/573.png"/>
+	<file src="icons/574.png"/>
+	<file src="icons/578.png"/>
+	<file src="icons/588.png"/>
+	<file src="icons/593.png"/>
+	<file src="icons/599.png"/>
+	<file src="icons/bigtruck.png"/>
+	<file src="icons/bike.png"/>
+	<file src="icons/boat.png"/>
+	<file src="icons/boxtruck.png"/>
+	<file src="icons/bus.png"/>
+	<file src="icons/cars.png"/>
+	<file src="icons/copcar.png"/>
+	<file src="icons/crotchrocket.png"/>
+	<file src="icons/firetruck.png"/>
+	<file src="icons/maverick.png"/>
+	<file src="icons/monstertruck.png"/>
+	<file src="icons/plane.png"/>
+	<file src="icons/rccopter.png"/>
+	<file src="icons/roundvan.png"/>
+	<file src="icons/sparrow.png"/>
+	<file src="icons/train.png"/>
+	<file src="icons/fireextinguisher.png"/>
 
-    <script type="server" src="scripts/server/s.killmessages.lua"/>
-    <script type="server" src="scripts/server/s.settings.lua"/>
-
-    <script type="client" src="scripts/client/c.killmessages.lua"/>
-    <script type="client" src="scripts/client/c.ui.lua"/>
-    <script type="client" src="scripts/client/c.settings.lua"/>
-    <script type="client" src="scripts/client/c.utils.lua"/>
-
-    <export type="shared" function="outputMessage"/>
-    <export type="shared" function="outputKillMessage"/>
-
-    <!--All icons courtesy of Iggy-->
-    <file src="icons/406.png"/>
-    <file src="icons/408.png"/>
-    <file src="icons/416.png"/>
-    <file src="icons/417.png"/>
-    <file src="icons/423.png"/>
-    <file src="icons/424.png"/>
-    <file src="icons/427.png"/>
-    <file src="icons/428.png"/>
-    <file src="icons/429.png"/>
-    <file src="icons/432.png"/>
-    <file src="icons/433.png"/>
-    <file src="icons/434.png"/>
-    <file src="icons/441.png"/>
-    <file src="icons/443.png"/>
-    <file src="icons/448.png"/>
-    <file src="icons/457.png"/>
-    <file src="icons/460.png"/>
-    <file src="icons/462.png"/>
-    <file src="icons/463.png"/>
-    <file src="icons/464.png"/>
-    <file src="icons/468.png"/>
-    <file src="icons/470.png"/>
-    <file src="icons/471.png"/>
-    <file src="icons/480.png"/>
-    <file src="icons/485.png"/>
-    <file src="icons/486.png"/>
-    <file src="icons/508.png"/>
-    <file src="icons/511.png"/>
-    <file src="icons/512.png"/>
-    <file src="icons/513.png"/>
-    <file src="icons/520.png"/>
-    <file src="icons/524.png"/>
-    <file src="icons/528.png"/>
-    <file src="icons/530.png"/>
-    <file src="icons/531.png"/>
-    <file src="icons/532.png"/>
-    <file src="icons/532b.png"/>
-    <file src="icons/539.png"/>
-    <file src="icons/564.png"/>
-    <file src="icons/568.png"/>
-    <file src="icons/571.png"/>
-    <file src="icons/572.png"/>
-    <file src="icons/573.png"/>
-    <file src="icons/574.png"/>
-    <file src="icons/578.png"/>
-    <file src="icons/588.png"/>
-    <file src="icons/593.png"/>
-    <file src="icons/599.png"/>
-    <file src="icons/601.png"/>
-    <file src="icons/ak47.png"/>
-    <file src="icons/bat.png"/>
-    <file src="icons/bigtruck.png"/>
-    <file src="icons/bike.png"/>
-    <file src="icons/boat.png"/>
-    <file src="icons/boxtruck.png"/>
-    <file src="icons/brassknuckle.png"/>
-    <file src="icons/bus.png"/>
-    <file src="icons/cars.png"/>
-    <file src="icons/chnsaw.png"/>
-    <file src="icons/chromegun.png"/>
-    <file src="icons/colt45.png"/>
-    <file src="icons/copcar.png"/>
-    <file src="icons/crotchrocket.png"/>
-    <file src="icons/cuntgun.png"/>
-    <file src="icons/desert_eagle.png"/>
-    <file src="icons/drowned.png"/>
-    <file src="icons/explosion.png"/>
-    <file src="icons/fall.png"/>
-    <file src="icons/fireextinguisher.png"/>
-    <file src="icons/firetruck.png"/>
-    <file src="icons/fist.png"/>
-    <file src="icons/flame.png"/>
-    <file src="icons/flowera.png"/>
-    <file src="icons/generic.png"/>
-    <file src="icons/golfclub.png"/>
-    <file src="icons/grenade.png"/>
-    <file src="icons/gun_cane.png"/>
-    <file src="icons/gun_dildo1.png"/>
-    <file src="icons/gun_dildo2.png"/>
-    <file src="icons/gun_vibe1.png"/>
-    <file src="icons/gun_vibe2.png"/>
-    <file src="icons/headshot.png"/>
-    <file src="icons/heatseek.png"/>
-    <file src="icons/hunter.png"/>
-    <file src="icons/katana.png"/>
-    <file src="icons/knifecur.png"/>
-    <file src="icons/m4.png"/>
-    <file src="icons/maverick.png"/>
-    <file src="icons/micro_uzi.png"/>
-    <file src="icons/minigun.png"/>
-    <file src="icons/missile.png"/>
-    <file src="icons/molotov.png"/>
-    <file src="icons/monstertruck.png"/>
-    <file src="icons/mp5lng.png"/>
-    <file src="icons/nitestick.png"/>
-    <file src="icons/plane.png"/>
-    <file src="icons/poolcue.png"/>
-    <file src="icons/rammed.png"/>
-    <file src="icons/rccopter.png"/>
-    <file src="icons/rocketla.png"/>
-    <file src="icons/roundvan.png"/>
-    <file src="icons/satchel.png"/>
-    <file src="icons/sawnoff.png"/>
-    <file src="icons/shotgspa.png"/>
-    <file src="icons/shovel.png"/>
-    <file src="icons/Silenced.png"/>
-    <file src="icons/sniper.png"/>
-    <file src="icons/sparrow.png"/>
-    <file src="icons/suicide.png"/>
-    <file src="icons/teargas.png"/>
-    <file src="icons/tec9.png"/>
-    <file src="icons/train.png"/>
-
-    <settings>
-        <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
-        <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
-        <setting name="*drawMarginBottom" value="0.5" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
-        <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
-        <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
-        <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>
-    </settings>
+	<export function="outputMessage" type="server"/>
+	<export function="outputMessage" type="client"/>
+	<export function="outputKillMessage" type="server"/>
+	<export function="outputKillMessage" type="client"/>
+	<export function="setKillMessageStyle" type="client"/>
+	<export function="setKillMessageStyle" type="server"/>
 </meta>
diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
deleted file mode 100644
index ddfcfa2be..000000000
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ /dev/null
@@ -1,160 +0,0 @@
-addEvent('onClientPlayerKillMessage', true)
-addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
-    if wasEventCancelled() then
-        return
-    end
-    outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
-end)
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    pR = tonumber(pR) or 255
-    pG = tonumber(pG) or 255
-    pB = tonumber(pB) or 255
-    
-    kR = tonumber(kR) or 255
-    kG = tonumber(kG) or 255
-    kB = tonumber(kB) or 255
-    
-    if (not player) or (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    local killerName
-    
-    if isElement(killer) then
-        if (getElementType(killer) ~= 'player') then
-            outputDebugString("outputKillMessage - Invalid 'killer' player specified", 0, 0, 0, 100)
-            return false
-        end
-        killerName = getPlayerName(killer)
-    
-    elseif (type(killer) == 'string') then
-        killerName = killer
-    
-    end
-    
-    local message = {
-        icon = getMessageIcon(weapon, killer),
-        victim = {
-            text = removeHex(getPlayerName(player)),
-            color = {pR, pG, pB},
-        }
-    }
-    
-    if (type(killerName) == 'string') then
-        message.killer = {
-            text = removeHex(killerName),
-            color = {kR, kG, kB},
-        }
-    end
-    
-    return outputMessage(message)
-end
-
-local possibleKiller
-
-function setPossibleKiller(player)
-    if possibleKiller and isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = {
-        player = player,
-        timer = setTimer(function()
-            possibleKiller = nil
-        end, 7000, 1)
-    }
-end
-
-local validExplosionTypes = {
-    [2] = true, -- rocket
-    [10] = true, -- tank grenade
-}
-
-addEventHandler('onClientExplosion', root, function(x, y, z, explosionType)
-    if (not validExplosionTypes[explosionType]) then
-        return
-    end
-    
-    if (getElementType(source) ~= 'player') then
-        return
-    end
-    
-    if (not getPedOccupiedVehicle(source)) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (not myVehicle) then
-        return
-    end
-    
-    if (getDistanceBetweenPoints3D(x, y, z, getElementPosition(myVehicle)) > 10) then
-        return
-    end
-
-    setPossibleKiller(source)
-end)
-
-local vehicleWeapons = {
-    [425] = 38, -- hunter
-    [464] = 31, -- rc baron
-    [476] = 31, -- rustler
-}
-
-addEventHandler('onClientVehicleDamage', root, function(attacker, weapon)
-    if (not weapon) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (source ~= myVehicle) then
-        return
-    end
-    
-    if (not attacker) or (getElementType(attacker) ~= 'vehicle') then
-        return
-    end
-    
-    local player = getVehicleOccupant(attacker)
-    
-    if (not player) then
-        return
-    end
-    
-    if (vehicleWeapons[getElementModel(attacker)] ~= weapon) then
-        return
-    end
-    
-    setPossibleKiller(player)
-end)
-
-addEventHandler('onClientPlayerWasted', localPlayer, function()
-    if (not possibleKiller) then
-        -- If there is no possible killer and the current vehicle is exploded
-        local myVehicle = getPedOccupiedVehicle(localPlayer)
-        if myVehicle and isVehicleBlown(myVehicle) then
-            triggerServerEvent('outputKillFromClient', localPlayer, localPlayer, myVehicle)
-        end
-        return
-    end
-    
-    if (not isElement(possibleKiller.player)) then
-        return
-    end
-    
-    local vehicle = getPedOccupiedVehicle(possibleKiller.player)
-    
-    if isElement(vehicle) then
-        triggerServerEvent('outputKillFromClient', localPlayer, possibleKiller.player, vehicle)
-    end
-    
-    if isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = nil
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.settings.lua b/[gameplay]/killmessages/scripts/client/c.settings.lua
deleted file mode 100644
index 5ec940689..000000000
--- a/[gameplay]/killmessages/scripts/client/c.settings.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local settings = {}
-
-function getSetting(name)
-    return settings[name] or false
-end
-
-addEvent('receiveKillMessagesSettings', true)
-addEventHandler('receiveKillMessagesSettings', localPlayer, function(received)
-    for k, v in pairs(received) do -- replace only received settings.
-        settings[k] = tonumber(v)
-    end
-end)
-
-addEventHandler('onClientResourceStart', resourceRoot, function()
-    triggerServerEvent('requestKillMessagesSettings', localPlayer)
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.ui.lua b/[gameplay]/killmessages/scripts/client/c.ui.lua
deleted file mode 100644
index de7ec0470..000000000
--- a/[gameplay]/killmessages/scripts/client/c.ui.lua
+++ /dev/null
@@ -1,112 +0,0 @@
-local messages = {}
-local sW, sH = guiGetScreenSize()
-
-function outputMessage(new)
-    if (type(new) == 'string') then
-        new = {
-            victim = {
-                text = new,
-                color = {255, 255, 255},
-            },
-        }
-    end
-    
-    new.initTick = getTickCount()
-    
-    table.insert(messages, new)
-    
-    local displayLines = tonumber(getSetting('displayLines')) or 5
-    
-    local quantity = #messages
-    
-    if (quantity == 1) then
-        addEventHandler('onClientRender', root, renderMessages)
-    
-    elseif (quantity > displayLines) then
-        table.remove(messages, 1)
-    
-    end
-    
-    return true
-end
-addEvent('doOutputMessage', true)
-addEventHandler('doOutputMessage', root, outputMessage)
-
-function renderMessages()
-    local now = getTickCount()
-    
-    local lineHeight = 20
-    local font = 'default'
-    
-    local marginRight = tonumber(getSetting('drawMarginRight')) or 0.01
-    local marginBottom = tonumber(getSetting('drawMarginBottom')) or 0.035
-    local fadeTime = tonumber(getSetting('fadeTime')) or 1
-    local duration = tonumber(getSetting('duration')) or 10
-    
-    fadeTime = fadeTime * 1000
-    duration = duration * 1000
-    
-    local y = sH - (sH * marginBottom)
-    
-    local padding = 5 -- distance between texts and icon
-    
-    for k, v in ipairs(messages) do
-        local passed = now - v.initTick
-        if (passed <= duration) then
-            local alpha = 255
-            
-            if (passed <= fadeTime) then
-                alpha = 255 * passed / fadeTime
-            
-            elseif (passed >= (duration - fadeTime)) then
-                alpha = 255 - 255 * ((now - duration + fadeTime) - v.initTick) / fadeTime
-            
-            end
-            
-            local victim = v.victim
-            local victimText = victim.text
-            local victimColor = victim.color
-            victimColor = tocolor(victimColor[1], victimColor[2], victimColor[3], alpha)
-            
-            local victimWidth = dxGetTextSize(victimText, 0, 1, 1, font, false, true)
-            
-            local x = sW - (sW * marginRight) - victimWidth
-            
-            dxDrawText(victimText, x + 2, y + 2, x + victimWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-            dxDrawText(victimText, x, y, x + victimWidth, y + lineHeight, victimColor, 1, font, 'center', 'center')
-            
-            local icon = v.icon
-            
-            if icon then
-                local texture = icon.texture
-                local iconWidth = icon.width
-                x = x - padding - iconWidth
-                dxDrawImage(x, y, iconWidth, lineHeight, texture, 0, 0, 0, tocolor(255, 255, 255, alpha))
-            end
-            
-            local killer = v.killer
-            
-            if killer then
-                local killerText = killer.text
-                local killerColor = killer.color
-                killerColor = tocolor(killerColor[1], killerColor[2], killerColor[3], alpha)
-                
-                local killerWidth = dxGetTextSize(killerText, 0, 1, 1, font, false, true)
-                
-                x = x - padding - killerWidth
-                
-                dxDrawText(killerText, x + 2, y + 2, x + killerWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-                dxDrawText(killerText, x, y, x + killerWidth, y + lineHeight, killerColor, 1, font, 'center', 'center')
-            end
-            
-            y = y - lineHeight - padding
-        else
-            table.remove(messages, k)
-            
-            if (#messages == 0) then
-                removeEventHandler('onClientRender', root, renderMessages)
-            end
-        
-        end
-    end
-end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
deleted file mode 100644
index 4111be0fe..000000000
--- a/[gameplay]/killmessages/scripts/client/c.utils.lua
+++ /dev/null
@@ -1,202 +0,0 @@
-local defaultIconsByVehType = {
-    ['Automobile'] = 'icons/cars.png',
-    ['Boat'] = 'icons/boat.png',
-    ['Plane'] = 'icons/plane.png',
-    ['Train'] = 'icons/train.png',
-}
-
-local customIcons = {
-    [0] = "icons/fist.png",
-    [1] = "icons/brassknuckle.png",
-    [2] = "icons/golfclub.png",
-    [3] = "icons/nitestick.png",
-    [4] = "icons/knifecur.png",
-    [5] = "icons/bat.png",
-    [6] = "icons/shovel.png",
-    [7] = "icons/poolcue.png",
-    [8] = "icons/katana.png",
-    [9] = "icons/chnsaw.png",
-    [10] = "icons/gun_dildo1.png",
-    [11] = "icons/gun_dildo2.png",
-    [12] = "icons/gun_vibe1.png",
-    [14] = "icons/flowera.png",
-    [15] = "icons/gun_cane.png",
-    [16] = "icons/grenade.png",
-    [17] = "icons/teargas.png",
-    [18] = "icons/molotov.png",
-    [19] = "icons/explosion.png",
-    [63] = "icons/explosion.png",
-    [22] = "icons/colt45.png",
-    [23] = "icons/Silenced.png",
-    [24] = "icons/desert_eagle.png",
-    [25] = "icons/chromegun.png",
-    [26] = "icons/sawnoff.png",
-    [27] = "icons/shotgspa.png",
-    [28] = "icons/micro_uzi.png",
-    [29] = "icons/mp5lng.png",
-    [30] = "icons/ak47.png",
-    [31] = "icons/m4.png",
-    [32] = "icons/tec9.png",
-    [33] = "icons/cuntgun.png",
-    [34] = "icons/sniper.png",
-    [35] = "icons/rocketla.png",
-    [36] = "icons/heatseek.png",
-    [37] = "icons/flame.png",
-    [38] = "icons/minigun.png",
-    [39] = "icons/satchel.png",
-    [42] = "icons/fireextinguisher.png",
-    [49] = "icons/rammed.png",
-    [50] = "icons/maverick.png",
-    [51] = "icons/explosion.png",
-    [53] = "icons/drowned.png",
-    [54] = "icons/fall.png",
-    [255] = "icons/suicide.png",
-    [256] = "icons/headshot.png",
-    
-    -----------vehicle specific icons, according to their vehicle id---------
-    [431] = "icons/bus.png",
-    [437] = "icons/bus.png",
-    [414] = "icons/boxtruck.png",
-    [456] = "icons/boxtruck.png",
-    [498] = "icons/boxtruck.png",
-    [499] = "icons/boxtruck.png",
-    [609] = "icons/boxtruck.png",
-    [440] = "icons/roundvan.png",
-    [459] = "icons/roundvan.png",
-    [482] = "icons/roundvan.png",
-    [483] = "icons/roundvan.png",
-    [582] = "icons/roundvan.png",
-    [447] = "icons/sparrow.png",
-    [469] = "icons/sparrow.png",
-    [487] = "icons/maverick.png",
-    [488] = "icons/maverick.png",
-    [497] = "icons/maverick.png",
-    [548] = "icons/maverick.png",
-    [563] = "icons/maverick.png",
-    [465] = "icons/rccopter.png",
-    [501] = "icons/rccopter.png",
-    [481] = "icons/bike.png",
-    [509] = "icons/bike.png",
-    [510] = "icons/bike.png",
-    [514] = "icons/bigtruck.png",
-    [515] = "icons/bigtruck.png",
-    [461] = "icons/crotchrocket.png",
-    [521] = "icons/crotchrocket.png",
-    [522] = "icons/crotchrocket.png",
-    [523] = "icons/crotchrocket.png",
-    [581] = "icons/crotchrocket.png",
-    [586] = "icons/crotchrocket.png",
-    [407] = "icons/firetruck.png",
-    [544] = "icons/firetruck.png",
-    [444] = "icons/monstertruck.png",
-    [556] = "icons/monstertruck.png",
-    [557] = "icons/monstertruck.png",
-    [596] = "icons/copcar.png",
-    [597] = "icons/copcar.png",
-    [598] = "icons/copcar.png",
-    [425] = "icons/hunter.png",
-    [406] = "icons/406.png",
-    [408] = "icons/408.png",
-    [416] = "icons/416.png",
-    [417] = "icons/417.png",
-    [423] = "icons/423.png",
-    [424] = "icons/424.png",
-    [427] = "icons/427.png",
-    [428] = "icons/428.png",
-    [429] = "icons/429.png",
-    [432] = "icons/432.png",
-    [433] = "icons/433.png",
-    [434] = "icons/434.png",
-    [441] = "icons/441.png",
-    [443] = "icons/443.png",
-    [448] = "icons/448.png",
-    [457] = "icons/457.png",
-    [460] = "icons/460.png",
-    [462] = "icons/462.png",
-    [463] = "icons/463.png",
-    [464] = "icons/464.png",
-    [468] = "icons/468.png",
-    [470] = "icons/470.png",
-    [471] = "icons/471.png",
-    [480] = "icons/480.png",
-    [485] = "icons/485.png",
-    [486] = "icons/486.png",
-    [508] = "icons/508.png",
-    [511] = "icons/511.png",
-    [512] = "icons/512.png",
-    [513] = "icons/513.png",
-    [520] = "icons/520.png",
-    [524] = "icons/524.png",
-    [528] = "icons/528.png",
-    [530] = "icons/530.png",
-    [531] = "icons/531.png",
-    [532] = "icons/532.png",
-    [539] = "icons/539.png",
-    [564] = "icons/564.png",
-    [568] = "icons/568.png",
-    [571] = "icons/571.png",
-    [572] = "icons/572.png",
-    [573] = "icons/573.png",
-    [574] = "icons/574.png",
-    [578] = "icons/578.png",
-    [588] = "icons/588.png",
-    [593] = "icons/593.png",
-    [599] = "icons/599.png",
-}
-
-function getMessageIcon(weapon, attacker)
-    local path
-    
-    if weapon then
-        path = customIcons[weapon] or 'icons/generic.png'
-    end
-    
-    local elemType = isElement(attacker) and getElementType(attacker)
-    
-    if (elemType == 'vehicle') then
-        local model = getElementModel(attacker)
-        path = customIcons[model] or defaultIconsByVehType[getVehicleType(attacker)] or 'icons/generic.png'
-    
-    elseif (elemType == 'player') then
-        local vehicle = getPedOccupiedVehicle(attacker)
-        if vehicle then
-            return getMessageIcon(_, vehicle)
-        end
-    end
-    
-    local texture = getTexture(path)
-    
-    if texture then
-        return {
-            texture = texture,
-            width = dxGetMaterialSize(texture)
-        }
-    end
-    
-    return false
-end
-
-local textures = {}
-
-function getTexture(path)
-    if (type(path) ~= 'string') then
-        return false
-    end
-    
-    if (textures[path] ~= nil) then
-        return textures[path]
-    end
-    
-    textures[path] = dxCreateTexture(path)
-    
-    return textures[path]
-end
-
-function removeHex(s)
-    if (type(s) == "string") then
-        while (s ~= s:gsub("#%x%x%x%x%x%x", "")) do
-            s = s:gsub("#%x%x%x%x%x%x", "")
-        end
-    end
-    return s or false
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
deleted file mode 100644
index f60d02a4f..000000000
--- a/[gameplay]/killmessages/scripts/server/s.killmessages.lua
+++ /dev/null
@@ -1,171 +0,0 @@
-addEvent("onPlayerKillMessage")
-
-function createKillMessage(_, killer, weapon, bodypart, stealth)
-    local usedVehicle, killerType
-    local weapon = weapon or 255
-    
-    -- In very rare cases killer isn't nil or false but isn't an element.
-    if killer and (not isElement(killer)) then
-        killer = nil
-    end
-    
-    if killer then
-        killerType = getElementType(killer)
-        
-        -- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
-        if (killerType == 'player') then
-            local veh = getPedOccupiedVehicle(killer)
-            if veh and (getPedWeapon(killer) == 0) then
-                usedVehicle = veh
-            end
-        
-        -- Change the killer into the vehicle controller
-        elseif (killerType == 'vehicle') then
-            usedVehicle = killer
-            local controller = getVehicleController(killer)
-            if controller then
-                killer = controller
-                killerType = getElementType(killer)
-            end
-        
-        end
-    end
-    
-    -- If killed by rocket and was on foot player turn it into their current weapon
-    if (weapon == 19) and ((killerType == 'player') and (not isPedInVehicle(killer))) then
-        weapon = getPedWeapon(killer) or 51
-    end
-    
-    if killer and (killerType == 'player') then
-        -- Suicide?
-        if (source == killer) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        else
-            if triggerEvent("onPlayerKillMessage", source, killer, weapon, bodypart) then
-                eventTriggered(source, killer, weapon, bodypart, usedVehicle)
-            end
-        end
-    else
-        -- Avoid showing deaths caused by explosions, cuz they are client-side
-        if (weapon ~= 63) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        end
-    end
-end
-addEventHandler('onPlayerWasted', root, createKillMessage)
-
-addEvent('outputKillFromClient', true)
-addEventHandler('outputKillFromClient', root, function(killer, veh)
-    if (source ~= client) then
-        return
-    end
-
-    if (not isElement(killer)) then
-        return
-    end
-
-    local killerVehicle = getPedOccupiedVehicle(killer)
-
-    if (killerVehicle ~= veh) then
-        return
-    end
-    
-    -- If the vehicle exploded without suffering damage from enemies
-    if (killer == source) then
-        if triggerEvent("onPlayerKillMessage", source, false, 63) then
-            eventTriggered(source, false, 63)
-        end
-    else
-        if triggerEvent("onPlayerKillMessage", client, killer, 19) then
-            eventTriggered(client, killer, 19, nil, veh)
-        end 
-    end
-end)
-
-function eventTriggered(player, killer, weapon, bodypart, vehicle)
-    outputConsoleMessage(player, killer, vehicle, weapon)
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        weapon = getElementModel(vehicle)
-    end
-    
-    local pR, pG, pB = getPlayerColor(player)
-    local kR, kG, kB = getPlayerColor(killer)
-    
-    outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    
-    return true
-end
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    if (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    return triggerClientEvent(root, 'onClientPlayerKillMessage', player, killer, weapon, pR, pG, pB, kR, kG, kB)
-end
-
-function outputMessage(message, visibleTo, r, g, b, font)
-    if (type(message) ~= "string") and (type(message) ~= "table") then
-        outputDebugString("outputMessage - Bad 'message' argument", 0, 112, 112, 112)
-        return false
-    end
-    if (not isElement(visibleTo)) then
-        outputDebugString("outputMessage - Bad 'visibleTo' argument", 0, 112, 112, 112)
-        return false
-    end
-    return triggerClientEvent(visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font)
-end
-
-function outputConsoleMessage(player, killer, vehicle, weapon)
-    if (get('outputConsole') ~= 'true') then
-        return false
-    end
-    
-    local extra = ''
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        extra = (' (%s)'):format(getVehicleName(vehicle))
-    end
-    
-    local msg
-    if killer then
-        if (player == killer) then
-            msg = ('* %s killed himself.'):format(getPlayerName(player))
-        else
-            msg = ('* %s killed %s.'):format(getPlayerName(killer), getPlayerName(player))
-        end
-        local weaponName = getWeaponNameFromID(weapon)
-        if weaponName then
-            msg = msg .. (' (%s)'):format(weaponName)
-        else
-            msg = msg .. extra
-        end
-    else
-        msg = ('* %s died.%s'):format(getPlayerName(player), extra)
-    end
-    
-    if msg then
-        outputConsole(msg)
-    end
-    
-    return true
-end
-
-function getPlayerColor(player)
-    local r, g, b
-    if isElement(player) then
-        local team = getPlayerTeam(player)
-        if team then
-            r, g, b = getTeamColor(team)
-        else
-            r, g, b = getPlayerNametagColor(player)
-        end
-    end
-    return r, g, b
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.settings.lua b/[gameplay]/killmessages/scripts/server/s.settings.lua
deleted file mode 100644
index 12850cf2c..000000000
--- a/[gameplay]/killmessages/scripts/server/s.settings.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local settings = {}
-
-addEventHandler('onResourceStart', resourceRoot, function()
-    local allSettings = {'displayLines', 'drawMarginRight', 'drawMarginBottom', 'fadeTime', 'duration', 'outputConsole'}
-    for k, v in ipairs(allSettings) do
-        settings[v] = get(v)
-    end
-end)
-
-addEvent('requestKillMessagesSettings', true)
-addEventHandler('requestKillMessagesSettings', root, function()
-    triggerClientEvent(client, 'receiveKillMessagesSettings', client, settings)
-end)
-
-addEventHandler('onSettingChange', root, function(name, _, value)
-    name = name:gsub('[%*%#%@](.*)', '%1')-- Remove leading '*','#' or '@'
-    name = name:gsub(getResourceName(resource) .. '%.(.*)', '%1')-- Remove leading 'resName.'
-    
-    if (not settings[name]) then return end
-
-    value = fromJSON(value)
-    settings[name] = value
-    
-    -- send only the changed setting
-    triggerClientEvent(root, 'receiveKillMessagesSettings', root, {
-        [name] = value
-    })
-end)
diff --git a/[gameplay]/killmessages/utils/imagelib.lua b/[gameplay]/killmessages/utils/imagelib.lua
new file mode 100644
index 000000000..fa2d75b24
--- /dev/null
+++ b/[gameplay]/killmessages/utils/imagelib.lua
@@ -0,0 +1,140 @@
+dxImage = {}
+dxImage_mt = { __index = dxImage }
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleImages = {}
+------
+local defaults = {
+	fX							= 0.5,
+	fY							= 0.5,
+	fWidth						= 0,
+	fHeight						= 0,
+	bRelativePosition			= true,
+	bRelativeSize				= true,
+	fRot						= 0,
+	fRotXOff					= 0,
+	fRotYOff					= 0,
+	strPath						= "",
+	tColor 						= {255,255,255,255},
+	bPostGUI 					= false,
+	bVisible 					= true,
+}
+
+function dxImage:create( path, x, y, width, height, relative )
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if ( type(path) ~= "string" ) or ( not tonumber(x) ) or ( not tonumber(y) ) then
+		outputDebugString ( "dxImage:create - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+    local new = {}
+	setmetatable( new, dxImage_mt )
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	new.strPath = path
+	new.fWidth = width or new.fWidth
+	new.fHeight = height or new.fHeight
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+		new.bRelativeSize = relative
+	end
+	visibleImages[new] = true
+	return new
+end
+
+function dxImage:path(path)
+	if type(path) ~= "string" then return self.strPath end
+	self.strPath = path
+	return true
+end
+
+function dxImage:position(x,y,relative)
+	if not tonumber(x) then return self.fX, self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxImage:size(x,y,relative)
+	if not tonumber(x) then return self.fWidth, self.fHeight end
+	self.fWidth = x
+	self.fHeight = y
+	if type(relative) == "boolean" then
+		self.bRelativeSize = relative
+	else
+		self.bRelativeSize = true
+	end
+	return true
+end
+
+function dxImage:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = { r,g,b,a }
+	return true
+end
+
+function dxImage:rotation(rot,xoff,yoff)
+	if not tonumber(rot) then return self.fRot,self.fRotXOff,self.fRotYOff end
+	self.fRot = rot or self.fRot
+	self.fRotXOff = xoff or self.fRotXOff
+	self.fRotYOff = yoff or self.fRotYOff
+	return true
+end
+
+function dxImage:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleImages[self] = true
+	else
+		visibleImages[self] = nil
+	end
+	return true
+end
+
+function dxImage:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxImage:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+addEventHandler ( "onClientRender", getRootElement(),
+	function()
+		for self,_ in pairs(visibleImages) do
+			while true do
+				if self.bDestroyed then
+					visibleImages[self] = nil
+					break
+				end
+				local x,y,width,height = self.fX,self.fY,self.fWidth,self.fHeight
+				if self.bRelativePosition then
+					x = x/g_screenX
+					y = y/g_screenY
+				end
+				if self.bRelativeSize then
+					width = width/g_screenX
+					height = height/g_screenY
+				end
+				dxDrawImage ( x,y, width, height, self.strPath, self.fRot, self.fRotXOff, self.fRotYOff, tocolor(unpack(self.tColor)), self.bPostGUI )
+				break
+			end
+		end
+	end
+)
+
diff --git a/[gameplay]/killmessages/utils/textlib.lua b/[gameplay]/killmessages/utils/textlib.lua
new file mode 100644
index 000000000..e72ea9eac
--- /dev/null
+++ b/[gameplay]/killmessages/utils/textlib.lua
@@ -0,0 +1,335 @@
+dxText = {}
+dxText_mt = { __index = dxText }
+local idAssign,idPrefix = 0,"c"
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleText = {}
+------
+local defaults = {
+	fX						= 0.5,
+	fY						= 0.5,
+	bRelativePosition				= true,
+	strText						= "",
+	bVerticalAlign 					= "center",
+	bHorizontalAlign 				= "center",
+	tColor 						= {255,255,255,255},
+	fScale 						= 1,
+	strFont 					= "default",
+	strType						= "normal",
+	tAttributes					= {},
+	bPostGUI 					= false,
+	bColorCoded					= true,
+	bClip 						= false,
+	bWordWrap	 				= true,
+	bVisible 					= true,
+	tBoundingBox					= false, --If a bounding box is not set, it will not be used.
+	bRelativeBoundingBox				= true,
+}
+
+local validFonts = {
+	default						= true,
+	["default-bold"]				= true,
+	clear						= true,
+	arial						= true,
+	pricedown					= true,
+	bankgothic					= true,
+	diploma						= true,
+	beckett						= true,
+}
+
+local validTypes = {
+	normal						= true,
+	shadow						= true,
+	border						= true,
+	stroke						= true, --Clone of border
+}
+
+local validAlignTypes = {
+	center						= true,
+	left						= true,
+	right						= true,
+}
+
+function dxText:create(text, x, y, relative)
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if type(text) ~= "string" or not tonumber(x) or not tonumber(y) then
+		outputDebugString("dxText:create - Bad argument",0,112,112,112)
+		return false
+	end
+    local new = {}
+	setmetatable(new, dxText_mt)
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	idAssign = idAssign+1
+	new.id = idPrefix..idAssign
+	new.strText = text or new.strText
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+	end
+	visibleText[new] = true
+	return new
+end
+
+function dxText:text(text)
+	if type(text) ~= "string" then return self.strText end
+	self.strText = text
+	return true
+end
+
+function dxText:position(x,y,relative)
+	if not tonumber(x) then return self.fX,self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxText:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = {r,g,b,a}
+	return true
+end
+
+function dxText:scale(scale)
+	if not tonumber(scale) then return self.fScale end
+	self.fScale = scale
+	return true
+end
+
+function dxText:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleText[self] = true
+	else
+		visibleText[self] = nil
+	end
+	return true
+end
+
+function dxText:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxText:extent()
+	if self.bColorCoded then
+		text = string.gsub(self.strText,"#%x%x%x%x%x%x","")
+	else
+		text = self.strText
+	end
+	local extent = dxGetTextWidth(text,self.fScale,self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		extent = extent + self.tAttributes[1]
+	end
+	return extent
+end
+
+function dxText:height()
+	local height = dxGetFontHeight(self.fScale, self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		height = height + self.tAttributes[1]
+	end
+	return height
+end
+
+function dxText:font(font)
+	if not validFonts[font] then return self.strFont end
+	self.strFont = font
+	return true
+end
+
+function dxText:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+function dxText:clip(bool)
+	if type(bool) ~= "boolean" then return self.bClip end
+	self.bClip = bool
+	return true
+end
+
+function dxText:wordWrap(bool)
+	if type(bool) ~= "boolean" then return self.bWordWrap end
+	self.bWordWrap = bool
+	return true
+end
+
+function dxText:type(type,...)
+	if not validTypes[type] then return self.strType,unpack(self.tAttributes) end
+	self.strType = type
+	self.tAttributes = {...}
+	return true
+end
+
+function dxText:align(horzA, vertA)
+	if not validAlignTypes[horzA] then return self.bHorizontalAlign,self.bVerticalAlign end
+	vertA = vertA or self.bVerticalAlign
+	self.bHorizontalAlign,self.bVerticalAlign = horzA,vertA
+	return true
+end
+
+function dxText:boundingBox(left,top,right,bottom,relative)
+	if left == nil then
+		if self.tBoundingBox then
+			return unpack(boundingBox)
+		else
+			return false
+		end
+	elseif tonumber(left) and tonumber(right) and tonumber(top) and tonumber(bottom) then
+		self.tBoundingBox = {left,top,right,bottom}
+		if type(relative) == "boolean" then
+			self.bRelativeBoundingBox = relative
+		else
+			self.bRelativeBoundingBox = true
+		end
+	else
+		self.tBoundingBox = false
+	end
+	return true
+end
+
+function dxCreateCustomDX(text,left,top,right,bottom,color,scale,font,alignX,alignY,clip,wordBreak,postGUI)
+	if not text or not left or not top then
+		return false
+	end
+	local xOffset = nil
+	local fpat = "(.-)#(%x%x%x%x%x%x)"
+	local s,e,cap,col = text:find(fpat,1)
+	local last_end = 1
+	if not alignX then
+		alignX = "left"
+	elseif alignX == "center" then
+		xOffset = -(dxGetTextWidth(string.gsub(text,"#%x%x%x%x%x%x",""),scale,font)/2)
+	else
+		xOffset = 0
+	end
+	while s do
+		if cap == "" and col then
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		if s ~= 1 or cap ~= "" then
+			dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+			xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		last_end = e+1
+		s,e,cap,col = text:find(fpat,last_end)
+	end
+	if last_end <= #text then
+		cap = text:sub(last_end)
+		dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+		xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+	end
+	return true
+end
+
+addEventHandler("onClientRender",getRootElement(),
+	function()
+		for self,_ in pairs(visibleText) do
+			while true do
+				if self.bDestroyed then
+					visibleText[self] = nil
+					break
+				end
+				local l,t,r,b
+				--If we arent using a bounding box
+				if not self.tBoundingBox then
+					--Decide if we use relative or absolute
+					local p_screenX,p_screenY = 1,1
+					if self.bRelativePosition then
+						p_screenX,p_screenY = g_screenX,g_screenY
+					end
+					local fX,fY = (self.fX)*p_screenX,(self.fY)*p_screenY
+					if self.bHorizontalAlign == "left" then
+						l = fX
+						r = fX + g_screenX
+					elseif self.bHorizontalAlign == "right" then
+						l = fX - g_screenX
+						r = fX
+					else
+						l = fX - g_screenX
+						r = fX + g_screenX
+					end
+					if self.bVerticalAlign == "top" then
+						t = fY
+						b = fY + g_screenY
+					elseif self.bVerticalAlign == "bottom" then
+						t = fY - g_screenY
+						b = fY
+					else
+						t = fY - g_screenY
+						b = fY + g_screenY
+					end
+				elseif type(self.tBoundingBox) == "table" then
+					local b_screenX,b_screenY = 1,1
+					if self.bRelativeBoundingBox then
+						b_screenX,b_screenY = g_screenX,g_screenY
+					end
+					l,t,r,b = self.tBoundingBox[1],self.tBoundingBox[2],self.tBoundingBox[3],self.tBoundingBox[4]
+					l = l*b_screenX
+					t = t*b_screenY
+					r = r*b_screenX
+					b = b*b_screenY
+				end
+				local type,att1,att2,att3,att4,att5 = self:type()
+				if type == "border" or type == "stroke" then
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					outlinesize = att1 or 2
+					outlinesize = math.min(self.fScale,outlinesize) --Make sure the outline size isnt thicker than the size of the label
+					if outlinesize > 0 then
+						for offsetX=-outlinesize,outlinesize,outlinesize do
+							for offsetY=-outlinesize,outlinesize,outlinesize do
+								if not offsetX == 0 and offsetY == 0 then
+									dxCreateCustomDX(self.strText,l+offsetX,t+offsetY,r+offsetX,b+offsetY,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+								end
+							end
+						end
+					end
+				elseif type == "shadow" then
+					local shadowDist = att1
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					dxCreateCustomDX(self.strText,l+shadowDist,t+shadowDist,r+shadowDist,b+shadowDist,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				end
+				dxCreateCustomDX(self.strText,l,t,r,b,tocolor(unpack(self.tColor)),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				break
+			end
+		end
+	end
+)
+
+if addEvent("updateDisplays",true) then
+	addEventHandler("updateDisplays",getRootElement(),
+		function(self)
+			setmetatable(self,dxText_mt)
+			--Remove any old ones with the same id
+			for text,_ in pairs(visibleText) do
+				if text.id == self.id then
+					visibleText[text] = nil
+				end
+			end
+			if self.bVisible and not self.bDestroyed then
+				visibleText[self] = true
+			end
+		end
+	)
+end
diff --git a/[gameplay]/speedometer/client.lua b/[gameplay]/speedometer/client.lua
deleted file mode 100644
index 23fb392eb..000000000
--- a/[gameplay]/speedometer/client.lua
+++ /dev/null
@@ -1,82 +0,0 @@
-local screenW, screenH = guiGetScreenSize()
-
-local function dxDrawRelativeImage(startX, startY, width, height, image, rot, rotX, rotY, color, postGUI)
-    dxDrawImage(startX * screenW, startY * screenH, width * screenW, height * screenH, image, rot or 0, rotX or 0, rotY or 0, color, postGUI or false)
-end
-
-function drawSpeedo()
-    local veh = getPedOccupiedVehicle(localPlayer)
-    if not veh then return end
-
-    local velx, vely, velz = getElementVelocity(veh)
-    local speed = (velx ^ 2 + vely ^ 2 + velz ^ 2) ^ (0.5)
-
-    dxDrawRelativeImage(0.66, 0.61, 0.33, 0.49, "images/disc.png")
-    dxDrawRelativeImage(0.7825, 0.61, 0.2, 0.46, "images/needle.png", -146 + (speed * 180))
-end
-
-local isSpeedoShown = false
-function toggleRender(bool)
-    if bool then
-        isSpeedoShown = true
-        addEventHandler("onClientRender", root, drawSpeedo)
-    else
-        isSpeedoShown = false
-        removeEventHandler("onClientRender", root, drawSpeedo)
-    end
-end
-
-function toggleSpeedo()
-    toggleRender(not isSpeedoShown)
-end
-addCommandHandler("speedo", toggleSpeedo)
-
-local function enterHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if not isSpeedoShown then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientPlayerVehicleEnter", localPlayer, enterHandler)
-
-local function exitHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerVehicleExit", localPlayer, exitHandler)
-
-local function destroyHandler()
-    if isSpeedoShown and (getElementType(source) == "vehicle") and (getPedOccupiedVehicle(localPlayer) == source) then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientVehicleExplode", root, destroyHandler)
-addEventHandler("onClientElementDestroy", root, destroyHandler)
-
--- If player vehicle changes in abnormal way (e.g drives into a vehicle pick-up)
-local function onVehicleTypeChange(oldModel, newModel)
-    if (getElementType(source) ~= "vehicle") then return end
-
-    local newType = getVehicleType(newModel)
-
-    if isSpeedoShown and (newType == "Plane") or (newType == "Helicopter") then
-        toggleRender(false)
-    elseif not isSpeedoShown and (newType ~= "Plane") and (newType ~= "Helicopter") then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientElementModelChange", root, onVehicleTypeChange)
-
--- Dying in vehicle, so not triggering onClientPlayerVehicleExit
-function integrityCheck()
-    if getPedOccupiedVehicle(localPlayer) and isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerWasted", localPlayer, integrityCheck)
diff --git a/[gameplay]/speedometer/images/disc.png b/[gameplay]/speedometer/images/disc.png
deleted file mode 100644
index 8d80f6a937d4ed6346ebc1328dc386d19bce79dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10990
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

diff --git a/[gameplay]/speedometer/images/needle.png b/[gameplay]/speedometer/images/needle.png
deleted file mode 100644
index ce2be4d1f957b903a9ced3d9cdabe2370f614d0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1560
zcmchX`&&|X9LK@RdJ->Zg@Nfz$`oCXgi}FttYDfmFU!*K5_!YC%wiT^LT6cUTweA}
z%?#1Xlr$|9FBCH@)5=n(l!#_G%b{XEmZC$^ed$lw5BvUd&Uw!FeBPh;>+?R}Y=2)*
z!}VtC5eS5#*IwFw1Of?ek%)Er;1c@FbtVF_=Cv1X_kk3o>OK;@TaDPV5_AfApw9qo
z`0s0rLb7VWb<#1XUG8=G4UPP}9@fN(&vLy>dH{zArnZS|jGkRfQcPeDx&}A31+&a}
zkvANN?er5)(<NAo7wFiqK~q6oU5Q!5#%y$gbpqKWbEDpB5(24LYPEpZNF7q{b>uHr
z%fx?hVOwv9T!});%i@o3fIf&%Ux^`Uzj1US+TyxcHWk7{oHAL6GAIuwwPoFE;J~Bl
z3H!P50x{Q<thRe<Okm@Sh_r_-;<41jd}iv|ur3H{&nb<XL7OHMu9`!vwUVBC&9@@?
z&dVsM&u7jgzbt%iUBOASE)yuIFX>`6Ie0DRmaGy5vD~v9lGxlPcU3?hEI#+Pg`O&?
z<YNN4@b!R^_K(I#TOTiNNe7>uG~<!)wRJ*O4lxBlnwgeI6t!tE8`hvRA(p*XNOEZ(
zno{}a!3+3`TOy6o(+U)xN_$@Y_1nM9CmjeY7Wze2xU{3YdS=MMJW|FEcTjWHthQvF
zJn%6R6$YNR<}77Z&eJ8ut-#Hx!Fi+jW4Adr6*}#^Y)7?a;L3w|YG?&8)Llg(k{=C?
znmb%a<iMM;X?Y6rz$5Y}Yn?wz)B@VHx1OE3*5L|ZCKmL?UO4>bWiHB|N;@H&BaDg~
zx0j4~NWYlKCp3M(NUv(?6QZD*pEWC8&vw-@h^#e+(J&l>U3QD<t^eexw$mBO=vl@N
zyoyRaYoY7NOgi>hZ&J9RWH#IC>VDp6Gj>#4R=~ItgvCYJXL(9(5tflxcNYU0Uk^rf
z^yz`t9Q1yK2Td^XNELE<?%0K7VvRY3M;H?_%I3V7EkrP?o!?J~SM|y=^5he<pzO<M
zZ^n(h&ljmTl-A1pftPbrmh51yIAC&<3S>i^pKd9;6#2oq8ITV38ci-ebS?eThj{D(
zur>Qt@juEvmF|l0u{aGt-%LFITZciB`u?Tt#4nht?@W&P-Y91e4bny4Slrd!@)TY+
zGkP>sI1uLKR%nI0t2oiftf9wBAHO3|f#)FEd}#MRQGeO{C>P!IT5fA|jh=S@xEP-I
zd>oJ-Y+v?sZR%kUrJT(I6O@K8ISx(VCO&`x0{P(VY8!qdBO+t792n!2-;W*RH<mLs
zc4<H<k@=oc%jxPYFt=A49H*%wrUB{bDNj{hKsJ1yVVuh=A@yob)vBUs0B+`T<UW_!
zmE5HEgrB%DCPHc5;~ZOlM6-DoOqi2Dy!@o!vzGFZCg9>|G`agOQt!~;$&|=*+u9%&
zI+waHqq7qm=&7g!;kRhzU5xAhu0t{1;Dg1z3)B~0boW~%$QVLDAmmnYtUj$wZAoHb
z4I$Qyq;LY+`6@<B4PGQ4+Ka?M#iH>R^Z14tXZv|V4akp=W_x@UzesIRI?`nd0u;_=
zjMvY0tW&DyP{6b*O3vZE_$(O8XD!{Bg@G}_%|&d8^0{W|;|?JRa$;K9yNAEJHBprH
z%>^TXunXaMp#sco(#e~0L;^4xabHK=p~q5&!`UzrC_rrKlQ>a-M#C7*YU^c)g%6X~
zlq@i!E9i=pKbcEk+3DIo(<yTb*km{5XIB^IBmq%ymMx+J3~I~Yzx2@&6zAM@!=&d>
zM!J_>`GwZtCp}@ajPF|+&RV5Acfr{z_wYaX|1LBpf|Dqxss*|RyngVd-Q08J%)fHD
Bx*-4n

diff --git a/[gameplay]/speedometer/meta.xml b/[gameplay]/speedometer/meta.xml
deleted file mode 100644
index c868b138f..000000000
--- a/[gameplay]/speedometer/meta.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<meta>
-	<info author="MTA contributors (github.com/multitheftauto/mtasa-resources)" version="1.0" type="script" description="Basic speedometer" />
-	<file src="images/disc.png" />
-	<file src="images/needle.png" />
-	<script src="client.lua" type="client" />
-</meta>
\ No newline at end of file

From c4e4ae4c2a97c8e5d5b5a01ae1da42ae0fdeebcf Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:33:25 -0300
Subject: [PATCH 12/26] Revert "Delete aaa.js"

This reverts commit 1cea5eceb137ec6cf234c5be4905be644abc6b3d.
---
 [gameplay]/killmessages/icons/aaa.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 [gameplay]/killmessages/icons/aaa.js

diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
new file mode 100644
index 000000000..ac3f974a0
--- /dev/null
+++ b/[gameplay]/killmessages/icons/aaa.js
@@ -0,0 +1,9 @@
+const fs = require('fs')
+
+const path = 'icons'
+
+fs.readdir('./' + path, 'ascii', (_, files) => {
+    for (let name of files.filter(a => a != 'index.js')) {
+        console.log(`	<file src='${path}/${name}'/>`)
+    }
+})

From eab9da60fae3b1f5adf3d7bcf49794c03ea3f4dd Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:36:29 -0300
Subject: [PATCH 13/26] Revert "refactor killmessages"

This reverts commit af5decbbcd950c856a62c54fe3b59bd403f07b46.
---
 [gameplay]/killmessages/icons/aaa.js | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 [gameplay]/killmessages/icons/aaa.js

diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
deleted file mode 100644
index ac3f974a0..000000000
--- a/[gameplay]/killmessages/icons/aaa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const fs = require('fs')
-
-const path = 'icons'
-
-fs.readdir('./' + path, 'ascii', (_, files) => {
-    for (let name of files.filter(a => a != 'index.js')) {
-        console.log(`	<file src='${path}/${name}'/>`)
-    }
-})

From f377125f98ae502c6dff62f6e69f4544afc1e4af Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Wed, 9 Jun 2021 18:35:01 -0300
Subject: [PATCH 14/26] replace give admin button with permissions widget

---
 [admin]/admin/client/gui/admin_main.lua       |  17 +--
 [admin]/admin/client/gui/admin_messagebox.lua |   2 +
 .../admin/client/gui/admin_permissions.lua    | 121 ++++++++++++++++++
 [admin]/admin/meta.xml                        |   1 +
 [admin]/admin/server/admin_server.lua         |  25 +++-
 5 files changed, 155 insertions(+), 11 deletions(-)
 create mode 100644 [admin]/admin/client/gui/admin_permissions.lua

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index c43cbcd63..7dc143a96 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -75,7 +75,7 @@ function aAdminMenu ()
 
 		aTab1.Nick			= guiCreateButton ( 0.71, 0.260, 0.13, 0.04, "Set Nick", true, aTab1.Tab )
 		aTab1.Shout			= guiCreateButton ( 0.85, 0.260, 0.13, 0.04, "Shout!", true, aTab1.Tab, "shout" )
-		aTab1.Admin			= guiCreateButton ( 0.71, 0.305, 0.27, 0.04, "Give admin rights", true, aTab1.Tab, "setgroup" )
+		aTab1.ManagePerms   = guiCreateButton ( 0.71, 0.305, 0.27, 0.04, "Manage permissions", true, aTab1.Tab, "setgroup" )
 
 		local y = 0.03		-- Start y coord
 		local A = 0.045		-- Large line gap
@@ -538,11 +538,6 @@ function aAdminRefresh ()
 				guiSetText ( aTab1.Vehicle, "Vehicle: Foot" )
 				guiSetText ( aTab1.VehicleHealth, "Vehicle Health: 0%" )
 			end
-			if ( aPlayers[player]["admin"] ) then
-				guiSetText(aTab1.Admin, "Revoke admin rights")
-			else
-				guiSetText(aTab1.Admin, "Give admin rights")
-			end
 			return player
 		end
 	end
@@ -1041,9 +1036,12 @@ function aClientClick ( button )
 					elseif ( source == aTab1.VehicleBlow ) then triggerServerEvent ( "aVehicle", localPlayer, player, "blowvehicle" )
 					elseif ( source == aTab1.VehicleDestroy ) then triggerServerEvent ( "aVehicle", localPlayer, player, "destroyvehicle" )
 					elseif ( source == aTab1.VehicleCustomize ) then aVehicleCustomize ( player )
-					elseif ( source == aTab1.Admin ) then
-						if ( aPlayers[player]["admin"] ) then aMessageBox ( "warning", "Revoke admin rights from "..name.."?", "revokeAdmin", player )
-						else aMessageBox ( "warning", "Give admin rights to "..name.."?", "giveAdmin", player ) end
+					elseif ( source == aTab1.ManagePerms ) then
+						if (aPlayers[player]['accountname'] ~= 'guest') then
+							aPermissions.Show(player)
+						else
+							aMessageBox ( "error", "This player is not logged in!" )	
+						end
 					elseif ( source == aTab1.ACModDetails ) then
 						aViewModdetails(player)
 					end
@@ -1290,7 +1288,6 @@ function aAdminReloadInfos()
 		guiSetText ( aTab1.ACModInfo, "Img Mods: N/A" )
 		guiSetText ( aTab1.Mute, "Mute" )
 		guiSetText ( aTab1.Freeze, "Freeze" )
-		guiSetText ( aTab1.Admin, "Give admin rights" )
 		guiSetText ( aTab1.Health, "Health: 0%" )
 		guiSetText ( aTab1.Armour, "Armour: 0%" )
 		guiSetText ( aTab1.Skin, "Skin: N/A" )
diff --git a/[admin]/admin/client/gui/admin_messagebox.lua b/[admin]/admin/client/gui/admin_messagebox.lua
index 4a416266e..aec97d8ca 100644
--- a/[admin]/admin/client/gui/admin_messagebox.lua
+++ b/[admin]/admin/client/gui/admin_messagebox.lua
@@ -147,6 +147,8 @@ function runMessageAction(action)
 		aSpectator.Close(false)
 	elseif (action == "deleteTeam") then
 		triggerServerEvent("aTeam", localPlayer, "destroyteam", varOne)
+	elseif (action == "updatePlayerACLGroup") then
+		aPermissions.PerformAction(varOne, varTwo, varThree)
 	end
 end
 
diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
new file mode 100644
index 000000000..0ca59210c
--- /dev/null
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -0,0 +1,121 @@
+--[[**********************************
+*
+*	Multi Theft Auto - Admin Panel
+*
+*	client\gui\admin_permissions.lua
+*
+*	Original File by lil_Toady
+*
+**************************************]]
+aPermissions = {
+    Form = nil,
+    SelectedPlayer = nil,
+}
+
+addEvent('aPermissionsSync', true)
+addEvent('aOnPermissionsChange', true)
+
+function aPermissions.Show(player)
+    if (not aPermissions.Form) then
+        local x, y = guiGetScreenSize()
+        aPermissions.Form = guiCreateWindow(x / 2 - 130, y / 2 - 125, 260, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
+        guiSetAlpha(aPermissions.Form, 1)
+        
+        aPermissions.Label = guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Use double-click to change the current state", true, aPermissions.Form)
+        guiLabelSetHorizontalAlign(aPermissions.Label, "center")
+
+        aPermissions.List = guiCreateGridList(0.03, 0.18, 0.94, 0.70, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.List, "ACL Group", 0.65)
+        guiGridListAddColumn(aPermissions.List, "Has?", 0.2)
+
+        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.47, 0.09, "Refresh", true, aPermissions.Form)
+        aPermissions.Hide = guiCreateButton(0.5, 0.88, 0.47, 0.09, "Close", true, aPermissions.Form)
+        
+        addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
+        addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
+        addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
+        addEventHandler("onClientGUIDoubleClick", aPermissions.Form, aPermissions.onDoubleClick)
+        
+        --Register With Admin Form
+        aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
+    end
+    aPermissions.SelectedPlayer = player
+    aPermissions.Refresh()
+    guiSetVisible(aPermissions.Form, true)
+    guiBringToFront(aPermissions.Form)
+end
+
+function aPermissions.onSync(targetPlayer, permissions)
+    if (targetPlayer == aPermissions.SelectedPlayer) then
+        guiGridListClear(aPermissions.List)
+        for group, state in pairs(permissions) do
+            local row = guiGridListAddRow(aPermissions.List)
+            guiGridListSetItemText(aPermissions.List, row, 1, group, false, false)
+            guiGridListSetItemText(aPermissions.List, row, 2, state and 'Yes' or 'No', false, false)
+            guiGridListSetItemData(aPermissions.List, row, 1, group)
+            guiGridListSetItemData(aPermissions.List, row, 2, state)
+        end
+    end
+end
+
+function aPermissions.Close(destroy)
+    if (destroy) then
+        if (aPermissions.Form) then
+            destroyElement(aPermissions.Form)
+            aPermissions.Form = nil
+            removeEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
+            removeEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
+        end
+    else
+        guiSetVisible(aPermissions.Form, false)
+    end
+    aPermissions.SelectedPlayer = nil
+end
+
+function aPermissions.onClick(button)
+    if (button == 'left') then
+        if (source == aPermissions.Hide) then
+            aPermissions.Close()
+        elseif (source == aPermissions.Update) then
+            aPermissions.Refresh()
+        end
+    end
+end
+
+function aPermissions.onDoubleClick(button)
+    if (button == 'left') then
+        local player = aPermissions.SelectedPlayer
+        if isElement(player) then
+            local selectedItem = guiGridListGetSelectedItem(aPermissions.List)
+            if (selectedItem > -1) then
+                local selectedGroup = guiGridListGetItemData(aPermissions.List, selectedItem, 1)
+                local currentState = guiGridListGetItemData(aPermissions.List, selectedItem, 2)
+                local confirmStr
+                if currentState then
+                    confirmStr = ('Are you sure you want to remove "%s" from the "%s" group?'):format(getPlayerName(player), selectedGroup)
+                else
+                    confirmStr = ('Are you sure you want to add "%s" to the "%s" group?'):format(getPlayerName(player), selectedGroup)
+                end
+                aMessageBox ( "question", confirmStr, "updatePlayerACLGroup", player, selectedGroup, not currentState )
+            end
+        else
+            aPermissions.Close(false)
+            messageBox("Player not found!", MB_WARNING)
+        end
+    end
+end
+
+function aPermissions.PerformAction(player, groupName, newState)
+    local playerAccount = player and aPlayers[player] and aPlayers[player]['accountname']
+    if playerAccount and (playerAccount ~= 'guest') then
+        triggerServerEvent('aAdmin', localPlayer, newState and 'acladd' or 'aclremove', 'object', groupName, 'user.'..playerAccount, true)
+    end
+end
+
+function aPermissions.Refresh()
+    local player = aPermissions.SelectedPlayer
+    if isElement(player) and (aPermissions.List) then
+        guiGridListClear(aPermissions.List)
+        triggerServerEvent('aAdmin', localPlayer, "sync", "playeraclgroups", player)
+    end
+end
diff --git a/[admin]/admin/meta.xml b/[admin]/admin/meta.xml
index 6f28e0a25..212e8818b 100644
--- a/[admin]/admin/meta.xml
+++ b/[admin]/admin/meta.xml
@@ -26,6 +26,7 @@
   <script src="client/admin_ACL.lua" type="client" />
   <script src="client/gui/admin_main.lua" type="client" />
   <script src="client/gui/admin_performance.lua" type="client" />
+  <script src="client/gui/admin_permissions.lua" type="client" />
   <script src="client/gui/admin_maps.lua" type="client" />
   <script src="client/gui/admin_messages.lua" type="client" />
   <script src="client/gui/admin_message.lua" type="client" />
diff --git a/[admin]/admin/server/admin_server.lua b/[admin]/admin/server/admin_server.lua
index 845a244ef..d76fc3d5f 100644
--- a/[admin]/admin/server/admin_server.lua
+++ b/[admin]/admin/server/admin_server.lua
@@ -681,6 +681,7 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 			for id, acl in ipairs ( aclList() ) do
 				table.insert ( tableOut["acl"] ,aclGetName ( acl ) )
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 		elseif ( type == "aclobjects" ) then
 			local group = aclGetGroup ( tostring ( arg[2] ) )
 			if ( group ) then
@@ -691,6 +692,7 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					table.insert ( tableOut["acl"], aclGetName ( acl ) )
 				end
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 		elseif ( type == "aclrights" ) then
 			local acl = aclGet ( tostring ( arg[2] ) )
 			if ( acl ) then
@@ -700,8 +702,23 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					tableOut["rights"][name] = aclGetRight ( acl, name )
 				end
 			end
+			triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
+		elseif ( type == 'playeraclgroups') then
+			local player = arg[2]
+			if isElement(player) then
+				local ignoredGroups = {
+					['Everyone'] = true,
+					['autoGroup_irc'] = true,
+				}
+				for _, v in ipairs(aclGroupList()) do
+					local groupName = aclGroupGetName(v)
+					if (not ignoredGroups[groupName]) then
+						tableOut[groupName] = isObjectInACLGroup('user.'..getAccountName(getPlayerAccount(player)), v)
+					end
+				end
+			end
+			triggerClientEvent ( source, "aPermissionsSync", _root, player, tableOut )
 		end
-		triggerClientEvent ( source, "aAdminACL", _root, type, tableOut )
 	elseif ( action == "aclcreate" ) then
 		local name = arg[2]
 		if ( ( name ) and ( string.len ( name ) >= 1 ) ) then
@@ -759,6 +776,9 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					mdata2 = "Object '"..arg[3].."'"
 				outputServerLog ("ACL: "..getPlayerName(source).."["..getAccountName (getPlayerAccount(source)).."] ["..getPlayerSerial (source).."] ["..getPlayerIP (source).."] added "..object.." to ACL Group "..arg[2])
 					triggerEvent ( "aAdmin", source, "sync", "aclobjects", arg[2] )
+					if arg[4] then
+						triggerClientEvent ( source, "aOnPermissionsChange", source )
+					end
 				end
 			elseif ( arg[1] == "acl" ) then
 				local group = aclGetGroup ( arg[2] )
@@ -802,6 +822,9 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 					mdata2 = "Object '"..arg[3].."'"
 					triggerEvent ( "aAdmin", source, "sync", "aclobjects", arg[2] )
 				outputServerLog ("ACL: "..getPlayerName(source).."["..getAccountName (getPlayerAccount(source)).."] ["..getPlayerSerial (source).."] ["..getPlayerIP (source).."] removed "..mdata2)
+					if arg[4] then
+						triggerClientEvent ( source, "aOnPermissionsChange", source )
+					end
 				end
 			elseif ( arg[1] == "acl" ) then
 				local group = aclGetGroup ( arg[2] )

From 3ec6a4af5bfbd055cbbc0c73d7cbf6ecdb85572f Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Wed, 9 Jun 2021 18:36:15 -0300
Subject: [PATCH 15/26] fix warning message when change player's ACL

---
 [admin]/admin/client/gui/admin_acl.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/[admin]/admin/client/gui/admin_acl.lua b/[admin]/admin/client/gui/admin_acl.lua
index d18461643..63276a875 100644
--- a/[admin]/admin/client/gui/admin_acl.lua
+++ b/[admin]/admin/client/gui/admin_acl.lua
@@ -11,6 +11,8 @@
 aAclForm = nil
 aAclData = {}
 
+addEvent ( "aAdminACL", true )
+
 function aManageACL ()
 	if ( aAclForm == nil ) then
 		aAclData["group_objects"] = {}
@@ -47,7 +49,6 @@ function aManageACL ()
 		aACLExit		= guiCreateButton ( 0.75, 0.90, 0.27, 0.04, "Close", true, aAclForm )
 		aclDisplayOptions ( "", "" )
 
-		addEvent ( "aAdminACL", true )
 		addEventHandler ( "aAdminACL", localPlayer, aAdminACL )
 		addEventHandler ( "onClientGUIClick", aAclForm, aClientACLClick )
 		addEventHandler ( "onClientGUIDoubleClick", aAclForm, aClientACLDoubleClick )

From c66957da2dbce3f8bae3cc4f64eb8e4913d807bf Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:15:28 -0300
Subject: [PATCH 16/26] change design

---
 .../admin/client/gui/admin_permissions.lua    | 84 ++++++++++---------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index 0ca59210c..0cd009bb3 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -18,23 +18,25 @@ addEvent('aOnPermissionsChange', true)
 function aPermissions.Show(player)
     if (not aPermissions.Form) then
         local x, y = guiGetScreenSize()
-        aPermissions.Form = guiCreateWindow(x / 2 - 130, y / 2 - 125, 260, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
+        aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
         guiSetAlpha(aPermissions.Form, 1)
         
-        aPermissions.Label = guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Use double-click to change the current state", true, aPermissions.Form)
-        guiLabelSetHorizontalAlign(aPermissions.Label, "center")
-
-        aPermissions.List = guiCreateGridList(0.03, 0.18, 0.94, 0.70, true, aPermissions.Form)
-        guiGridListAddColumn(aPermissions.List, "ACL Group", 0.65)
-        guiGridListAddColumn(aPermissions.List, "Has?", 0.2)
+        aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, ("%s's groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
+        aPermissions.RemoveGroup = guiCreateButton(0.39, 0.18, 0.075, 0.68, '>\n>\n>', true, aPermissions.Form)
+        
+        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Avaiable groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.AllGroups = guiCreateGridList(0.62, 0.18, 0.35, 0.68, true, aPermissions.Form)
+        guiGridListAddColumn(aPermissions.AllGroups, "Group Name", 0.85)
+        aPermissions.AddGroup = guiCreateButton(0.535, 0.18, 0.075, 0.68, '<\n<\n<', true, aPermissions.Form)
 
-        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.47, 0.09, "Refresh", true, aPermissions.Form)
-        aPermissions.Hide = guiCreateButton(0.5, 0.88, 0.47, 0.09, "Close", true, aPermissions.Form)
+        aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form)
+        aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form)
         
         addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync)
         addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh)
         addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick)
-        addEventHandler("onClientGUIDoubleClick", aPermissions.Form, aPermissions.onDoubleClick)
         
         --Register With Admin Form
         aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
@@ -47,13 +49,12 @@ end
 
 function aPermissions.onSync(targetPlayer, permissions)
     if (targetPlayer == aPermissions.SelectedPlayer) then
-        guiGridListClear(aPermissions.List)
+        guiGridListClear(aPermissions.PlayerGroups)
+        guiGridListClear(aPermissions.AllGroups)
+
         for group, state in pairs(permissions) do
-            local row = guiGridListAddRow(aPermissions.List)
-            guiGridListSetItemText(aPermissions.List, row, 1, group, false, false)
-            guiGridListSetItemText(aPermissions.List, row, 2, state and 'Yes' or 'No', false, false)
-            guiGridListSetItemData(aPermissions.List, row, 1, group)
-            guiGridListSetItemData(aPermissions.List, row, 2, state)
+            local gridlist = state and aPermissions.PlayerGroups or aPermissions.AllGroups
+            guiGridListAddRow(gridlist, group)
         end
     end
 end
@@ -78,31 +79,37 @@ function aPermissions.onClick(button)
             aPermissions.Close()
         elseif (source == aPermissions.Update) then
             aPermissions.Refresh()
+        elseif (source == aPermissions.RemoveGroup) then
+            aPermissions.ConfirmChange(false)
+        elseif (source == aPermissions.AddGroup) then
+            aPermissions.ConfirmChange(true)
         end
     end
 end
 
-function aPermissions.onDoubleClick(button)
-    if (button == 'left') then
-        local player = aPermissions.SelectedPlayer
-        if isElement(player) then
-            local selectedItem = guiGridListGetSelectedItem(aPermissions.List)
-            if (selectedItem > -1) then
-                local selectedGroup = guiGridListGetItemData(aPermissions.List, selectedItem, 1)
-                local currentState = guiGridListGetItemData(aPermissions.List, selectedItem, 2)
-                local confirmStr
-                if currentState then
-                    confirmStr = ('Are you sure you want to remove "%s" from the "%s" group?'):format(getPlayerName(player), selectedGroup)
-                else
-                    confirmStr = ('Are you sure you want to add "%s" to the "%s" group?'):format(getPlayerName(player), selectedGroup)
-                end
-                aMessageBox ( "question", confirmStr, "updatePlayerACLGroup", player, selectedGroup, not currentState )
-            end
-        else
-            aPermissions.Close(false)
-            messageBox("Player not found!", MB_WARNING)
-        end
+function aPermissions.ConfirmChange(add)
+    local player = aPermissions.SelectedPlayer
+
+    if (not isElement(player)) then
+        aPermissions.Close(false)
+        messageBox("Player not found!", MB_WARNING)
+        return
+    end
+
+    local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups
+    
+    local selected = guiGridListGetSelectedItem(gridlist)
+
+    if (selected <= -1) then 
+        return 
     end
+    
+    local groupName = guiGridListGetItemText(gridlist, selected, 1)
+
+    local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?'
+    str = str:format(getPlayerName(player), groupName)
+
+    return aMessageBox ( "question", str, "updatePlayerACLGroup", player, groupName, add)
 end
 
 function aPermissions.PerformAction(player, groupName, newState)
@@ -114,8 +121,9 @@ end
 
 function aPermissions.Refresh()
     local player = aPermissions.SelectedPlayer
-    if isElement(player) and (aPermissions.List) then
-        guiGridListClear(aPermissions.List)
+    if isElement(player) and aPermissions.PlayerGroups and aPermissions.AllGroups then
+        guiGridListClear(aPermissions.PlayerGroups)
+        guiGridListClear(aPermissions.AllGroups)
         triggerServerEvent('aAdmin', localPlayer, "sync", "playeraclgroups", player)
     end
 end

From d7bc47b6258e4ffae6ecd0bc5ccf490393067ec9 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:31:17 -0300
Subject: [PATCH 17/26] Revert "Merge branch 'master' of
 https://github.com/iDannz1/mtasa-resources into admin-replace-give-admin"

This reverts commit 124b058b01692c4b88aff04c0e5da2b177814a00, reversing
changes made to 20822316f72c9bcbd88666365ed9dc40363af660.
---
 [admin]/admin/client/gui/admin_main.lua       |   4 +-
 [gameplay]/killmessages/definitions.lua       | 519 ++++++++++++++++++
 [gameplay]/killmessages/gui.lua               | 271 +++++++++
 .../killmessages/killmessages_client.lua      |  55 ++
 .../killmessages/killmessages_server.lua      | 192 +++++++
 [gameplay]/killmessages/meta.xml              | 257 ++++-----
 .../scripts/client/c.killmessages.lua         | 160 ------
 .../scripts/client/c.settings.lua             |  16 -
 .../killmessages/scripts/client/c.ui.lua      | 112 ----
 .../killmessages/scripts/client/c.utils.lua   | 202 -------
 .../scripts/server/s.killmessages.lua         | 171 ------
 .../scripts/server/s.settings.lua             |  28 -
 [gameplay]/killmessages/utils/imagelib.lua    | 140 +++++
 [gameplay]/killmessages/utils/textlib.lua     | 335 +++++++++++
 [gameplay]/speedometer/client.lua             |  82 ---
 [gameplay]/speedometer/images/disc.png        | Bin 10990 -> 0 bytes
 [gameplay]/speedometer/images/needle.png      | Bin 1560 -> 0 bytes
 [gameplay]/speedometer/meta.xml               |   6 -
 18 files changed, 1636 insertions(+), 914 deletions(-)
 create mode 100644 [gameplay]/killmessages/definitions.lua
 create mode 100644 [gameplay]/killmessages/gui.lua
 create mode 100644 [gameplay]/killmessages/killmessages_client.lua
 create mode 100644 [gameplay]/killmessages/killmessages_server.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.settings.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.ui.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.utils.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.settings.lua
 create mode 100644 [gameplay]/killmessages/utils/imagelib.lua
 create mode 100644 [gameplay]/killmessages/utils/textlib.lua
 delete mode 100644 [gameplay]/speedometer/client.lua
 delete mode 100644 [gameplay]/speedometer/images/disc.png
 delete mode 100644 [gameplay]/speedometer/images/needle.png
 delete mode 100644 [gameplay]/speedometer/meta.xml

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 7dc143a96..035f00213 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -1391,7 +1391,7 @@ end
 
 -- anon admin
 function isAnonAdmin()
-	return (isElement(aTab1.AnonAdmin) and guiCheckBoxGetSelected ( aTab1.AnonAdmin )) or getElementData(localPlayer, 'AnonAdmin')
+	return guiCheckBoxGetSelected ( aTab1.AnonAdmin )
 end
 
 function setAnonAdmin( bOn )
@@ -1402,7 +1402,7 @@ end
 
 -- sensitive data
 function isSensitiveDataHidden()
-	return isElement(aTab1.HideSensitiveData) and guiCheckBoxGetSelected(aTab1.HideSensitiveData)
+	return guiCheckBoxGetSelected(aTab1.HideSensitiveData)
 end
 
 function setHideSensitiveData( bOn )
diff --git a/[gameplay]/killmessages/definitions.lua b/[gameplay]/killmessages/definitions.lua
new file mode 100644
index 000000000..932eaac32
--- /dev/null
+++ b/[gameplay]/killmessages/definitions.lua
@@ -0,0 +1,519 @@
+iconWidths = {
+[0] = 21,
+[1] = 15,
+[2] = 97,
+[3] = 55,
+[4] = 83,
+[5] = 72,
+[6] = 55,
+[7] = 138,
+[8] = 104,
+[9] = 59,
+[10] =40,
+[11] =31,
+[12] =41,
+[14] =10,
+[15] =71,
+[16] =13,
+[17] =10,
+[18] =4,
+[19] =17,
+[22] =35,
+[23] =50,
+[24] =37,
+[25] =75,
+[26] =67,
+[27] =66,
+[28] =17,
+[29] =35,
+[30] =70,
+[31] =71,
+[32] =22,
+[33] =75,
+[34] =86,
+[35] =74,
+[36] =75,
+[37] =19,
+[38] =54,
+[39] =8,
+[42] = 14,
+[49] = 86,
+[50] = 34,
+[51] = 17,
+[53] = 22,
+[54] = 15,
+[255] = 17,
+[256] = 20,
+[406] = 42,
+[408] = 47,
+[416] = 46,
+[417] = 33,
+[423] = 31,
+[424] = 39,
+[427] = 52,
+[428] = 43,
+[429] = 51,
+[432] = 61,
+[433] = 56,
+[434] = 45,
+[441] = 50,
+[443] = 49,
+[448] = 31,
+[457] = 26,
+[460] = 50,
+[462] = 27,
+[463] = 37,
+[464] = 43,
+[468] = 36,
+[470] = 49,
+[471] = 30,
+[480] = 52,
+[485] = 45,
+[486] = 39,
+[508] = 45,
+[511] = 49,
+[512] = 37,
+[513] = 48,
+[520] = 61,
+[524] = 41,
+[528] = 49,
+[530] = 27,
+[531] = 40,
+[532] = 42,
+[539] = 46,
+[564] = 48,
+[568] = 47,
+[571] = 41,
+[572] = 32,
+[573] = 37,
+[574] = 30,
+[578] = 37,
+[588] = 35,
+[593] = 40,
+[599] = 43,
+[601] = 48,
+--
+[400]=36,
+[401]=36,
+[402]=36,
+[403]=36,
+[404]=36,
+[405]=36,
+[409]=36,
+[410]=36,
+[411]=36,
+[412]=36,
+[413]=36,
+[415]=36,
+[418]=36,
+[419]=36,
+[420]=36,
+[421]=36,
+[422]=36,
+[426]=36,
+[435]=36,
+[436]=36,
+[438]=36,
+[439]=36,
+[445]=36,
+[449]=36,
+[450]=36,
+[451]=36,
+[458]=36,
+[466]=36,
+[467]=36,
+[474]=36,
+[475]=36,
+[477]=36,
+[478]=36,
+[479]=36,
+[489]=36,
+[490]=36,
+[491]=36,
+[492]=36,
+[494]=36,
+[495]=36,
+[496]=36,
+[500]=36,
+[503]=36,
+[504]=36,
+[505]=36,
+[506]=36,
+[507]=36,
+[516]=36,
+[517]=36,
+[518]=36,
+[525]=36,
+[526]=36,
+[527]=36,
+[529]=36,
+[533]=36,
+[534]=36,
+[535]=36,
+[536]=36,
+[540]=36,
+[541]=36,
+[542]=36,
+[543]=36,
+[545]=36,
+[546]=36,
+[547]=36,
+[549]=36,
+[550]=36,
+[551]=36,
+[552]=36,
+[554]=36,
+[555]=36,
+[558]=36,
+[559]=36,
+[560]=36,
+[561]=36,
+[562]=36,
+[565]=36,
+[566]=36,
+[567]=36,
+[575]=36,
+[576]=36,
+[579]=36,
+[580]=36,
+[583]=36,
+[584]=36,
+[585]=36,
+[587]=36,
+[589]=36,
+[591]=36,
+[594]=36,
+[600]=36,
+[602]=36,
+[603]=36,
+[604]=36,
+[605]=36,
+[606]=36,
+[607]=36,
+[608]=36,
+[610]=36,
+[611]=36,
+--
+[431]=44,
+[437]=44,
+[430]=61,
+[446]=61,
+[452]=61,
+[453]=61,
+[454]=61,
+[472]=61,
+[473]=61,
+[484]=61,
+[493]=61,
+[595]=61,
+[414]=37,
+[456]=37,
+[498]=37,
+[499]=37,
+[609]=37,
+[440]=46,
+[459]=46,
+[482]=46,
+[483]=46,
+[582]=46,
+[447]=39,
+[469]=39,
+[487]=42,
+[488]=42,
+[497]=42,
+[548]=42,
+[563]=42,
+[465]=32,
+[501]=32,
+[481]=30,
+[509]=30,
+[510]=30,
+[514]=46,
+[515]=46,
+[461]=35,
+[521]=35,
+[522]=35,
+[523]=35,
+[581]=35,
+[586]=35,
+[537]=41,
+[569]=41,
+[570]=41,
+[590]=41,
+[407]=55,
+[544]=55,
+[519]=44,
+[553]=44,
+[577]=44,
+[592]=44,
+[444]=39,
+[556]=39,
+[557]=39,
+[596]=48,
+[597]=48,
+[598]=48,
+[425]=34,
+--
+[999] = 20
+}
+--49 rammed, 50 heli blades, 53 drowning,  54 fall, 31 seaskimmer/rustler/rcbaron, hunter 38, death in vehicle no id, 52 predator
+--kill in vehicle, warp to driver
+
+icons = {
+[0] =  "icons/fist.png",
+[1] =  "icons/brassknuckle.png",
+[2] =  "icons/golfclub.png",
+[3] =  "icons/nitestick.png",
+[4] =  "icons/knifecur.png",
+[5] =  "icons/bat.png",
+[6] =  "icons/shovel.png",
+[7] =  "icons/poolcue.png",
+[8] =  "icons/katana.png",
+[9] =  "icons/chnsaw.png",
+[10] =  "icons/gun_dildo1.png",
+[11] =  "icons/gun_dildo2.png",
+[12] =  "icons/gun_vibe1.png",
+[14] =  "icons/flowera.png",
+[15] =  "icons/gun_cane.png",
+[16] =  "icons/grenade.png",
+[17] =  "icons/teargas.png",
+[18] =  "icons/molotov.png",
+[19] =  "icons/explosion.png",
+[22] =  "icons/colt45.png",
+[23] =  "icons/Silenced.png",
+[24] =  "icons/desert_eagle.png",
+[25] =  "icons/chromegun.png",
+[26] =  "icons/sawnoff.png",
+[27] =  "icons/shotgspa.png",
+[28] =  "icons/micro_uzi.png",
+[29] =  "icons/mp5lng.png",
+[30] =  "icons/ak47.png",
+[31] =  "icons/m4.png",
+[32] =  "icons/tec9.png",
+[33] =  "icons/cuntgun.png",
+[34] =  "icons/sniper.png",
+[35] =  "icons/rocketla.png",
+[36] =  "icons/heatseek.png",
+[37] =  "icons/flame.png",
+[38] =  "icons/minigun.png",
+[39] =  "icons/satchel.png",
+[42] =  "icons/fireextinguisher.png",
+[49] =  "icons/rammed.png",
+[50] =  "icons/maverick.png",
+[51] =  "icons/explosion.png",
+[53] =  "icons/drowned.png",
+[54] =  "icons/fall.png",
+[255] = "icons/suicide.png",
+[256] = "icons/headshot.png",
+-----------vehicle specific icons, according to their vehicle id---------
+[400]="icons/cars.png",
+[401]="icons/cars.png",
+[402]="icons/cars.png",
+[403]="icons/cars.png",
+[404]="icons/cars.png",
+[405]="icons/cars.png",
+[409]="icons/cars.png",
+[410]="icons/cars.png",
+[411]="icons/cars.png",
+[412]="icons/cars.png",
+[413]="icons/cars.png",
+[415]="icons/cars.png",
+[418]="icons/cars.png",
+[419]="icons/cars.png",
+[420]="icons/cars.png",
+[421]="icons/cars.png",
+[422]="icons/cars.png",
+[426]="icons/cars.png",
+[435]="icons/cars.png",
+[436]="icons/cars.png",
+[438]="icons/cars.png",
+[439]="icons/cars.png",
+[445]="icons/cars.png",
+[449]="icons/cars.png",
+[450]="icons/cars.png",
+[451]="icons/cars.png",
+[458]="icons/cars.png",
+[466]="icons/cars.png",
+[467]="icons/cars.png",
+[474]="icons/cars.png",
+[475]="icons/cars.png",
+[477]="icons/cars.png",
+[478]="icons/cars.png",
+[479]="icons/cars.png",
+[489]="icons/cars.png",
+[490]="icons/cars.png",
+[491]="icons/cars.png",
+[492]="icons/cars.png",
+[494]="icons/cars.png",
+[495]="icons/cars.png",
+[496]="icons/cars.png",
+[500]="icons/cars.png",
+[503]="icons/cars.png",
+[504]="icons/cars.png",
+[505]="icons/cars.png",
+[506]="icons/cars.png",
+[507]="icons/cars.png",
+[516]="icons/cars.png",
+[517]="icons/cars.png",
+[518]="icons/cars.png",
+[525]="icons/cars.png",
+[526]="icons/cars.png",
+[527]="icons/cars.png",
+[529]="icons/cars.png",
+[533]="icons/cars.png",
+[534]="icons/cars.png",
+[535]="icons/cars.png",
+[536]="icons/cars.png",
+[540]="icons/cars.png",
+[541]="icons/cars.png",
+[542]="icons/cars.png",
+[543]="icons/cars.png",
+[545]="icons/cars.png",
+[546]="icons/cars.png",
+[547]="icons/cars.png",
+[549]="icons/cars.png",
+[550]="icons/cars.png",
+[551]="icons/cars.png",
+[552]="icons/cars.png",
+[554]="icons/cars.png",
+[555]="icons/cars.png",
+[558]="icons/cars.png",
+[559]="icons/cars.png",
+[560]="icons/cars.png",
+[561]="icons/cars.png",
+[562]="icons/cars.png",
+[565]="icons/cars.png",
+[566]="icons/cars.png",
+[567]="icons/cars.png",
+[575]="icons/cars.png",
+[576]="icons/cars.png",
+[579]="icons/cars.png",
+[580]="icons/cars.png",
+[583]="icons/cars.png",
+[584]="icons/cars.png",
+[585]="icons/cars.png",
+[587]="icons/cars.png",
+[589]="icons/cars.png",
+[591]="icons/cars.png",
+[594]="icons/cars.png",
+[600]="icons/cars.png",
+[602]="icons/cars.png",
+[603]="icons/cars.png",
+[604]="icons/cars.png",
+[605]="icons/cars.png",
+[606]="icons/cars.png",
+[607]="icons/cars.png",
+[608]="icons/cars.png",
+[610]="icons/cars.png",
+[611]="icons/cars.png",
+--
+[431]="icons/bus.png",
+[437]="icons/bus.png",
+[430]="icons/boat.png",
+[446]="icons/boat.png",
+[452]="icons/boat.png",
+[453]="icons/boat.png",
+[454]="icons/boat.png",
+[472]="icons/boat.png",
+[473]="icons/boat.png",
+[484]="icons/boat.png",
+[493]="icons/boat.png",
+[595]="icons/boat.png",
+[414]="icons/boxtruck.png",
+[456]="icons/boxtruck.png",
+[498]="icons/boxtruck.png",
+[499]="icons/boxtruck.png",
+[609]="icons/boxtruck.png",
+[440]="icons/roundvan.png",
+[459]="icons/roundvan.png",
+[482]="icons/roundvan.png",
+[483]="icons/roundvan.png",
+[582]="icons/roundvan.png",
+[447]="icons/sparrow.png",
+[469]="icons/sparrow.png",
+[487]="icons/maverick.png",
+[488]="icons/maverick.png",
+[497]="icons/maverick.png",
+[548]="icons/maverick.png",
+[563]="icons/maverick.png",
+[465]="icons/rccopter.png",
+[501]="icons/rccopter.png",
+[481]="icons/bike.png",
+[509]="icons/bike.png",
+[510]="icons/bike.png",
+[514]="icons/bigtruck.png",
+[515]="icons/bigtruck.png",
+[461]="icons/crotchrocket.png",
+[521]="icons/crotchrocket.png",
+[522]="icons/crotchrocket.png",
+[523]="icons/crotchrocket.png",
+[581]="icons/crotchrocket.png",
+[586]="icons/crotchrocket.png",
+[537]="icons/train.png",
+[569]="icons/train.png",
+[570]="icons/train.png",
+[590]="icons/train.png",
+[407]="icons/firetruck.png",
+[544]="icons/firetruck.png",
+[519]="icons/plane.png",
+[553]="icons/plane.png",
+[577]="icons/plane.png",
+[592]="icons/plane.png",
+[444]="icons/monstertruck.png",
+[556]="icons/monstertruck.png",
+[557]="icons/monstertruck.png",
+[596]="icons/copcar.png",
+[597]="icons/copcar.png",
+[598]="icons/copcar.png",
+[425]="icons/hunter.png",
+--
+[406]="icons/406.png",
+[408]="icons/408.png",
+[416]="icons/416.png",
+[417]="icons/417.png",
+[423]="icons/423.png",
+[424]="icons/424.png",
+[427]="icons/427.png",
+[428]="icons/428.png",
+[429]="icons/429.png",
+[432]="icons/432.png",
+[433]="icons/433.png",
+[434]="icons/434.png",
+[441]="icons/441.png",
+[443]="icons/443.png",
+[448]="icons/448.png",
+[457]="icons/457.png",
+[460]="icons/460.png",
+[462]="icons/462.png",
+[463]="icons/463.png",
+[464]="icons/464.png",
+[468]="icons/468.png",
+[470]="icons/470.png",
+[471]="icons/471.png",
+[480]="icons/480.png",
+[485]="icons/485.png",
+[486]="icons/486.png",
+[508]="icons/508.png",
+[511]="icons/511.png",
+[512]="icons/512.png",
+[513]="icons/513.png",
+[520]="icons/520.png",
+[524]="icons/524.png",
+[528]="icons/528.png",
+[530]="icons/530.png",
+[531]="icons/531.png",
+[532]="icons/532.png",
+[539]="icons/539.png",
+[564]="icons/564.png",
+[568]="icons/568.png",
+[571]="icons/571.png",
+[572]="icons/572.png",
+[573]="icons/573.png",
+[574]="icons/574.png",
+[578]="icons/578.png",
+[588]="icons/588.png",
+[593]="icons/593.png",
+[599]="icons/599.png",
+--
+[999]="icons/generic.png"
+}
diff --git a/[gameplay]/killmessages/gui.lua b/[gameplay]/killmessages/gui.lua
new file mode 100644
index 000000000..96b00722a
--- /dev/null
+++ b/[gameplay]/killmessages/gui.lua
@@ -0,0 +1,271 @@
+local customKills = {}
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local endTime
+local screenX,screenY = guiGetScreenSize ()
+local contentMessages = {}
+local fadingLines = {}
+---
+local iconOrder = {}
+
+
+function setupTextOnStart ( resource )
+	if resource ~= getThisResource() then return end
+	triggerServerEvent ( "onClientKillmessagesLoaded", getLocalPlayer() )
+end
+addEventHandler ( "onClientResourceStart", getRootElement(), setupTextOnStart )
+
+addEvent ("doSetKillMessageStyle",true)
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then align = default.align end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	if #contentMessages ~= 0 then
+		for i=1,config.lines do
+			if contentMessages[i] then
+				destroyLine ( i )
+			end
+		end
+	end
+	fadingLines = {}
+	killMessages = {}
+	if ( config.startY < 0 ) then
+		config.startY = screenY - math.abs(config.startY*screenY) - (config.iconHeight*config.lines)
+		config.startY = config.startY/screenY
+	end
+	createKillMessageGUI()
+	return true
+end
+addEventHandler ( "doSetKillMessageStyle",getRootElement(),setKillMessageStyle)
+
+function createKillMessageGUI()
+	local gap = config.iconHeight - config.textHeight
+	gap = gap/2
+	for i=1,config.lines do
+		local y = config.startY*screenY + (config.iconHeight*(i-1))
+		y = y + gap
+		contentMessages[i] = { dxText:create("",0,y) }
+	end
+	endTime = config.fadeTime + config.startFade
+end
+
+function shiftUpGUI()
+	local i = 1
+	for i=config.lines,2,-1 do
+		local y = config.startY*screenY + (config.iconHeight*(i-1)) + (config.iconHeight - config.textHeight)/2
+		local targetY = config.startY*screenY + (config.iconHeight*(i-2)) + (config.iconHeight - config.textHeight)/2
+		if contentMessages[i] then
+			for k,part in ipairs(contentMessages[i]) do
+				local x,realY = getWidgetPosition(part)
+
+				local diffY = realY - y
+				setWidgetPosition(part,x,targetY + diffY)
+			end
+		end
+	end
+	for i=1,config.lines-1 do
+		---shift up the alpha too
+		local tick = fadingLines[i+1]
+		fadingLines[i] = tick
+		fadingLines[i+1] = nil
+	end
+end
+
+addEvent ( "doOutputMessage", true )
+function outputMessage ( message, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if type(font) ~= "string" then
+		font = "default"
+	end
+	r = tonumber(r) or 255
+	g = tonumber(g) or 255
+	b = tonumber(b) or 255
+	---shift everything up
+	shiftUpGUI()
+	--Delete the first line
+	destroyLine (1)
+	table.remove ( contentMessages, 1 )
+	if type(message) == "string" then
+		message = {message}
+	end
+	local y = config.startY*screenY + (config.iconHeight*(config.lines-1)) + (config.iconHeight - config.textHeight)/2
+	local startX = config.startX
+	if startX < 1 and startX > -1 then --auto calculate whether its relative or absolute
+		startX = screenX/startX --make it relative
+	end
+	if startX < 0 then
+		startX = screenX + startX
+	end
+
+	for i,part in ipairs(message) do
+		if type(part) == "table" and part[1] == "image" then
+			if not part.resource and not part.resourceName then
+				part.resource = sourceResource
+			end
+		end
+	end
+
+	drawLine ( message, startX, y, config.align, config.lines, r, g, b, font, 1 )
+	fadeLine ( config.lines )
+end
+addEventHandler ( "doOutputMessage", getRootElement(), outputMessage )
+
+function drawLine ( message, x,y, align, line, r, g, b, font, scale )
+	--First draw it and work out the width
+	local width = 0
+	contentMessages[line] = {}
+	for i,part in ipairs(message) do
+		if type(part) == "string" then
+			local text = dxText:create ( part, width, y, false )
+			text:font ( font )
+			text:scale ( scale )
+			text:type("shadow",1)
+			text:align"left"
+			text:color ( r,g,b )
+			table.insert ( contentMessages[line], text )
+			width = width + text:extent()
+		elseif part[1] == "icon" then
+			local iconWidth = part.width or iconWidths[part.id or -1] or iconWidths[255]
+			local iconHeight = part.height or config.iconHeight
+			local image = dxImage:create ( icons[part.id or 0] or icons[255], width, y + (part.posOffY or config.iconPosOffY), iconWidth, iconHeight, false )
+			image:color ( part.r or 255, part.g or 255, part.b or 255 )
+			image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+			width = width + iconWidth
+			table.insert ( contentMessages[line], image )
+		elseif part[1] == "image" then
+			if part.width and part.path then
+				if part.resourceName then
+					part.resource = getResourceFromName(tostring(part.resourceName)) or part.resource
+				end
+				local image = dxImage:create ( ":"..getResourceName(part.resource).."/"..part.path, width, y + (part.posOffY or config.iconPosOffY), part.width, part.height or config.iconHeight, false )
+				image:color ( part.r or 255, part.g or 255, part.b or 255 )
+				image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+				width = width + part.width
+				table.insert ( contentMessages[line], image )
+			end
+		elseif part[1] == "color" or part[1] == "colour" then
+			r = part.r or r
+			g = part.g or g
+			b = part.b or b
+		elseif part[1] == "padding" then
+			width = width + part.width or 0
+		end
+		contentMessages[line].scale = scale
+	end
+	--Now reposition everything properly
+	if align == "center" or align == "centre" then
+		x = x - width/2
+	elseif align == "right" then
+		x = x - width
+	end
+	for i,widget in ipairs(contentMessages[line]) do
+		local wx,wy = getWidgetPosition ( widget )
+		setWidgetPosition ( widget, x + wx, wy )
+	end
+	return true
+end
+
+function fadeLine ( line )
+	setLineAlpha ( line, 1 )
+	fadingLines[line] = getTickCount()
+end
+-----
+addEventHandler ( "onClientRender",getRootElement(),
+function()
+	for line,originalTick in pairs(fadingLines) do
+		local tickDifference = getTickCount() - originalTick
+		if tickDifference > endTime then
+			destroyLine ( line )
+			setLineAlpha ( line, 1 )
+			fadingLines[line] = nil
+		elseif tickDifference >  config.startFade then
+			local fadeTimeDifference = tickDifference - config.startFade
+			--calculate the alpha
+			local newAlpha = 1 - fadeTimeDifference/config.fadeTime
+			--Set all the alphas
+			setLineAlpha ( line, newAlpha )
+		end
+	end
+end )
+
+function setLineAlpha ( line, alpha )
+	for i,part in ipairs(contentMessages[line]) do
+		setWidgetAlpha ( part, alpha )
+	end
+end
+
+function destroyLine ( line )
+	for k,part in ipairs(contentMessages[line]) do
+		destroyWidget(part)
+	end
+	contentMessages[line] = {}
+end
+
+function destroyWidget ( widget )
+	if isElement(widget) then
+		destroyElement ( widget )
+	elseif type(widget) == "table" and widget.destroy then
+		widget:destroy()
+	end
+end
+
+function getWidgetPosition ( widget )
+	if isElement(widget) then
+		return guiGetPosition ( widget, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position()
+	end
+end
+
+function setWidgetPosition ( widget, x, y )
+	if isElement(widget) then
+		return guiSetPosition ( widget, x, y, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position(x,y,false)
+	end
+end
+
+function setWidgetAlpha ( widget, alpha )
+	if isElement(widget) then
+		guiSetAlpha ( widget, alpha )
+	elseif type(widget) == "table" and widget.color then
+		local r,g,b = widget:color()
+		widget:color(r,g,b,alpha*255)
+	end
+end
diff --git a/[gameplay]/killmessages/killmessages_client.lua b/[gameplay]/killmessages/killmessages_client.lua
new file mode 100644
index 000000000..0907c2d4b
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_client.lua
@@ -0,0 +1,55 @@
+addEvent ("onClientPlayerKillMessage",true)
+function onClientPlayerKillMessage ( killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+	if wasEventCancelled() then return end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+end
+addEventHandler ("onClientPlayerKillMessage",getRootElement(),onClientPlayerKillMessage)
+
+function outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if not iconWidths[weapon] then
+		if type(weapon) ~= "string" then
+			weapon = 999
+		end
+	end
+	local killerName
+	local wastedName
+	if not tonumber(wr) then wr = 255 end
+	if not tonumber(wg) then wg = 255 end
+	if not tonumber(wb) then wb = 255 end
+	if not tonumber(kr) then kr = 255 end
+	if not tonumber(kg) then kg = 255 end
+	if not tonumber(kb) then kb = 255 end
+	if ( source ) then
+		if isElement ( source ) then
+			if getElementType ( source ) == "player" then
+				wastedName = getPlayerName ( source )
+			else
+			outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+			return false end
+		elseif type(source) == "string" then
+			wastedName = source
+		end
+	else
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+	return false end
+	if ( killer ) then
+		if isElement ( killer ) then
+			if getElementType ( killer ) == "player" then
+				killerName = getPlayerName ( killer )
+			else
+				outputDebugString ( "outputKillMessage - Invalid 'killer' player specified",0,0,0,100)
+			return false end
+		elseif type(killer) == "string" then
+			killerName = killer
+		else
+			killerName = ""
+		end
+	else killerName = "" end
+	--create the new text
+	if not killerName then
+		killerName = ""
+	end
+	return outputMessage ( {killerName, {"padding",width=3}, {"icon",id=weapon},
+		{"padding",width=3},{"color",r=wr,g=wg,b=wb}, wastedName},
+		kr,kg,kb )
+end
diff --git a/[gameplay]/killmessages/killmessages_server.lua b/[gameplay]/killmessages/killmessages_server.lua
new file mode 100644
index 000000000..9c910d651
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_server.lua
@@ -0,0 +1,192 @@
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+
+function KillMessages_onPlayerWasted(totalammo, killer, killerweapon, bodypart)
+	local usedVehicle = nil
+	local killerType = nil
+	local killerweapon = killerweapon or 255
+	-- In very rare cases killer isn't nil or false but isn't an element.
+	if (killer and not isElement(killer)) then
+		killer = nil
+	end
+	if (killer) then
+		killerType = getElementType(killer)
+	end
+	-- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
+	if (killerType == "player") then
+		local vehicle = getPedOccupiedVehicle(killer)
+		if (vehicle and getPedWeapon(killer) == 0) then
+			usedVehicle = getElementModel(vehicle)
+		end
+	end
+	-- Change the killer into the vehicle controller
+	if (killer and killerType == "vehicle") then
+		usedVehicle = getElementModel(killer)
+		killer = getVehicleController(killer) or killer
+		killerType = getElementType(killer)
+	end
+	-- If killed by rocket and was on foot player turn it into their current weapon
+	if (killerweapon == 19 and killerType == "player" and not isPedInVehicle(killer)) then
+		killerweapon = getPedWeapon(killer) or 51
+	end
+	-- Got a killer? Print the normal "* X died" if not
+	if (killer and killerType == "player") then
+		local kr, kg, kb = getPlayerNametagColor(killer)
+		if (getPlayerTeam(killer)) then
+			kr, kg, kb = getTeamColor(getPlayerTeam(killer))
+		end
+		-- Suicide?
+		if (source == killer) then
+			local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+			--outputDebugString("Cancelled: "..tostring(triggered))
+			if (triggered) then
+				eventTriggered(source, false, killerweapon, bodypart, true, usedVehicle)
+				return
+			end
+		end
+		local triggered = triggerEvent("onPlayerKillMessage", source, killer, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, killer, killerweapon, bodypart, false, usedVehicle)
+		end
+	else
+		local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, false, killerweapon, bodypart, false, usedVehicle)
+		end
+	end
+end
+addEventHandler("onPlayerWasted", root, KillMessages_onPlayerWasted)
+
+addEvent ( "onPlayerKillMessage" )
+function eventTriggered ( source,killer,weapon,bodypart,suicide,usedVehicle )
+	local wr,wg,wb = getPlayerNametagColor	( source )
+	if getPlayerTeam ( source ) then
+		wr,wg,wb = getTeamColor ( getPlayerTeam ( source ) )
+	end
+	local kr,kg,kb = false,false,false
+	if ( killer ) then
+		kr,kg,kb = getPlayerNametagColor	( killer )
+		if getPlayerTeam ( killer ) then
+			kr,kg,kb = getTeamColor ( getPlayerTeam ( killer ) )
+		end
+	end
+	if ( usedVehicle ) then
+		weapon = usedVehicle
+	end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon )
+	--
+	local extra = ""
+	if ( usedVehicle ) then
+	extra = " (Vehicle)"
+	end
+	if ( killer ) then
+		if suicide then
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself. ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself."..extra )
+			end
+		else
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source)..". ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source).."."..extra )
+			end
+		end
+	else
+		outputConsoleKillMessage ( "* "..getPlayerName(source).." died."..extra )
+	end
+	--
+end
+
+function outputConsoleKillMessage ( text )
+	outputConsole ( text )
+end
+
+function outputKillMessage ( killed, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if ( resource ) then resource = getResourceName(resource) end
+	if not isElement(killed) then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	if not getElementType(killed) == "player" then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	return triggerClientEvent(getRootElement(),"onClientPlayerKillMessage",killed,killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+end
+
+function outputMessage ( message, visibleTo, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if not isElement(visibleTo) then
+		outputDebugString ( "outputMessage - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+	--Turn any resources into resource names
+	if type(message) == "table" then
+		for i,part in ipairs(message) do
+			if type(part) == "table" and part[1] == "image" then
+				if part.resource then
+					message[i].resourceName = getResourceName(part.resource)
+				else
+					part.resourceName = getResourceName(sourceResource)
+				end
+			end
+		end
+	end
+	return triggerClientEvent ( visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font )
+end
+
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then startY = align.startY end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	for k,v in ipairs(getElementsByType"player") do
+		triggerClientEvent(v,"doSetKillMessageStyle",v,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+	end
+	return true
+end
+
+addEvent ("onClientKillmessagesLoaded",true)
+addEventHandler ( "onClientKillmessagesLoaded", getRootElement(),
+function()
+	triggerClientEvent(client,"doSetKillMessageStyle",client,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+end )
diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index fd9ecb86e..99993348a 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -1,138 +1,125 @@
 <meta>
-    <info author="Talidan + Iggy" type="script" version="2.0.2"/>
-    <min_mta_version client="1.5.7-9.20447"></min_mta_version>
+	<info author="Talidan + Iggy" type="script" version="2.0.1"/>
+	<script src="utils/textlib.lua" type="client"/>
+	<script src="utils/imagelib.lua" type="client"/>
+	<script src="killmessages_client.lua" type="client"/>
+	<script src="killmessages_server.lua" type="server"/>
+	<script src="gui.lua" type="client"/>
+	<script src="definitions.lua" type="client"/>
+	<!--All icons courtesy of Iggy-->
+	<file src="icons/fist.png"/>
+	<file src="icons/brassknuckle.png"/>
+	<file src="icons/golfclub.png"/>
+	<file src="icons/nitestick.png"/>
+	<file src="icons/knifecur.png"/>
+	<file src="icons/bat.png"/>
+	<file src="icons/shovel.png"/>
+	<file src="icons/poolcue.png"/>
+	<file src="icons/katana.png"/>
+	<file src="icons/chnsaw.png"/>
+	<file src="icons/gun_dildo1.png"/>
+	<file src="icons/gun_dildo2.png"/>
+	<file src="icons/gun_vibe1.png"/>
+	<file src="icons/flowera.png"/>
+	<file src="icons/gun_cane.png"/>
+	<file src="icons/grenade.png"/>
+	<file src="icons/teargas.png"/>
+	<file src="icons/molotov.png"/>
+	<file src="icons/colt45.png"/>
+	<file src="icons/Silenced.png"/>
+	<file src="icons/desert_eagle.png"/>
+	<file src="icons/chromegun.png"/>
+	<file src="icons/sawnoff.png"/>
+	<file src="icons/shotgspa.png"/>
+	<file src="icons/micro_uzi.png"/>
+	<file src="icons/mp5lng.png"/>
+	<file src="icons/ak47.png"/>
+	<file src="icons/m4.png"/>
+	<file src="icons/tec9.png"/>
+	<file src="icons/cuntgun.png"/>
+	<file src="icons/sniper.png"/>
+	<file src="icons/rocketla.png"/>
+	<file src="icons/heatseek.png"/>
+	<file src="icons/flame.png"/>
+	<file src="icons/minigun.png"/>
+	<file src="icons/satchel.png"/>
+	<file src="icons/explosion.png"/>
+	<file src="icons/suicide.png"/>
+	<file src="icons/rammed.png"/>
+	<file src="icons/hunter.png"/>
+	<file src="icons/fall.png"/>
+	<file src="icons/drowned.png"/>
+	<file src="icons/generic.png"/>
+	<file src="icons/headshot.png"/>
+	<file src="icons/406.png"/>
+	<file src="icons/408.png"/>
+	<file src="icons/416.png"/>
+	<file src="icons/417.png"/>
+	<file src="icons/423.png"/>
+	<file src="icons/424.png"/>
+	<file src="icons/427.png"/>
+	<file src="icons/428.png"/>
+	<file src="icons/429.png"/>
+	<file src="icons/432.png"/>
+	<file src="icons/433.png"/>
+	<file src="icons/434.png"/>
+	<file src="icons/441.png"/>
+	<file src="icons/443.png"/>
+	<file src="icons/448.png"/>
+	<file src="icons/457.png"/>
+	<file src="icons/460.png"/>
+	<file src="icons/462.png"/>
+	<file src="icons/463.png"/>
+	<file src="icons/464.png"/>
+	<file src="icons/468.png"/>
+	<file src="icons/470.png"/>
+	<file src="icons/471.png"/>
+	<file src="icons/480.png"/>
+	<file src="icons/485.png"/>
+	<file src="icons/486.png"/>
+	<file src="icons/508.png"/>
+	<file src="icons/511.png"/>
+	<file src="icons/512.png"/>
+	<file src="icons/513.png"/>
+	<file src="icons/520.png"/>
+	<file src="icons/524.png"/>
+	<file src="icons/528.png"/>
+	<file src="icons/530.png"/>
+	<file src="icons/531.png"/>
+	<file src="icons/532.png"/>
+	<file src="icons/539.png"/>
+	<file src="icons/564.png"/>
+	<file src="icons/568.png"/>
+	<file src="icons/571.png"/>
+	<file src="icons/572.png"/>
+	<file src="icons/573.png"/>
+	<file src="icons/574.png"/>
+	<file src="icons/578.png"/>
+	<file src="icons/588.png"/>
+	<file src="icons/593.png"/>
+	<file src="icons/599.png"/>
+	<file src="icons/bigtruck.png"/>
+	<file src="icons/bike.png"/>
+	<file src="icons/boat.png"/>
+	<file src="icons/boxtruck.png"/>
+	<file src="icons/bus.png"/>
+	<file src="icons/cars.png"/>
+	<file src="icons/copcar.png"/>
+	<file src="icons/crotchrocket.png"/>
+	<file src="icons/firetruck.png"/>
+	<file src="icons/maverick.png"/>
+	<file src="icons/monstertruck.png"/>
+	<file src="icons/plane.png"/>
+	<file src="icons/rccopter.png"/>
+	<file src="icons/roundvan.png"/>
+	<file src="icons/sparrow.png"/>
+	<file src="icons/train.png"/>
+	<file src="icons/fireextinguisher.png"/>
 
-    <script type="server" src="scripts/server/s.killmessages.lua"/>
-    <script type="server" src="scripts/server/s.settings.lua"/>
-
-    <script type="client" src="scripts/client/c.killmessages.lua"/>
-    <script type="client" src="scripts/client/c.ui.lua"/>
-    <script type="client" src="scripts/client/c.settings.lua"/>
-    <script type="client" src="scripts/client/c.utils.lua"/>
-
-    <export type="shared" function="outputMessage"/>
-    <export type="shared" function="outputKillMessage"/>
-
-    <!--All icons courtesy of Iggy-->
-    <file src="icons/406.png"/>
-    <file src="icons/408.png"/>
-    <file src="icons/416.png"/>
-    <file src="icons/417.png"/>
-    <file src="icons/423.png"/>
-    <file src="icons/424.png"/>
-    <file src="icons/427.png"/>
-    <file src="icons/428.png"/>
-    <file src="icons/429.png"/>
-    <file src="icons/432.png"/>
-    <file src="icons/433.png"/>
-    <file src="icons/434.png"/>
-    <file src="icons/441.png"/>
-    <file src="icons/443.png"/>
-    <file src="icons/448.png"/>
-    <file src="icons/457.png"/>
-    <file src="icons/460.png"/>
-    <file src="icons/462.png"/>
-    <file src="icons/463.png"/>
-    <file src="icons/464.png"/>
-    <file src="icons/468.png"/>
-    <file src="icons/470.png"/>
-    <file src="icons/471.png"/>
-    <file src="icons/480.png"/>
-    <file src="icons/485.png"/>
-    <file src="icons/486.png"/>
-    <file src="icons/508.png"/>
-    <file src="icons/511.png"/>
-    <file src="icons/512.png"/>
-    <file src="icons/513.png"/>
-    <file src="icons/520.png"/>
-    <file src="icons/524.png"/>
-    <file src="icons/528.png"/>
-    <file src="icons/530.png"/>
-    <file src="icons/531.png"/>
-    <file src="icons/532.png"/>
-    <file src="icons/532b.png"/>
-    <file src="icons/539.png"/>
-    <file src="icons/564.png"/>
-    <file src="icons/568.png"/>
-    <file src="icons/571.png"/>
-    <file src="icons/572.png"/>
-    <file src="icons/573.png"/>
-    <file src="icons/574.png"/>
-    <file src="icons/578.png"/>
-    <file src="icons/588.png"/>
-    <file src="icons/593.png"/>
-    <file src="icons/599.png"/>
-    <file src="icons/601.png"/>
-    <file src="icons/ak47.png"/>
-    <file src="icons/bat.png"/>
-    <file src="icons/bigtruck.png"/>
-    <file src="icons/bike.png"/>
-    <file src="icons/boat.png"/>
-    <file src="icons/boxtruck.png"/>
-    <file src="icons/brassknuckle.png"/>
-    <file src="icons/bus.png"/>
-    <file src="icons/cars.png"/>
-    <file src="icons/chnsaw.png"/>
-    <file src="icons/chromegun.png"/>
-    <file src="icons/colt45.png"/>
-    <file src="icons/copcar.png"/>
-    <file src="icons/crotchrocket.png"/>
-    <file src="icons/cuntgun.png"/>
-    <file src="icons/desert_eagle.png"/>
-    <file src="icons/drowned.png"/>
-    <file src="icons/explosion.png"/>
-    <file src="icons/fall.png"/>
-    <file src="icons/fireextinguisher.png"/>
-    <file src="icons/firetruck.png"/>
-    <file src="icons/fist.png"/>
-    <file src="icons/flame.png"/>
-    <file src="icons/flowera.png"/>
-    <file src="icons/generic.png"/>
-    <file src="icons/golfclub.png"/>
-    <file src="icons/grenade.png"/>
-    <file src="icons/gun_cane.png"/>
-    <file src="icons/gun_dildo1.png"/>
-    <file src="icons/gun_dildo2.png"/>
-    <file src="icons/gun_vibe1.png"/>
-    <file src="icons/gun_vibe2.png"/>
-    <file src="icons/headshot.png"/>
-    <file src="icons/heatseek.png"/>
-    <file src="icons/hunter.png"/>
-    <file src="icons/katana.png"/>
-    <file src="icons/knifecur.png"/>
-    <file src="icons/m4.png"/>
-    <file src="icons/maverick.png"/>
-    <file src="icons/micro_uzi.png"/>
-    <file src="icons/minigun.png"/>
-    <file src="icons/missile.png"/>
-    <file src="icons/molotov.png"/>
-    <file src="icons/monstertruck.png"/>
-    <file src="icons/mp5lng.png"/>
-    <file src="icons/nitestick.png"/>
-    <file src="icons/plane.png"/>
-    <file src="icons/poolcue.png"/>
-    <file src="icons/rammed.png"/>
-    <file src="icons/rccopter.png"/>
-    <file src="icons/rocketla.png"/>
-    <file src="icons/roundvan.png"/>
-    <file src="icons/satchel.png"/>
-    <file src="icons/sawnoff.png"/>
-    <file src="icons/shotgspa.png"/>
-    <file src="icons/shovel.png"/>
-    <file src="icons/Silenced.png"/>
-    <file src="icons/sniper.png"/>
-    <file src="icons/sparrow.png"/>
-    <file src="icons/suicide.png"/>
-    <file src="icons/teargas.png"/>
-    <file src="icons/tec9.png"/>
-    <file src="icons/train.png"/>
-
-    <settings>
-        <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
-        <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
-        <setting name="*drawMarginBottom" value="0.5" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
-        <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
-        <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
-        <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>
-    </settings>
+	<export function="outputMessage" type="server"/>
+	<export function="outputMessage" type="client"/>
+	<export function="outputKillMessage" type="server"/>
+	<export function="outputKillMessage" type="client"/>
+	<export function="setKillMessageStyle" type="client"/>
+	<export function="setKillMessageStyle" type="server"/>
 </meta>
diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
deleted file mode 100644
index ddfcfa2be..000000000
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ /dev/null
@@ -1,160 +0,0 @@
-addEvent('onClientPlayerKillMessage', true)
-addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
-    if wasEventCancelled() then
-        return
-    end
-    outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
-end)
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    pR = tonumber(pR) or 255
-    pG = tonumber(pG) or 255
-    pB = tonumber(pB) or 255
-    
-    kR = tonumber(kR) or 255
-    kG = tonumber(kG) or 255
-    kB = tonumber(kB) or 255
-    
-    if (not player) or (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    local killerName
-    
-    if isElement(killer) then
-        if (getElementType(killer) ~= 'player') then
-            outputDebugString("outputKillMessage - Invalid 'killer' player specified", 0, 0, 0, 100)
-            return false
-        end
-        killerName = getPlayerName(killer)
-    
-    elseif (type(killer) == 'string') then
-        killerName = killer
-    
-    end
-    
-    local message = {
-        icon = getMessageIcon(weapon, killer),
-        victim = {
-            text = removeHex(getPlayerName(player)),
-            color = {pR, pG, pB},
-        }
-    }
-    
-    if (type(killerName) == 'string') then
-        message.killer = {
-            text = removeHex(killerName),
-            color = {kR, kG, kB},
-        }
-    end
-    
-    return outputMessage(message)
-end
-
-local possibleKiller
-
-function setPossibleKiller(player)
-    if possibleKiller and isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = {
-        player = player,
-        timer = setTimer(function()
-            possibleKiller = nil
-        end, 7000, 1)
-    }
-end
-
-local validExplosionTypes = {
-    [2] = true, -- rocket
-    [10] = true, -- tank grenade
-}
-
-addEventHandler('onClientExplosion', root, function(x, y, z, explosionType)
-    if (not validExplosionTypes[explosionType]) then
-        return
-    end
-    
-    if (getElementType(source) ~= 'player') then
-        return
-    end
-    
-    if (not getPedOccupiedVehicle(source)) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (not myVehicle) then
-        return
-    end
-    
-    if (getDistanceBetweenPoints3D(x, y, z, getElementPosition(myVehicle)) > 10) then
-        return
-    end
-
-    setPossibleKiller(source)
-end)
-
-local vehicleWeapons = {
-    [425] = 38, -- hunter
-    [464] = 31, -- rc baron
-    [476] = 31, -- rustler
-}
-
-addEventHandler('onClientVehicleDamage', root, function(attacker, weapon)
-    if (not weapon) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (source ~= myVehicle) then
-        return
-    end
-    
-    if (not attacker) or (getElementType(attacker) ~= 'vehicle') then
-        return
-    end
-    
-    local player = getVehicleOccupant(attacker)
-    
-    if (not player) then
-        return
-    end
-    
-    if (vehicleWeapons[getElementModel(attacker)] ~= weapon) then
-        return
-    end
-    
-    setPossibleKiller(player)
-end)
-
-addEventHandler('onClientPlayerWasted', localPlayer, function()
-    if (not possibleKiller) then
-        -- If there is no possible killer and the current vehicle is exploded
-        local myVehicle = getPedOccupiedVehicle(localPlayer)
-        if myVehicle and isVehicleBlown(myVehicle) then
-            triggerServerEvent('outputKillFromClient', localPlayer, localPlayer, myVehicle)
-        end
-        return
-    end
-    
-    if (not isElement(possibleKiller.player)) then
-        return
-    end
-    
-    local vehicle = getPedOccupiedVehicle(possibleKiller.player)
-    
-    if isElement(vehicle) then
-        triggerServerEvent('outputKillFromClient', localPlayer, possibleKiller.player, vehicle)
-    end
-    
-    if isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = nil
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.settings.lua b/[gameplay]/killmessages/scripts/client/c.settings.lua
deleted file mode 100644
index 5ec940689..000000000
--- a/[gameplay]/killmessages/scripts/client/c.settings.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local settings = {}
-
-function getSetting(name)
-    return settings[name] or false
-end
-
-addEvent('receiveKillMessagesSettings', true)
-addEventHandler('receiveKillMessagesSettings', localPlayer, function(received)
-    for k, v in pairs(received) do -- replace only received settings.
-        settings[k] = tonumber(v)
-    end
-end)
-
-addEventHandler('onClientResourceStart', resourceRoot, function()
-    triggerServerEvent('requestKillMessagesSettings', localPlayer)
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.ui.lua b/[gameplay]/killmessages/scripts/client/c.ui.lua
deleted file mode 100644
index de7ec0470..000000000
--- a/[gameplay]/killmessages/scripts/client/c.ui.lua
+++ /dev/null
@@ -1,112 +0,0 @@
-local messages = {}
-local sW, sH = guiGetScreenSize()
-
-function outputMessage(new)
-    if (type(new) == 'string') then
-        new = {
-            victim = {
-                text = new,
-                color = {255, 255, 255},
-            },
-        }
-    end
-    
-    new.initTick = getTickCount()
-    
-    table.insert(messages, new)
-    
-    local displayLines = tonumber(getSetting('displayLines')) or 5
-    
-    local quantity = #messages
-    
-    if (quantity == 1) then
-        addEventHandler('onClientRender', root, renderMessages)
-    
-    elseif (quantity > displayLines) then
-        table.remove(messages, 1)
-    
-    end
-    
-    return true
-end
-addEvent('doOutputMessage', true)
-addEventHandler('doOutputMessage', root, outputMessage)
-
-function renderMessages()
-    local now = getTickCount()
-    
-    local lineHeight = 20
-    local font = 'default'
-    
-    local marginRight = tonumber(getSetting('drawMarginRight')) or 0.01
-    local marginBottom = tonumber(getSetting('drawMarginBottom')) or 0.035
-    local fadeTime = tonumber(getSetting('fadeTime')) or 1
-    local duration = tonumber(getSetting('duration')) or 10
-    
-    fadeTime = fadeTime * 1000
-    duration = duration * 1000
-    
-    local y = sH - (sH * marginBottom)
-    
-    local padding = 5 -- distance between texts and icon
-    
-    for k, v in ipairs(messages) do
-        local passed = now - v.initTick
-        if (passed <= duration) then
-            local alpha = 255
-            
-            if (passed <= fadeTime) then
-                alpha = 255 * passed / fadeTime
-            
-            elseif (passed >= (duration - fadeTime)) then
-                alpha = 255 - 255 * ((now - duration + fadeTime) - v.initTick) / fadeTime
-            
-            end
-            
-            local victim = v.victim
-            local victimText = victim.text
-            local victimColor = victim.color
-            victimColor = tocolor(victimColor[1], victimColor[2], victimColor[3], alpha)
-            
-            local victimWidth = dxGetTextSize(victimText, 0, 1, 1, font, false, true)
-            
-            local x = sW - (sW * marginRight) - victimWidth
-            
-            dxDrawText(victimText, x + 2, y + 2, x + victimWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-            dxDrawText(victimText, x, y, x + victimWidth, y + lineHeight, victimColor, 1, font, 'center', 'center')
-            
-            local icon = v.icon
-            
-            if icon then
-                local texture = icon.texture
-                local iconWidth = icon.width
-                x = x - padding - iconWidth
-                dxDrawImage(x, y, iconWidth, lineHeight, texture, 0, 0, 0, tocolor(255, 255, 255, alpha))
-            end
-            
-            local killer = v.killer
-            
-            if killer then
-                local killerText = killer.text
-                local killerColor = killer.color
-                killerColor = tocolor(killerColor[1], killerColor[2], killerColor[3], alpha)
-                
-                local killerWidth = dxGetTextSize(killerText, 0, 1, 1, font, false, true)
-                
-                x = x - padding - killerWidth
-                
-                dxDrawText(killerText, x + 2, y + 2, x + killerWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-                dxDrawText(killerText, x, y, x + killerWidth, y + lineHeight, killerColor, 1, font, 'center', 'center')
-            end
-            
-            y = y - lineHeight - padding
-        else
-            table.remove(messages, k)
-            
-            if (#messages == 0) then
-                removeEventHandler('onClientRender', root, renderMessages)
-            end
-        
-        end
-    end
-end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
deleted file mode 100644
index 4111be0fe..000000000
--- a/[gameplay]/killmessages/scripts/client/c.utils.lua
+++ /dev/null
@@ -1,202 +0,0 @@
-local defaultIconsByVehType = {
-    ['Automobile'] = 'icons/cars.png',
-    ['Boat'] = 'icons/boat.png',
-    ['Plane'] = 'icons/plane.png',
-    ['Train'] = 'icons/train.png',
-}
-
-local customIcons = {
-    [0] = "icons/fist.png",
-    [1] = "icons/brassknuckle.png",
-    [2] = "icons/golfclub.png",
-    [3] = "icons/nitestick.png",
-    [4] = "icons/knifecur.png",
-    [5] = "icons/bat.png",
-    [6] = "icons/shovel.png",
-    [7] = "icons/poolcue.png",
-    [8] = "icons/katana.png",
-    [9] = "icons/chnsaw.png",
-    [10] = "icons/gun_dildo1.png",
-    [11] = "icons/gun_dildo2.png",
-    [12] = "icons/gun_vibe1.png",
-    [14] = "icons/flowera.png",
-    [15] = "icons/gun_cane.png",
-    [16] = "icons/grenade.png",
-    [17] = "icons/teargas.png",
-    [18] = "icons/molotov.png",
-    [19] = "icons/explosion.png",
-    [63] = "icons/explosion.png",
-    [22] = "icons/colt45.png",
-    [23] = "icons/Silenced.png",
-    [24] = "icons/desert_eagle.png",
-    [25] = "icons/chromegun.png",
-    [26] = "icons/sawnoff.png",
-    [27] = "icons/shotgspa.png",
-    [28] = "icons/micro_uzi.png",
-    [29] = "icons/mp5lng.png",
-    [30] = "icons/ak47.png",
-    [31] = "icons/m4.png",
-    [32] = "icons/tec9.png",
-    [33] = "icons/cuntgun.png",
-    [34] = "icons/sniper.png",
-    [35] = "icons/rocketla.png",
-    [36] = "icons/heatseek.png",
-    [37] = "icons/flame.png",
-    [38] = "icons/minigun.png",
-    [39] = "icons/satchel.png",
-    [42] = "icons/fireextinguisher.png",
-    [49] = "icons/rammed.png",
-    [50] = "icons/maverick.png",
-    [51] = "icons/explosion.png",
-    [53] = "icons/drowned.png",
-    [54] = "icons/fall.png",
-    [255] = "icons/suicide.png",
-    [256] = "icons/headshot.png",
-    
-    -----------vehicle specific icons, according to their vehicle id---------
-    [431] = "icons/bus.png",
-    [437] = "icons/bus.png",
-    [414] = "icons/boxtruck.png",
-    [456] = "icons/boxtruck.png",
-    [498] = "icons/boxtruck.png",
-    [499] = "icons/boxtruck.png",
-    [609] = "icons/boxtruck.png",
-    [440] = "icons/roundvan.png",
-    [459] = "icons/roundvan.png",
-    [482] = "icons/roundvan.png",
-    [483] = "icons/roundvan.png",
-    [582] = "icons/roundvan.png",
-    [447] = "icons/sparrow.png",
-    [469] = "icons/sparrow.png",
-    [487] = "icons/maverick.png",
-    [488] = "icons/maverick.png",
-    [497] = "icons/maverick.png",
-    [548] = "icons/maverick.png",
-    [563] = "icons/maverick.png",
-    [465] = "icons/rccopter.png",
-    [501] = "icons/rccopter.png",
-    [481] = "icons/bike.png",
-    [509] = "icons/bike.png",
-    [510] = "icons/bike.png",
-    [514] = "icons/bigtruck.png",
-    [515] = "icons/bigtruck.png",
-    [461] = "icons/crotchrocket.png",
-    [521] = "icons/crotchrocket.png",
-    [522] = "icons/crotchrocket.png",
-    [523] = "icons/crotchrocket.png",
-    [581] = "icons/crotchrocket.png",
-    [586] = "icons/crotchrocket.png",
-    [407] = "icons/firetruck.png",
-    [544] = "icons/firetruck.png",
-    [444] = "icons/monstertruck.png",
-    [556] = "icons/monstertruck.png",
-    [557] = "icons/monstertruck.png",
-    [596] = "icons/copcar.png",
-    [597] = "icons/copcar.png",
-    [598] = "icons/copcar.png",
-    [425] = "icons/hunter.png",
-    [406] = "icons/406.png",
-    [408] = "icons/408.png",
-    [416] = "icons/416.png",
-    [417] = "icons/417.png",
-    [423] = "icons/423.png",
-    [424] = "icons/424.png",
-    [427] = "icons/427.png",
-    [428] = "icons/428.png",
-    [429] = "icons/429.png",
-    [432] = "icons/432.png",
-    [433] = "icons/433.png",
-    [434] = "icons/434.png",
-    [441] = "icons/441.png",
-    [443] = "icons/443.png",
-    [448] = "icons/448.png",
-    [457] = "icons/457.png",
-    [460] = "icons/460.png",
-    [462] = "icons/462.png",
-    [463] = "icons/463.png",
-    [464] = "icons/464.png",
-    [468] = "icons/468.png",
-    [470] = "icons/470.png",
-    [471] = "icons/471.png",
-    [480] = "icons/480.png",
-    [485] = "icons/485.png",
-    [486] = "icons/486.png",
-    [508] = "icons/508.png",
-    [511] = "icons/511.png",
-    [512] = "icons/512.png",
-    [513] = "icons/513.png",
-    [520] = "icons/520.png",
-    [524] = "icons/524.png",
-    [528] = "icons/528.png",
-    [530] = "icons/530.png",
-    [531] = "icons/531.png",
-    [532] = "icons/532.png",
-    [539] = "icons/539.png",
-    [564] = "icons/564.png",
-    [568] = "icons/568.png",
-    [571] = "icons/571.png",
-    [572] = "icons/572.png",
-    [573] = "icons/573.png",
-    [574] = "icons/574.png",
-    [578] = "icons/578.png",
-    [588] = "icons/588.png",
-    [593] = "icons/593.png",
-    [599] = "icons/599.png",
-}
-
-function getMessageIcon(weapon, attacker)
-    local path
-    
-    if weapon then
-        path = customIcons[weapon] or 'icons/generic.png'
-    end
-    
-    local elemType = isElement(attacker) and getElementType(attacker)
-    
-    if (elemType == 'vehicle') then
-        local model = getElementModel(attacker)
-        path = customIcons[model] or defaultIconsByVehType[getVehicleType(attacker)] or 'icons/generic.png'
-    
-    elseif (elemType == 'player') then
-        local vehicle = getPedOccupiedVehicle(attacker)
-        if vehicle then
-            return getMessageIcon(_, vehicle)
-        end
-    end
-    
-    local texture = getTexture(path)
-    
-    if texture then
-        return {
-            texture = texture,
-            width = dxGetMaterialSize(texture)
-        }
-    end
-    
-    return false
-end
-
-local textures = {}
-
-function getTexture(path)
-    if (type(path) ~= 'string') then
-        return false
-    end
-    
-    if (textures[path] ~= nil) then
-        return textures[path]
-    end
-    
-    textures[path] = dxCreateTexture(path)
-    
-    return textures[path]
-end
-
-function removeHex(s)
-    if (type(s) == "string") then
-        while (s ~= s:gsub("#%x%x%x%x%x%x", "")) do
-            s = s:gsub("#%x%x%x%x%x%x", "")
-        end
-    end
-    return s or false
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
deleted file mode 100644
index f60d02a4f..000000000
--- a/[gameplay]/killmessages/scripts/server/s.killmessages.lua
+++ /dev/null
@@ -1,171 +0,0 @@
-addEvent("onPlayerKillMessage")
-
-function createKillMessage(_, killer, weapon, bodypart, stealth)
-    local usedVehicle, killerType
-    local weapon = weapon or 255
-    
-    -- In very rare cases killer isn't nil or false but isn't an element.
-    if killer and (not isElement(killer)) then
-        killer = nil
-    end
-    
-    if killer then
-        killerType = getElementType(killer)
-        
-        -- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
-        if (killerType == 'player') then
-            local veh = getPedOccupiedVehicle(killer)
-            if veh and (getPedWeapon(killer) == 0) then
-                usedVehicle = veh
-            end
-        
-        -- Change the killer into the vehicle controller
-        elseif (killerType == 'vehicle') then
-            usedVehicle = killer
-            local controller = getVehicleController(killer)
-            if controller then
-                killer = controller
-                killerType = getElementType(killer)
-            end
-        
-        end
-    end
-    
-    -- If killed by rocket and was on foot player turn it into their current weapon
-    if (weapon == 19) and ((killerType == 'player') and (not isPedInVehicle(killer))) then
-        weapon = getPedWeapon(killer) or 51
-    end
-    
-    if killer and (killerType == 'player') then
-        -- Suicide?
-        if (source == killer) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        else
-            if triggerEvent("onPlayerKillMessage", source, killer, weapon, bodypart) then
-                eventTriggered(source, killer, weapon, bodypart, usedVehicle)
-            end
-        end
-    else
-        -- Avoid showing deaths caused by explosions, cuz they are client-side
-        if (weapon ~= 63) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        end
-    end
-end
-addEventHandler('onPlayerWasted', root, createKillMessage)
-
-addEvent('outputKillFromClient', true)
-addEventHandler('outputKillFromClient', root, function(killer, veh)
-    if (source ~= client) then
-        return
-    end
-
-    if (not isElement(killer)) then
-        return
-    end
-
-    local killerVehicle = getPedOccupiedVehicle(killer)
-
-    if (killerVehicle ~= veh) then
-        return
-    end
-    
-    -- If the vehicle exploded without suffering damage from enemies
-    if (killer == source) then
-        if triggerEvent("onPlayerKillMessage", source, false, 63) then
-            eventTriggered(source, false, 63)
-        end
-    else
-        if triggerEvent("onPlayerKillMessage", client, killer, 19) then
-            eventTriggered(client, killer, 19, nil, veh)
-        end 
-    end
-end)
-
-function eventTriggered(player, killer, weapon, bodypart, vehicle)
-    outputConsoleMessage(player, killer, vehicle, weapon)
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        weapon = getElementModel(vehicle)
-    end
-    
-    local pR, pG, pB = getPlayerColor(player)
-    local kR, kG, kB = getPlayerColor(killer)
-    
-    outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    
-    return true
-end
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    if (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    return triggerClientEvent(root, 'onClientPlayerKillMessage', player, killer, weapon, pR, pG, pB, kR, kG, kB)
-end
-
-function outputMessage(message, visibleTo, r, g, b, font)
-    if (type(message) ~= "string") and (type(message) ~= "table") then
-        outputDebugString("outputMessage - Bad 'message' argument", 0, 112, 112, 112)
-        return false
-    end
-    if (not isElement(visibleTo)) then
-        outputDebugString("outputMessage - Bad 'visibleTo' argument", 0, 112, 112, 112)
-        return false
-    end
-    return triggerClientEvent(visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font)
-end
-
-function outputConsoleMessage(player, killer, vehicle, weapon)
-    if (get('outputConsole') ~= 'true') then
-        return false
-    end
-    
-    local extra = ''
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        extra = (' (%s)'):format(getVehicleName(vehicle))
-    end
-    
-    local msg
-    if killer then
-        if (player == killer) then
-            msg = ('* %s killed himself.'):format(getPlayerName(player))
-        else
-            msg = ('* %s killed %s.'):format(getPlayerName(killer), getPlayerName(player))
-        end
-        local weaponName = getWeaponNameFromID(weapon)
-        if weaponName then
-            msg = msg .. (' (%s)'):format(weaponName)
-        else
-            msg = msg .. extra
-        end
-    else
-        msg = ('* %s died.%s'):format(getPlayerName(player), extra)
-    end
-    
-    if msg then
-        outputConsole(msg)
-    end
-    
-    return true
-end
-
-function getPlayerColor(player)
-    local r, g, b
-    if isElement(player) then
-        local team = getPlayerTeam(player)
-        if team then
-            r, g, b = getTeamColor(team)
-        else
-            r, g, b = getPlayerNametagColor(player)
-        end
-    end
-    return r, g, b
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.settings.lua b/[gameplay]/killmessages/scripts/server/s.settings.lua
deleted file mode 100644
index 12850cf2c..000000000
--- a/[gameplay]/killmessages/scripts/server/s.settings.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local settings = {}
-
-addEventHandler('onResourceStart', resourceRoot, function()
-    local allSettings = {'displayLines', 'drawMarginRight', 'drawMarginBottom', 'fadeTime', 'duration', 'outputConsole'}
-    for k, v in ipairs(allSettings) do
-        settings[v] = get(v)
-    end
-end)
-
-addEvent('requestKillMessagesSettings', true)
-addEventHandler('requestKillMessagesSettings', root, function()
-    triggerClientEvent(client, 'receiveKillMessagesSettings', client, settings)
-end)
-
-addEventHandler('onSettingChange', root, function(name, _, value)
-    name = name:gsub('[%*%#%@](.*)', '%1')-- Remove leading '*','#' or '@'
-    name = name:gsub(getResourceName(resource) .. '%.(.*)', '%1')-- Remove leading 'resName.'
-    
-    if (not settings[name]) then return end
-
-    value = fromJSON(value)
-    settings[name] = value
-    
-    -- send only the changed setting
-    triggerClientEvent(root, 'receiveKillMessagesSettings', root, {
-        [name] = value
-    })
-end)
diff --git a/[gameplay]/killmessages/utils/imagelib.lua b/[gameplay]/killmessages/utils/imagelib.lua
new file mode 100644
index 000000000..fa2d75b24
--- /dev/null
+++ b/[gameplay]/killmessages/utils/imagelib.lua
@@ -0,0 +1,140 @@
+dxImage = {}
+dxImage_mt = { __index = dxImage }
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleImages = {}
+------
+local defaults = {
+	fX							= 0.5,
+	fY							= 0.5,
+	fWidth						= 0,
+	fHeight						= 0,
+	bRelativePosition			= true,
+	bRelativeSize				= true,
+	fRot						= 0,
+	fRotXOff					= 0,
+	fRotYOff					= 0,
+	strPath						= "",
+	tColor 						= {255,255,255,255},
+	bPostGUI 					= false,
+	bVisible 					= true,
+}
+
+function dxImage:create( path, x, y, width, height, relative )
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if ( type(path) ~= "string" ) or ( not tonumber(x) ) or ( not tonumber(y) ) then
+		outputDebugString ( "dxImage:create - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+    local new = {}
+	setmetatable( new, dxImage_mt )
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	new.strPath = path
+	new.fWidth = width or new.fWidth
+	new.fHeight = height or new.fHeight
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+		new.bRelativeSize = relative
+	end
+	visibleImages[new] = true
+	return new
+end
+
+function dxImage:path(path)
+	if type(path) ~= "string" then return self.strPath end
+	self.strPath = path
+	return true
+end
+
+function dxImage:position(x,y,relative)
+	if not tonumber(x) then return self.fX, self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxImage:size(x,y,relative)
+	if not tonumber(x) then return self.fWidth, self.fHeight end
+	self.fWidth = x
+	self.fHeight = y
+	if type(relative) == "boolean" then
+		self.bRelativeSize = relative
+	else
+		self.bRelativeSize = true
+	end
+	return true
+end
+
+function dxImage:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = { r,g,b,a }
+	return true
+end
+
+function dxImage:rotation(rot,xoff,yoff)
+	if not tonumber(rot) then return self.fRot,self.fRotXOff,self.fRotYOff end
+	self.fRot = rot or self.fRot
+	self.fRotXOff = xoff or self.fRotXOff
+	self.fRotYOff = yoff or self.fRotYOff
+	return true
+end
+
+function dxImage:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleImages[self] = true
+	else
+		visibleImages[self] = nil
+	end
+	return true
+end
+
+function dxImage:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxImage:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+addEventHandler ( "onClientRender", getRootElement(),
+	function()
+		for self,_ in pairs(visibleImages) do
+			while true do
+				if self.bDestroyed then
+					visibleImages[self] = nil
+					break
+				end
+				local x,y,width,height = self.fX,self.fY,self.fWidth,self.fHeight
+				if self.bRelativePosition then
+					x = x/g_screenX
+					y = y/g_screenY
+				end
+				if self.bRelativeSize then
+					width = width/g_screenX
+					height = height/g_screenY
+				end
+				dxDrawImage ( x,y, width, height, self.strPath, self.fRot, self.fRotXOff, self.fRotYOff, tocolor(unpack(self.tColor)), self.bPostGUI )
+				break
+			end
+		end
+	end
+)
+
diff --git a/[gameplay]/killmessages/utils/textlib.lua b/[gameplay]/killmessages/utils/textlib.lua
new file mode 100644
index 000000000..e72ea9eac
--- /dev/null
+++ b/[gameplay]/killmessages/utils/textlib.lua
@@ -0,0 +1,335 @@
+dxText = {}
+dxText_mt = { __index = dxText }
+local idAssign,idPrefix = 0,"c"
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleText = {}
+------
+local defaults = {
+	fX						= 0.5,
+	fY						= 0.5,
+	bRelativePosition				= true,
+	strText						= "",
+	bVerticalAlign 					= "center",
+	bHorizontalAlign 				= "center",
+	tColor 						= {255,255,255,255},
+	fScale 						= 1,
+	strFont 					= "default",
+	strType						= "normal",
+	tAttributes					= {},
+	bPostGUI 					= false,
+	bColorCoded					= true,
+	bClip 						= false,
+	bWordWrap	 				= true,
+	bVisible 					= true,
+	tBoundingBox					= false, --If a bounding box is not set, it will not be used.
+	bRelativeBoundingBox				= true,
+}
+
+local validFonts = {
+	default						= true,
+	["default-bold"]				= true,
+	clear						= true,
+	arial						= true,
+	pricedown					= true,
+	bankgothic					= true,
+	diploma						= true,
+	beckett						= true,
+}
+
+local validTypes = {
+	normal						= true,
+	shadow						= true,
+	border						= true,
+	stroke						= true, --Clone of border
+}
+
+local validAlignTypes = {
+	center						= true,
+	left						= true,
+	right						= true,
+}
+
+function dxText:create(text, x, y, relative)
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if type(text) ~= "string" or not tonumber(x) or not tonumber(y) then
+		outputDebugString("dxText:create - Bad argument",0,112,112,112)
+		return false
+	end
+    local new = {}
+	setmetatable(new, dxText_mt)
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	idAssign = idAssign+1
+	new.id = idPrefix..idAssign
+	new.strText = text or new.strText
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+	end
+	visibleText[new] = true
+	return new
+end
+
+function dxText:text(text)
+	if type(text) ~= "string" then return self.strText end
+	self.strText = text
+	return true
+end
+
+function dxText:position(x,y,relative)
+	if not tonumber(x) then return self.fX,self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxText:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = {r,g,b,a}
+	return true
+end
+
+function dxText:scale(scale)
+	if not tonumber(scale) then return self.fScale end
+	self.fScale = scale
+	return true
+end
+
+function dxText:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleText[self] = true
+	else
+		visibleText[self] = nil
+	end
+	return true
+end
+
+function dxText:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxText:extent()
+	if self.bColorCoded then
+		text = string.gsub(self.strText,"#%x%x%x%x%x%x","")
+	else
+		text = self.strText
+	end
+	local extent = dxGetTextWidth(text,self.fScale,self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		extent = extent + self.tAttributes[1]
+	end
+	return extent
+end
+
+function dxText:height()
+	local height = dxGetFontHeight(self.fScale, self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		height = height + self.tAttributes[1]
+	end
+	return height
+end
+
+function dxText:font(font)
+	if not validFonts[font] then return self.strFont end
+	self.strFont = font
+	return true
+end
+
+function dxText:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+function dxText:clip(bool)
+	if type(bool) ~= "boolean" then return self.bClip end
+	self.bClip = bool
+	return true
+end
+
+function dxText:wordWrap(bool)
+	if type(bool) ~= "boolean" then return self.bWordWrap end
+	self.bWordWrap = bool
+	return true
+end
+
+function dxText:type(type,...)
+	if not validTypes[type] then return self.strType,unpack(self.tAttributes) end
+	self.strType = type
+	self.tAttributes = {...}
+	return true
+end
+
+function dxText:align(horzA, vertA)
+	if not validAlignTypes[horzA] then return self.bHorizontalAlign,self.bVerticalAlign end
+	vertA = vertA or self.bVerticalAlign
+	self.bHorizontalAlign,self.bVerticalAlign = horzA,vertA
+	return true
+end
+
+function dxText:boundingBox(left,top,right,bottom,relative)
+	if left == nil then
+		if self.tBoundingBox then
+			return unpack(boundingBox)
+		else
+			return false
+		end
+	elseif tonumber(left) and tonumber(right) and tonumber(top) and tonumber(bottom) then
+		self.tBoundingBox = {left,top,right,bottom}
+		if type(relative) == "boolean" then
+			self.bRelativeBoundingBox = relative
+		else
+			self.bRelativeBoundingBox = true
+		end
+	else
+		self.tBoundingBox = false
+	end
+	return true
+end
+
+function dxCreateCustomDX(text,left,top,right,bottom,color,scale,font,alignX,alignY,clip,wordBreak,postGUI)
+	if not text or not left or not top then
+		return false
+	end
+	local xOffset = nil
+	local fpat = "(.-)#(%x%x%x%x%x%x)"
+	local s,e,cap,col = text:find(fpat,1)
+	local last_end = 1
+	if not alignX then
+		alignX = "left"
+	elseif alignX == "center" then
+		xOffset = -(dxGetTextWidth(string.gsub(text,"#%x%x%x%x%x%x",""),scale,font)/2)
+	else
+		xOffset = 0
+	end
+	while s do
+		if cap == "" and col then
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		if s ~= 1 or cap ~= "" then
+			dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+			xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		last_end = e+1
+		s,e,cap,col = text:find(fpat,last_end)
+	end
+	if last_end <= #text then
+		cap = text:sub(last_end)
+		dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+		xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+	end
+	return true
+end
+
+addEventHandler("onClientRender",getRootElement(),
+	function()
+		for self,_ in pairs(visibleText) do
+			while true do
+				if self.bDestroyed then
+					visibleText[self] = nil
+					break
+				end
+				local l,t,r,b
+				--If we arent using a bounding box
+				if not self.tBoundingBox then
+					--Decide if we use relative or absolute
+					local p_screenX,p_screenY = 1,1
+					if self.bRelativePosition then
+						p_screenX,p_screenY = g_screenX,g_screenY
+					end
+					local fX,fY = (self.fX)*p_screenX,(self.fY)*p_screenY
+					if self.bHorizontalAlign == "left" then
+						l = fX
+						r = fX + g_screenX
+					elseif self.bHorizontalAlign == "right" then
+						l = fX - g_screenX
+						r = fX
+					else
+						l = fX - g_screenX
+						r = fX + g_screenX
+					end
+					if self.bVerticalAlign == "top" then
+						t = fY
+						b = fY + g_screenY
+					elseif self.bVerticalAlign == "bottom" then
+						t = fY - g_screenY
+						b = fY
+					else
+						t = fY - g_screenY
+						b = fY + g_screenY
+					end
+				elseif type(self.tBoundingBox) == "table" then
+					local b_screenX,b_screenY = 1,1
+					if self.bRelativeBoundingBox then
+						b_screenX,b_screenY = g_screenX,g_screenY
+					end
+					l,t,r,b = self.tBoundingBox[1],self.tBoundingBox[2],self.tBoundingBox[3],self.tBoundingBox[4]
+					l = l*b_screenX
+					t = t*b_screenY
+					r = r*b_screenX
+					b = b*b_screenY
+				end
+				local type,att1,att2,att3,att4,att5 = self:type()
+				if type == "border" or type == "stroke" then
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					outlinesize = att1 or 2
+					outlinesize = math.min(self.fScale,outlinesize) --Make sure the outline size isnt thicker than the size of the label
+					if outlinesize > 0 then
+						for offsetX=-outlinesize,outlinesize,outlinesize do
+							for offsetY=-outlinesize,outlinesize,outlinesize do
+								if not offsetX == 0 and offsetY == 0 then
+									dxCreateCustomDX(self.strText,l+offsetX,t+offsetY,r+offsetX,b+offsetY,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+								end
+							end
+						end
+					end
+				elseif type == "shadow" then
+					local shadowDist = att1
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					dxCreateCustomDX(self.strText,l+shadowDist,t+shadowDist,r+shadowDist,b+shadowDist,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				end
+				dxCreateCustomDX(self.strText,l,t,r,b,tocolor(unpack(self.tColor)),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				break
+			end
+		end
+	end
+)
+
+if addEvent("updateDisplays",true) then
+	addEventHandler("updateDisplays",getRootElement(),
+		function(self)
+			setmetatable(self,dxText_mt)
+			--Remove any old ones with the same id
+			for text,_ in pairs(visibleText) do
+				if text.id == self.id then
+					visibleText[text] = nil
+				end
+			end
+			if self.bVisible and not self.bDestroyed then
+				visibleText[self] = true
+			end
+		end
+	)
+end
diff --git a/[gameplay]/speedometer/client.lua b/[gameplay]/speedometer/client.lua
deleted file mode 100644
index 23fb392eb..000000000
--- a/[gameplay]/speedometer/client.lua
+++ /dev/null
@@ -1,82 +0,0 @@
-local screenW, screenH = guiGetScreenSize()
-
-local function dxDrawRelativeImage(startX, startY, width, height, image, rot, rotX, rotY, color, postGUI)
-    dxDrawImage(startX * screenW, startY * screenH, width * screenW, height * screenH, image, rot or 0, rotX or 0, rotY or 0, color, postGUI or false)
-end
-
-function drawSpeedo()
-    local veh = getPedOccupiedVehicle(localPlayer)
-    if not veh then return end
-
-    local velx, vely, velz = getElementVelocity(veh)
-    local speed = (velx ^ 2 + vely ^ 2 + velz ^ 2) ^ (0.5)
-
-    dxDrawRelativeImage(0.66, 0.61, 0.33, 0.49, "images/disc.png")
-    dxDrawRelativeImage(0.7825, 0.61, 0.2, 0.46, "images/needle.png", -146 + (speed * 180))
-end
-
-local isSpeedoShown = false
-function toggleRender(bool)
-    if bool then
-        isSpeedoShown = true
-        addEventHandler("onClientRender", root, drawSpeedo)
-    else
-        isSpeedoShown = false
-        removeEventHandler("onClientRender", root, drawSpeedo)
-    end
-end
-
-function toggleSpeedo()
-    toggleRender(not isSpeedoShown)
-end
-addCommandHandler("speedo", toggleSpeedo)
-
-local function enterHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if not isSpeedoShown then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientPlayerVehicleEnter", localPlayer, enterHandler)
-
-local function exitHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerVehicleExit", localPlayer, exitHandler)
-
-local function destroyHandler()
-    if isSpeedoShown and (getElementType(source) == "vehicle") and (getPedOccupiedVehicle(localPlayer) == source) then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientVehicleExplode", root, destroyHandler)
-addEventHandler("onClientElementDestroy", root, destroyHandler)
-
--- If player vehicle changes in abnormal way (e.g drives into a vehicle pick-up)
-local function onVehicleTypeChange(oldModel, newModel)
-    if (getElementType(source) ~= "vehicle") then return end
-
-    local newType = getVehicleType(newModel)
-
-    if isSpeedoShown and (newType == "Plane") or (newType == "Helicopter") then
-        toggleRender(false)
-    elseif not isSpeedoShown and (newType ~= "Plane") and (newType ~= "Helicopter") then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientElementModelChange", root, onVehicleTypeChange)
-
--- Dying in vehicle, so not triggering onClientPlayerVehicleExit
-function integrityCheck()
-    if getPedOccupiedVehicle(localPlayer) and isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerWasted", localPlayer, integrityCheck)
diff --git a/[gameplay]/speedometer/images/disc.png b/[gameplay]/speedometer/images/disc.png
deleted file mode 100644
index 8d80f6a937d4ed6346ebc1328dc386d19bce79dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10990
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

diff --git a/[gameplay]/speedometer/images/needle.png b/[gameplay]/speedometer/images/needle.png
deleted file mode 100644
index ce2be4d1f957b903a9ced3d9cdabe2370f614d0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1560
zcmchX`&&|X9LK@RdJ->Zg@Nfz$`oCXgi}FttYDfmFU!*K5_!YC%wiT^LT6cUTweA}
z%?#1Xlr$|9FBCH@)5=n(l!#_G%b{XEmZC$^ed$lw5BvUd&Uw!FeBPh;>+?R}Y=2)*
z!}VtC5eS5#*IwFw1Of?ek%)Er;1c@FbtVF_=Cv1X_kk3o>OK;@TaDPV5_AfApw9qo
z`0s0rLb7VWb<#1XUG8=G4UPP}9@fN(&vLy>dH{zArnZS|jGkRfQcPeDx&}A31+&a}
zkvANN?er5)(<NAo7wFiqK~q6oU5Q!5#%y$gbpqKWbEDpB5(24LYPEpZNF7q{b>uHr
z%fx?hVOwv9T!});%i@o3fIf&%Ux^`Uzj1US+TyxcHWk7{oHAL6GAIuwwPoFE;J~Bl
z3H!P50x{Q<thRe<Okm@Sh_r_-;<41jd}iv|ur3H{&nb<XL7OHMu9`!vwUVBC&9@@?
z&dVsM&u7jgzbt%iUBOASE)yuIFX>`6Ie0DRmaGy5vD~v9lGxlPcU3?hEI#+Pg`O&?
z<YNN4@b!R^_K(I#TOTiNNe7>uG~<!)wRJ*O4lxBlnwgeI6t!tE8`hvRA(p*XNOEZ(
zno{}a!3+3`TOy6o(+U)xN_$@Y_1nM9CmjeY7Wze2xU{3YdS=MMJW|FEcTjWHthQvF
zJn%6R6$YNR<}77Z&eJ8ut-#Hx!Fi+jW4Adr6*}#^Y)7?a;L3w|YG?&8)Llg(k{=C?
znmb%a<iMM;X?Y6rz$5Y}Yn?wz)B@VHx1OE3*5L|ZCKmL?UO4>bWiHB|N;@H&BaDg~
zx0j4~NWYlKCp3M(NUv(?6QZD*pEWC8&vw-@h^#e+(J&l>U3QD<t^eexw$mBO=vl@N
zyoyRaYoY7NOgi>hZ&J9RWH#IC>VDp6Gj>#4R=~ItgvCYJXL(9(5tflxcNYU0Uk^rf
z^yz`t9Q1yK2Td^XNELE<?%0K7VvRY3M;H?_%I3V7EkrP?o!?J~SM|y=^5he<pzO<M
zZ^n(h&ljmTl-A1pftPbrmh51yIAC&<3S>i^pKd9;6#2oq8ITV38ci-ebS?eThj{D(
zur>Qt@juEvmF|l0u{aGt-%LFITZciB`u?Tt#4nht?@W&P-Y91e4bny4Slrd!@)TY+
zGkP>sI1uLKR%nI0t2oiftf9wBAHO3|f#)FEd}#MRQGeO{C>P!IT5fA|jh=S@xEP-I
zd>oJ-Y+v?sZR%kUrJT(I6O@K8ISx(VCO&`x0{P(VY8!qdBO+t792n!2-;W*RH<mLs
zc4<H<k@=oc%jxPYFt=A49H*%wrUB{bDNj{hKsJ1yVVuh=A@yob)vBUs0B+`T<UW_!
zmE5HEgrB%DCPHc5;~ZOlM6-DoOqi2Dy!@o!vzGFZCg9>|G`agOQt!~;$&|=*+u9%&
zI+waHqq7qm=&7g!;kRhzU5xAhu0t{1;Dg1z3)B~0boW~%$QVLDAmmnYtUj$wZAoHb
z4I$Qyq;LY+`6@<B4PGQ4+Ka?M#iH>R^Z14tXZv|V4akp=W_x@UzesIRI?`nd0u;_=
zjMvY0tW&DyP{6b*O3vZE_$(O8XD!{Bg@G}_%|&d8^0{W|;|?JRa$;K9yNAEJHBprH
z%>^TXunXaMp#sco(#e~0L;^4xabHK=p~q5&!`UzrC_rrKlQ>a-M#C7*YU^c)g%6X~
zlq@i!E9i=pKbcEk+3DIo(<yTb*km{5XIB^IBmq%ymMx+J3~I~Yzx2@&6zAM@!=&d>
zM!J_>`GwZtCp}@ajPF|+&RV5Acfr{z_wYaX|1LBpf|Dqxss*|RyngVd-Q08J%)fHD
Bx*-4n

diff --git a/[gameplay]/speedometer/meta.xml b/[gameplay]/speedometer/meta.xml
deleted file mode 100644
index c868b138f..000000000
--- a/[gameplay]/speedometer/meta.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<meta>
-	<info author="MTA contributors (github.com/multitheftauto/mtasa-resources)" version="1.0" type="script" description="Basic speedometer" />
-	<file src="images/disc.png" />
-	<file src="images/needle.png" />
-	<script src="client.lua" type="client" />
-</meta>
\ No newline at end of file

From 67b37554f753c0e5c65655639856998f2d8d455a Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:33:25 -0300
Subject: [PATCH 18/26] Revert "Delete aaa.js"

This reverts commit 1cea5eceb137ec6cf234c5be4905be644abc6b3d.
---
 [gameplay]/killmessages/icons/aaa.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 [gameplay]/killmessages/icons/aaa.js

diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
new file mode 100644
index 000000000..ac3f974a0
--- /dev/null
+++ b/[gameplay]/killmessages/icons/aaa.js
@@ -0,0 +1,9 @@
+const fs = require('fs')
+
+const path = 'icons'
+
+fs.readdir('./' + path, 'ascii', (_, files) => {
+    for (let name of files.filter(a => a != 'index.js')) {
+        console.log(`	<file src='${path}/${name}'/>`)
+    }
+})

From 9b4451ed39e3a7086e1c5d393691d25fe44bc6dd Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 07:36:29 -0300
Subject: [PATCH 19/26] Revert "refactor killmessages"

This reverts commit af5decbbcd950c856a62c54fe3b59bd403f07b46.
---
 [gameplay]/killmessages/icons/aaa.js | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 [gameplay]/killmessages/icons/aaa.js

diff --git a/[gameplay]/killmessages/icons/aaa.js b/[gameplay]/killmessages/icons/aaa.js
deleted file mode 100644
index ac3f974a0..000000000
--- a/[gameplay]/killmessages/icons/aaa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const fs = require('fs')
-
-const path = 'icons'
-
-fs.readdir('./' + path, 'ascii', (_, files) => {
-    for (let name of files.filter(a => a != 'index.js')) {
-        console.log(`	<file src='${path}/${name}'/>`)
-    }
-})

From 3de44da8e3a520b2941d5ee10a7af621d99c6a99 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 08:00:53 -0300
Subject: [PATCH 20/26] Revert "Revert "Merge branch 'master' of
 https://github.com/iDannz1/mtasa-resources into admin-replace-give-admin""

This reverts commit 2078cc802b4da92aa59e83cbca9fcecbecf5b771.
---
 [admin]/admin/client/gui/admin_main.lua       |   4 +-
 [gameplay]/killmessages/definitions.lua       | 519 ------------------
 [gameplay]/killmessages/gui.lua               | 271 ---------
 .../killmessages/killmessages_client.lua      |  55 --
 .../killmessages/killmessages_server.lua      | 192 -------
 [gameplay]/killmessages/meta.xml              | 257 +++++----
 .../scripts/client/c.killmessages.lua         | 160 ++++++
 .../scripts/client/c.settings.lua             |  16 +
 .../killmessages/scripts/client/c.ui.lua      | 112 ++++
 .../killmessages/scripts/client/c.utils.lua   | 202 +++++++
 .../scripts/server/s.killmessages.lua         | 171 ++++++
 .../scripts/server/s.settings.lua             |  28 +
 [gameplay]/killmessages/utils/imagelib.lua    | 140 -----
 [gameplay]/killmessages/utils/textlib.lua     | 335 -----------
 [gameplay]/speedometer/client.lua             |  82 +++
 [gameplay]/speedometer/images/disc.png        | Bin 0 -> 10990 bytes
 [gameplay]/speedometer/images/needle.png      | Bin 0 -> 1560 bytes
 [gameplay]/speedometer/meta.xml               |   6 +
 18 files changed, 914 insertions(+), 1636 deletions(-)
 delete mode 100644 [gameplay]/killmessages/definitions.lua
 delete mode 100644 [gameplay]/killmessages/gui.lua
 delete mode 100644 [gameplay]/killmessages/killmessages_client.lua
 delete mode 100644 [gameplay]/killmessages/killmessages_server.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.killmessages.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.settings.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.ui.lua
 create mode 100644 [gameplay]/killmessages/scripts/client/c.utils.lua
 create mode 100644 [gameplay]/killmessages/scripts/server/s.killmessages.lua
 create mode 100644 [gameplay]/killmessages/scripts/server/s.settings.lua
 delete mode 100644 [gameplay]/killmessages/utils/imagelib.lua
 delete mode 100644 [gameplay]/killmessages/utils/textlib.lua
 create mode 100644 [gameplay]/speedometer/client.lua
 create mode 100644 [gameplay]/speedometer/images/disc.png
 create mode 100644 [gameplay]/speedometer/images/needle.png
 create mode 100644 [gameplay]/speedometer/meta.xml

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 035f00213..7dc143a96 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -1391,7 +1391,7 @@ end
 
 -- anon admin
 function isAnonAdmin()
-	return guiCheckBoxGetSelected ( aTab1.AnonAdmin )
+	return (isElement(aTab1.AnonAdmin) and guiCheckBoxGetSelected ( aTab1.AnonAdmin )) or getElementData(localPlayer, 'AnonAdmin')
 end
 
 function setAnonAdmin( bOn )
@@ -1402,7 +1402,7 @@ end
 
 -- sensitive data
 function isSensitiveDataHidden()
-	return guiCheckBoxGetSelected(aTab1.HideSensitiveData)
+	return isElement(aTab1.HideSensitiveData) and guiCheckBoxGetSelected(aTab1.HideSensitiveData)
 end
 
 function setHideSensitiveData( bOn )
diff --git a/[gameplay]/killmessages/definitions.lua b/[gameplay]/killmessages/definitions.lua
deleted file mode 100644
index 932eaac32..000000000
--- a/[gameplay]/killmessages/definitions.lua
+++ /dev/null
@@ -1,519 +0,0 @@
-iconWidths = {
-[0] = 21,
-[1] = 15,
-[2] = 97,
-[3] = 55,
-[4] = 83,
-[5] = 72,
-[6] = 55,
-[7] = 138,
-[8] = 104,
-[9] = 59,
-[10] =40,
-[11] =31,
-[12] =41,
-[14] =10,
-[15] =71,
-[16] =13,
-[17] =10,
-[18] =4,
-[19] =17,
-[22] =35,
-[23] =50,
-[24] =37,
-[25] =75,
-[26] =67,
-[27] =66,
-[28] =17,
-[29] =35,
-[30] =70,
-[31] =71,
-[32] =22,
-[33] =75,
-[34] =86,
-[35] =74,
-[36] =75,
-[37] =19,
-[38] =54,
-[39] =8,
-[42] = 14,
-[49] = 86,
-[50] = 34,
-[51] = 17,
-[53] = 22,
-[54] = 15,
-[255] = 17,
-[256] = 20,
-[406] = 42,
-[408] = 47,
-[416] = 46,
-[417] = 33,
-[423] = 31,
-[424] = 39,
-[427] = 52,
-[428] = 43,
-[429] = 51,
-[432] = 61,
-[433] = 56,
-[434] = 45,
-[441] = 50,
-[443] = 49,
-[448] = 31,
-[457] = 26,
-[460] = 50,
-[462] = 27,
-[463] = 37,
-[464] = 43,
-[468] = 36,
-[470] = 49,
-[471] = 30,
-[480] = 52,
-[485] = 45,
-[486] = 39,
-[508] = 45,
-[511] = 49,
-[512] = 37,
-[513] = 48,
-[520] = 61,
-[524] = 41,
-[528] = 49,
-[530] = 27,
-[531] = 40,
-[532] = 42,
-[539] = 46,
-[564] = 48,
-[568] = 47,
-[571] = 41,
-[572] = 32,
-[573] = 37,
-[574] = 30,
-[578] = 37,
-[588] = 35,
-[593] = 40,
-[599] = 43,
-[601] = 48,
---
-[400]=36,
-[401]=36,
-[402]=36,
-[403]=36,
-[404]=36,
-[405]=36,
-[409]=36,
-[410]=36,
-[411]=36,
-[412]=36,
-[413]=36,
-[415]=36,
-[418]=36,
-[419]=36,
-[420]=36,
-[421]=36,
-[422]=36,
-[426]=36,
-[435]=36,
-[436]=36,
-[438]=36,
-[439]=36,
-[445]=36,
-[449]=36,
-[450]=36,
-[451]=36,
-[458]=36,
-[466]=36,
-[467]=36,
-[474]=36,
-[475]=36,
-[477]=36,
-[478]=36,
-[479]=36,
-[489]=36,
-[490]=36,
-[491]=36,
-[492]=36,
-[494]=36,
-[495]=36,
-[496]=36,
-[500]=36,
-[503]=36,
-[504]=36,
-[505]=36,
-[506]=36,
-[507]=36,
-[516]=36,
-[517]=36,
-[518]=36,
-[525]=36,
-[526]=36,
-[527]=36,
-[529]=36,
-[533]=36,
-[534]=36,
-[535]=36,
-[536]=36,
-[540]=36,
-[541]=36,
-[542]=36,
-[543]=36,
-[545]=36,
-[546]=36,
-[547]=36,
-[549]=36,
-[550]=36,
-[551]=36,
-[552]=36,
-[554]=36,
-[555]=36,
-[558]=36,
-[559]=36,
-[560]=36,
-[561]=36,
-[562]=36,
-[565]=36,
-[566]=36,
-[567]=36,
-[575]=36,
-[576]=36,
-[579]=36,
-[580]=36,
-[583]=36,
-[584]=36,
-[585]=36,
-[587]=36,
-[589]=36,
-[591]=36,
-[594]=36,
-[600]=36,
-[602]=36,
-[603]=36,
-[604]=36,
-[605]=36,
-[606]=36,
-[607]=36,
-[608]=36,
-[610]=36,
-[611]=36,
---
-[431]=44,
-[437]=44,
-[430]=61,
-[446]=61,
-[452]=61,
-[453]=61,
-[454]=61,
-[472]=61,
-[473]=61,
-[484]=61,
-[493]=61,
-[595]=61,
-[414]=37,
-[456]=37,
-[498]=37,
-[499]=37,
-[609]=37,
-[440]=46,
-[459]=46,
-[482]=46,
-[483]=46,
-[582]=46,
-[447]=39,
-[469]=39,
-[487]=42,
-[488]=42,
-[497]=42,
-[548]=42,
-[563]=42,
-[465]=32,
-[501]=32,
-[481]=30,
-[509]=30,
-[510]=30,
-[514]=46,
-[515]=46,
-[461]=35,
-[521]=35,
-[522]=35,
-[523]=35,
-[581]=35,
-[586]=35,
-[537]=41,
-[569]=41,
-[570]=41,
-[590]=41,
-[407]=55,
-[544]=55,
-[519]=44,
-[553]=44,
-[577]=44,
-[592]=44,
-[444]=39,
-[556]=39,
-[557]=39,
-[596]=48,
-[597]=48,
-[598]=48,
-[425]=34,
---
-[999] = 20
-}
---49 rammed, 50 heli blades, 53 drowning,  54 fall, 31 seaskimmer/rustler/rcbaron, hunter 38, death in vehicle no id, 52 predator
---kill in vehicle, warp to driver
-
-icons = {
-[0] =  "icons/fist.png",
-[1] =  "icons/brassknuckle.png",
-[2] =  "icons/golfclub.png",
-[3] =  "icons/nitestick.png",
-[4] =  "icons/knifecur.png",
-[5] =  "icons/bat.png",
-[6] =  "icons/shovel.png",
-[7] =  "icons/poolcue.png",
-[8] =  "icons/katana.png",
-[9] =  "icons/chnsaw.png",
-[10] =  "icons/gun_dildo1.png",
-[11] =  "icons/gun_dildo2.png",
-[12] =  "icons/gun_vibe1.png",
-[14] =  "icons/flowera.png",
-[15] =  "icons/gun_cane.png",
-[16] =  "icons/grenade.png",
-[17] =  "icons/teargas.png",
-[18] =  "icons/molotov.png",
-[19] =  "icons/explosion.png",
-[22] =  "icons/colt45.png",
-[23] =  "icons/Silenced.png",
-[24] =  "icons/desert_eagle.png",
-[25] =  "icons/chromegun.png",
-[26] =  "icons/sawnoff.png",
-[27] =  "icons/shotgspa.png",
-[28] =  "icons/micro_uzi.png",
-[29] =  "icons/mp5lng.png",
-[30] =  "icons/ak47.png",
-[31] =  "icons/m4.png",
-[32] =  "icons/tec9.png",
-[33] =  "icons/cuntgun.png",
-[34] =  "icons/sniper.png",
-[35] =  "icons/rocketla.png",
-[36] =  "icons/heatseek.png",
-[37] =  "icons/flame.png",
-[38] =  "icons/minigun.png",
-[39] =  "icons/satchel.png",
-[42] =  "icons/fireextinguisher.png",
-[49] =  "icons/rammed.png",
-[50] =  "icons/maverick.png",
-[51] =  "icons/explosion.png",
-[53] =  "icons/drowned.png",
-[54] =  "icons/fall.png",
-[255] = "icons/suicide.png",
-[256] = "icons/headshot.png",
------------vehicle specific icons, according to their vehicle id---------
-[400]="icons/cars.png",
-[401]="icons/cars.png",
-[402]="icons/cars.png",
-[403]="icons/cars.png",
-[404]="icons/cars.png",
-[405]="icons/cars.png",
-[409]="icons/cars.png",
-[410]="icons/cars.png",
-[411]="icons/cars.png",
-[412]="icons/cars.png",
-[413]="icons/cars.png",
-[415]="icons/cars.png",
-[418]="icons/cars.png",
-[419]="icons/cars.png",
-[420]="icons/cars.png",
-[421]="icons/cars.png",
-[422]="icons/cars.png",
-[426]="icons/cars.png",
-[435]="icons/cars.png",
-[436]="icons/cars.png",
-[438]="icons/cars.png",
-[439]="icons/cars.png",
-[445]="icons/cars.png",
-[449]="icons/cars.png",
-[450]="icons/cars.png",
-[451]="icons/cars.png",
-[458]="icons/cars.png",
-[466]="icons/cars.png",
-[467]="icons/cars.png",
-[474]="icons/cars.png",
-[475]="icons/cars.png",
-[477]="icons/cars.png",
-[478]="icons/cars.png",
-[479]="icons/cars.png",
-[489]="icons/cars.png",
-[490]="icons/cars.png",
-[491]="icons/cars.png",
-[492]="icons/cars.png",
-[494]="icons/cars.png",
-[495]="icons/cars.png",
-[496]="icons/cars.png",
-[500]="icons/cars.png",
-[503]="icons/cars.png",
-[504]="icons/cars.png",
-[505]="icons/cars.png",
-[506]="icons/cars.png",
-[507]="icons/cars.png",
-[516]="icons/cars.png",
-[517]="icons/cars.png",
-[518]="icons/cars.png",
-[525]="icons/cars.png",
-[526]="icons/cars.png",
-[527]="icons/cars.png",
-[529]="icons/cars.png",
-[533]="icons/cars.png",
-[534]="icons/cars.png",
-[535]="icons/cars.png",
-[536]="icons/cars.png",
-[540]="icons/cars.png",
-[541]="icons/cars.png",
-[542]="icons/cars.png",
-[543]="icons/cars.png",
-[545]="icons/cars.png",
-[546]="icons/cars.png",
-[547]="icons/cars.png",
-[549]="icons/cars.png",
-[550]="icons/cars.png",
-[551]="icons/cars.png",
-[552]="icons/cars.png",
-[554]="icons/cars.png",
-[555]="icons/cars.png",
-[558]="icons/cars.png",
-[559]="icons/cars.png",
-[560]="icons/cars.png",
-[561]="icons/cars.png",
-[562]="icons/cars.png",
-[565]="icons/cars.png",
-[566]="icons/cars.png",
-[567]="icons/cars.png",
-[575]="icons/cars.png",
-[576]="icons/cars.png",
-[579]="icons/cars.png",
-[580]="icons/cars.png",
-[583]="icons/cars.png",
-[584]="icons/cars.png",
-[585]="icons/cars.png",
-[587]="icons/cars.png",
-[589]="icons/cars.png",
-[591]="icons/cars.png",
-[594]="icons/cars.png",
-[600]="icons/cars.png",
-[602]="icons/cars.png",
-[603]="icons/cars.png",
-[604]="icons/cars.png",
-[605]="icons/cars.png",
-[606]="icons/cars.png",
-[607]="icons/cars.png",
-[608]="icons/cars.png",
-[610]="icons/cars.png",
-[611]="icons/cars.png",
---
-[431]="icons/bus.png",
-[437]="icons/bus.png",
-[430]="icons/boat.png",
-[446]="icons/boat.png",
-[452]="icons/boat.png",
-[453]="icons/boat.png",
-[454]="icons/boat.png",
-[472]="icons/boat.png",
-[473]="icons/boat.png",
-[484]="icons/boat.png",
-[493]="icons/boat.png",
-[595]="icons/boat.png",
-[414]="icons/boxtruck.png",
-[456]="icons/boxtruck.png",
-[498]="icons/boxtruck.png",
-[499]="icons/boxtruck.png",
-[609]="icons/boxtruck.png",
-[440]="icons/roundvan.png",
-[459]="icons/roundvan.png",
-[482]="icons/roundvan.png",
-[483]="icons/roundvan.png",
-[582]="icons/roundvan.png",
-[447]="icons/sparrow.png",
-[469]="icons/sparrow.png",
-[487]="icons/maverick.png",
-[488]="icons/maverick.png",
-[497]="icons/maverick.png",
-[548]="icons/maverick.png",
-[563]="icons/maverick.png",
-[465]="icons/rccopter.png",
-[501]="icons/rccopter.png",
-[481]="icons/bike.png",
-[509]="icons/bike.png",
-[510]="icons/bike.png",
-[514]="icons/bigtruck.png",
-[515]="icons/bigtruck.png",
-[461]="icons/crotchrocket.png",
-[521]="icons/crotchrocket.png",
-[522]="icons/crotchrocket.png",
-[523]="icons/crotchrocket.png",
-[581]="icons/crotchrocket.png",
-[586]="icons/crotchrocket.png",
-[537]="icons/train.png",
-[569]="icons/train.png",
-[570]="icons/train.png",
-[590]="icons/train.png",
-[407]="icons/firetruck.png",
-[544]="icons/firetruck.png",
-[519]="icons/plane.png",
-[553]="icons/plane.png",
-[577]="icons/plane.png",
-[592]="icons/plane.png",
-[444]="icons/monstertruck.png",
-[556]="icons/monstertruck.png",
-[557]="icons/monstertruck.png",
-[596]="icons/copcar.png",
-[597]="icons/copcar.png",
-[598]="icons/copcar.png",
-[425]="icons/hunter.png",
---
-[406]="icons/406.png",
-[408]="icons/408.png",
-[416]="icons/416.png",
-[417]="icons/417.png",
-[423]="icons/423.png",
-[424]="icons/424.png",
-[427]="icons/427.png",
-[428]="icons/428.png",
-[429]="icons/429.png",
-[432]="icons/432.png",
-[433]="icons/433.png",
-[434]="icons/434.png",
-[441]="icons/441.png",
-[443]="icons/443.png",
-[448]="icons/448.png",
-[457]="icons/457.png",
-[460]="icons/460.png",
-[462]="icons/462.png",
-[463]="icons/463.png",
-[464]="icons/464.png",
-[468]="icons/468.png",
-[470]="icons/470.png",
-[471]="icons/471.png",
-[480]="icons/480.png",
-[485]="icons/485.png",
-[486]="icons/486.png",
-[508]="icons/508.png",
-[511]="icons/511.png",
-[512]="icons/512.png",
-[513]="icons/513.png",
-[520]="icons/520.png",
-[524]="icons/524.png",
-[528]="icons/528.png",
-[530]="icons/530.png",
-[531]="icons/531.png",
-[532]="icons/532.png",
-[539]="icons/539.png",
-[564]="icons/564.png",
-[568]="icons/568.png",
-[571]="icons/571.png",
-[572]="icons/572.png",
-[573]="icons/573.png",
-[574]="icons/574.png",
-[578]="icons/578.png",
-[588]="icons/588.png",
-[593]="icons/593.png",
-[599]="icons/599.png",
---
-[999]="icons/generic.png"
-}
diff --git a/[gameplay]/killmessages/gui.lua b/[gameplay]/killmessages/gui.lua
deleted file mode 100644
index 96b00722a..000000000
--- a/[gameplay]/killmessages/gui.lua
+++ /dev/null
@@ -1,271 +0,0 @@
-local customKills = {}
-local config = {
-["lines"] = 5,
-["startY"] = 0.35,
-["textHeight"] = 16,
-["iconPosOffY"] = -10,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local default = {
-["lines"] = 5,
-["startY"] = 0.25,
-["textHeight"] = 16,
-["iconPosOffY"] = -10,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local endTime
-local screenX,screenY = guiGetScreenSize ()
-local contentMessages = {}
-local fadingLines = {}
----
-local iconOrder = {}
-
-
-function setupTextOnStart ( resource )
-	if resource ~= getThisResource() then return end
-	triggerServerEvent ( "onClientKillmessagesLoaded", getLocalPlayer() )
-end
-addEventHandler ( "onClientResourceStart", getRootElement(), setupTextOnStart )
-
-addEvent ("doSetKillMessageStyle",true)
-function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
-	if ( not startX ) then startX = default.startX end
-	if ( not startY ) then startY = default.startY end
-	if ( not align ) then align = default.align end
-	if ( not lines ) then lines = default.lines end
-	if ( not fadeStart ) then fadeStart = default.startFade end
-	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
-	config.startX = startX
-	config.startY = startY
-	config.align = align
-	config.lines = lines
-	config.startFade = fadeStart
-	config.fadeTime = fadeAnimTime
-	if #contentMessages ~= 0 then
-		for i=1,config.lines do
-			if contentMessages[i] then
-				destroyLine ( i )
-			end
-		end
-	end
-	fadingLines = {}
-	killMessages = {}
-	if ( config.startY < 0 ) then
-		config.startY = screenY - math.abs(config.startY*screenY) - (config.iconHeight*config.lines)
-		config.startY = config.startY/screenY
-	end
-	createKillMessageGUI()
-	return true
-end
-addEventHandler ( "doSetKillMessageStyle",getRootElement(),setKillMessageStyle)
-
-function createKillMessageGUI()
-	local gap = config.iconHeight - config.textHeight
-	gap = gap/2
-	for i=1,config.lines do
-		local y = config.startY*screenY + (config.iconHeight*(i-1))
-		y = y + gap
-		contentMessages[i] = { dxText:create("",0,y) }
-	end
-	endTime = config.fadeTime + config.startFade
-end
-
-function shiftUpGUI()
-	local i = 1
-	for i=config.lines,2,-1 do
-		local y = config.startY*screenY + (config.iconHeight*(i-1)) + (config.iconHeight - config.textHeight)/2
-		local targetY = config.startY*screenY + (config.iconHeight*(i-2)) + (config.iconHeight - config.textHeight)/2
-		if contentMessages[i] then
-			for k,part in ipairs(contentMessages[i]) do
-				local x,realY = getWidgetPosition(part)
-
-				local diffY = realY - y
-				setWidgetPosition(part,x,targetY + diffY)
-			end
-		end
-	end
-	for i=1,config.lines-1 do
-		---shift up the alpha too
-		local tick = fadingLines[i+1]
-		fadingLines[i] = tick
-		fadingLines[i+1] = nil
-	end
-end
-
-addEvent ( "doOutputMessage", true )
-function outputMessage ( message, r, g, b, font )
-	if type(message) ~= "string" and type(message) ~= "table" then
-		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
-		return false
-	end
-	if type(font) ~= "string" then
-		font = "default"
-	end
-	r = tonumber(r) or 255
-	g = tonumber(g) or 255
-	b = tonumber(b) or 255
-	---shift everything up
-	shiftUpGUI()
-	--Delete the first line
-	destroyLine (1)
-	table.remove ( contentMessages, 1 )
-	if type(message) == "string" then
-		message = {message}
-	end
-	local y = config.startY*screenY + (config.iconHeight*(config.lines-1)) + (config.iconHeight - config.textHeight)/2
-	local startX = config.startX
-	if startX < 1 and startX > -1 then --auto calculate whether its relative or absolute
-		startX = screenX/startX --make it relative
-	end
-	if startX < 0 then
-		startX = screenX + startX
-	end
-
-	for i,part in ipairs(message) do
-		if type(part) == "table" and part[1] == "image" then
-			if not part.resource and not part.resourceName then
-				part.resource = sourceResource
-			end
-		end
-	end
-
-	drawLine ( message, startX, y, config.align, config.lines, r, g, b, font, 1 )
-	fadeLine ( config.lines )
-end
-addEventHandler ( "doOutputMessage", getRootElement(), outputMessage )
-
-function drawLine ( message, x,y, align, line, r, g, b, font, scale )
-	--First draw it and work out the width
-	local width = 0
-	contentMessages[line] = {}
-	for i,part in ipairs(message) do
-		if type(part) == "string" then
-			local text = dxText:create ( part, width, y, false )
-			text:font ( font )
-			text:scale ( scale )
-			text:type("shadow",1)
-			text:align"left"
-			text:color ( r,g,b )
-			table.insert ( contentMessages[line], text )
-			width = width + text:extent()
-		elseif part[1] == "icon" then
-			local iconWidth = part.width or iconWidths[part.id or -1] or iconWidths[255]
-			local iconHeight = part.height or config.iconHeight
-			local image = dxImage:create ( icons[part.id or 0] or icons[255], width, y + (part.posOffY or config.iconPosOffY), iconWidth, iconHeight, false )
-			image:color ( part.r or 255, part.g or 255, part.b or 255 )
-			image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
-			width = width + iconWidth
-			table.insert ( contentMessages[line], image )
-		elseif part[1] == "image" then
-			if part.width and part.path then
-				if part.resourceName then
-					part.resource = getResourceFromName(tostring(part.resourceName)) or part.resource
-				end
-				local image = dxImage:create ( ":"..getResourceName(part.resource).."/"..part.path, width, y + (part.posOffY or config.iconPosOffY), part.width, part.height or config.iconHeight, false )
-				image:color ( part.r or 255, part.g or 255, part.b or 255 )
-				image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
-				width = width + part.width
-				table.insert ( contentMessages[line], image )
-			end
-		elseif part[1] == "color" or part[1] == "colour" then
-			r = part.r or r
-			g = part.g or g
-			b = part.b or b
-		elseif part[1] == "padding" then
-			width = width + part.width or 0
-		end
-		contentMessages[line].scale = scale
-	end
-	--Now reposition everything properly
-	if align == "center" or align == "centre" then
-		x = x - width/2
-	elseif align == "right" then
-		x = x - width
-	end
-	for i,widget in ipairs(contentMessages[line]) do
-		local wx,wy = getWidgetPosition ( widget )
-		setWidgetPosition ( widget, x + wx, wy )
-	end
-	return true
-end
-
-function fadeLine ( line )
-	setLineAlpha ( line, 1 )
-	fadingLines[line] = getTickCount()
-end
------
-addEventHandler ( "onClientRender",getRootElement(),
-function()
-	for line,originalTick in pairs(fadingLines) do
-		local tickDifference = getTickCount() - originalTick
-		if tickDifference > endTime then
-			destroyLine ( line )
-			setLineAlpha ( line, 1 )
-			fadingLines[line] = nil
-		elseif tickDifference >  config.startFade then
-			local fadeTimeDifference = tickDifference - config.startFade
-			--calculate the alpha
-			local newAlpha = 1 - fadeTimeDifference/config.fadeTime
-			--Set all the alphas
-			setLineAlpha ( line, newAlpha )
-		end
-	end
-end )
-
-function setLineAlpha ( line, alpha )
-	for i,part in ipairs(contentMessages[line]) do
-		setWidgetAlpha ( part, alpha )
-	end
-end
-
-function destroyLine ( line )
-	for k,part in ipairs(contentMessages[line]) do
-		destroyWidget(part)
-	end
-	contentMessages[line] = {}
-end
-
-function destroyWidget ( widget )
-	if isElement(widget) then
-		destroyElement ( widget )
-	elseif type(widget) == "table" and widget.destroy then
-		widget:destroy()
-	end
-end
-
-function getWidgetPosition ( widget )
-	if isElement(widget) then
-		return guiGetPosition ( widget, false )
-	elseif type(widget) == "table" and widget.position then
-		return widget:position()
-	end
-end
-
-function setWidgetPosition ( widget, x, y )
-	if isElement(widget) then
-		return guiSetPosition ( widget, x, y, false )
-	elseif type(widget) == "table" and widget.position then
-		return widget:position(x,y,false)
-	end
-end
-
-function setWidgetAlpha ( widget, alpha )
-	if isElement(widget) then
-		guiSetAlpha ( widget, alpha )
-	elseif type(widget) == "table" and widget.color then
-		local r,g,b = widget:color()
-		widget:color(r,g,b,alpha*255)
-	end
-end
diff --git a/[gameplay]/killmessages/killmessages_client.lua b/[gameplay]/killmessages/killmessages_client.lua
deleted file mode 100644
index 0907c2d4b..000000000
--- a/[gameplay]/killmessages/killmessages_client.lua
+++ /dev/null
@@ -1,55 +0,0 @@
-addEvent ("onClientPlayerKillMessage",true)
-function onClientPlayerKillMessage ( killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
-	if wasEventCancelled() then return end
-	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-end
-addEventHandler ("onClientPlayerKillMessage",getRootElement(),onClientPlayerKillMessage)
-
-function outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-	if not iconWidths[weapon] then
-		if type(weapon) ~= "string" then
-			weapon = 999
-		end
-	end
-	local killerName
-	local wastedName
-	if not tonumber(wr) then wr = 255 end
-	if not tonumber(wg) then wg = 255 end
-	if not tonumber(wb) then wb = 255 end
-	if not tonumber(kr) then kr = 255 end
-	if not tonumber(kg) then kg = 255 end
-	if not tonumber(kb) then kb = 255 end
-	if ( source ) then
-		if isElement ( source ) then
-			if getElementType ( source ) == "player" then
-				wastedName = getPlayerName ( source )
-			else
-			outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-			return false end
-		elseif type(source) == "string" then
-			wastedName = source
-		end
-	else
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-	return false end
-	if ( killer ) then
-		if isElement ( killer ) then
-			if getElementType ( killer ) == "player" then
-				killerName = getPlayerName ( killer )
-			else
-				outputDebugString ( "outputKillMessage - Invalid 'killer' player specified",0,0,0,100)
-			return false end
-		elseif type(killer) == "string" then
-			killerName = killer
-		else
-			killerName = ""
-		end
-	else killerName = "" end
-	--create the new text
-	if not killerName then
-		killerName = ""
-	end
-	return outputMessage ( {killerName, {"padding",width=3}, {"icon",id=weapon},
-		{"padding",width=3},{"color",r=wr,g=wg,b=wb}, wastedName},
-		kr,kg,kb )
-end
diff --git a/[gameplay]/killmessages/killmessages_server.lua b/[gameplay]/killmessages/killmessages_server.lua
deleted file mode 100644
index 9c910d651..000000000
--- a/[gameplay]/killmessages/killmessages_server.lua
+++ /dev/null
@@ -1,192 +0,0 @@
-local config = {
-["lines"] = 5,
-["startY"] = 0.35,
-["textHeight"] = 16,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-local default = {
-["lines"] = 5,
-["startY"] = 0.25,
-["textHeight"] = 16,
-["iconHeight"] = 20,
-["iconSpacing"] = 4,
-["defaultWeapon"] = 255,
-["fadeTime"] = 5000,
-["startFade"] = 15000,
-["align"] = "right",
-["startX"] = -10
-}
-
-function KillMessages_onPlayerWasted(totalammo, killer, killerweapon, bodypart)
-	local usedVehicle = nil
-	local killerType = nil
-	local killerweapon = killerweapon or 255
-	-- In very rare cases killer isn't nil or false but isn't an element.
-	if (killer and not isElement(killer)) then
-		killer = nil
-	end
-	if (killer) then
-		killerType = getElementType(killer)
-	end
-	-- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
-	if (killerType == "player") then
-		local vehicle = getPedOccupiedVehicle(killer)
-		if (vehicle and getPedWeapon(killer) == 0) then
-			usedVehicle = getElementModel(vehicle)
-		end
-	end
-	-- Change the killer into the vehicle controller
-	if (killer and killerType == "vehicle") then
-		usedVehicle = getElementModel(killer)
-		killer = getVehicleController(killer) or killer
-		killerType = getElementType(killer)
-	end
-	-- If killed by rocket and was on foot player turn it into their current weapon
-	if (killerweapon == 19 and killerType == "player" and not isPedInVehicle(killer)) then
-		killerweapon = getPedWeapon(killer) or 51
-	end
-	-- Got a killer? Print the normal "* X died" if not
-	if (killer and killerType == "player") then
-		local kr, kg, kb = getPlayerNametagColor(killer)
-		if (getPlayerTeam(killer)) then
-			kr, kg, kb = getTeamColor(getPlayerTeam(killer))
-		end
-		-- Suicide?
-		if (source == killer) then
-			local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
-			--outputDebugString("Cancelled: "..tostring(triggered))
-			if (triggered) then
-				eventTriggered(source, false, killerweapon, bodypart, true, usedVehicle)
-				return
-			end
-		end
-		local triggered = triggerEvent("onPlayerKillMessage", source, killer, killerweapon, bodypart)
-		--outputDebugString("Cancelled: "..tostring(triggered))
-		if (triggered) then
-			eventTriggered(source, killer, killerweapon, bodypart, false, usedVehicle)
-		end
-	else
-		local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
-		--outputDebugString("Cancelled: "..tostring(triggered))
-		if (triggered) then
-			eventTriggered(source, false, killerweapon, bodypart, false, usedVehicle)
-		end
-	end
-end
-addEventHandler("onPlayerWasted", root, KillMessages_onPlayerWasted)
-
-addEvent ( "onPlayerKillMessage" )
-function eventTriggered ( source,killer,weapon,bodypart,suicide,usedVehicle )
-	local wr,wg,wb = getPlayerNametagColor	( source )
-	if getPlayerTeam ( source ) then
-		wr,wg,wb = getTeamColor ( getPlayerTeam ( source ) )
-	end
-	local kr,kg,kb = false,false,false
-	if ( killer ) then
-		kr,kg,kb = getPlayerNametagColor	( killer )
-		if getPlayerTeam ( killer ) then
-			kr,kg,kb = getTeamColor ( getPlayerTeam ( killer ) )
-		end
-	end
-	if ( usedVehicle ) then
-		weapon = usedVehicle
-	end
-	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon )
-	--
-	local extra = ""
-	if ( usedVehicle ) then
-	extra = " (Vehicle)"
-	end
-	if ( killer ) then
-		if suicide then
-			local weaponName = getWeaponNameFromID ( weapon )
-			if weaponName then
-				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself. ("..weaponName..")" )
-			else
-				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself."..extra )
-			end
-		else
-			local weaponName = getWeaponNameFromID ( weapon )
-			if weaponName then
-				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source)..". ("..weaponName..")" )
-			else
-				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source).."."..extra )
-			end
-		end
-	else
-		outputConsoleKillMessage ( "* "..getPlayerName(source).." died."..extra )
-	end
-	--
-end
-
-function outputConsoleKillMessage ( text )
-	outputConsole ( text )
-end
-
-function outputKillMessage ( killed, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
-	if ( resource ) then resource = getResourceName(resource) end
-	if not isElement(killed) then
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-		return false
-	end
-	if not getElementType(killed) == "player" then
-		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
-		return false
-	end
-	return triggerClientEvent(getRootElement(),"onClientPlayerKillMessage",killed,killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
-end
-
-function outputMessage ( message, visibleTo, r, g, b, font )
-	if type(message) ~= "string" and type(message) ~= "table" then
-		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
-		return false
-	end
-	if not isElement(visibleTo) then
-		outputDebugString ( "outputMessage - Bad argument", 0, 112, 112, 112 )
-		return false
-	end
-	--Turn any resources into resource names
-	if type(message) == "table" then
-		for i,part in ipairs(message) do
-			if type(part) == "table" and part[1] == "image" then
-				if part.resource then
-					message[i].resourceName = getResourceName(part.resource)
-				else
-					part.resourceName = getResourceName(sourceResource)
-				end
-			end
-		end
-	end
-	return triggerClientEvent ( visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font )
-end
-
-function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
-	if ( not startX ) then startX = default.startX end
-	if ( not startY ) then startY = default.startY end
-	if ( not align ) then startY = align.startY end
-	if ( not lines ) then lines = default.lines end
-	if ( not fadeStart ) then fadeStart = default.startFade end
-	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
-	config.startX = startX
-	config.startY = startY
-	config.align = align
-	config.lines = lines
-	config.startFade = fadeStart
-	config.fadeTime = fadeAnimTime
-	for k,v in ipairs(getElementsByType"player") do
-		triggerClientEvent(v,"doSetKillMessageStyle",v,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
-	end
-	return true
-end
-
-addEvent ("onClientKillmessagesLoaded",true)
-addEventHandler ( "onClientKillmessagesLoaded", getRootElement(),
-function()
-	triggerClientEvent(client,"doSetKillMessageStyle",client,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
-end )
diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index 99993348a..fd9ecb86e 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -1,125 +1,138 @@
 <meta>
-	<info author="Talidan + Iggy" type="script" version="2.0.1"/>
-	<script src="utils/textlib.lua" type="client"/>
-	<script src="utils/imagelib.lua" type="client"/>
-	<script src="killmessages_client.lua" type="client"/>
-	<script src="killmessages_server.lua" type="server"/>
-	<script src="gui.lua" type="client"/>
-	<script src="definitions.lua" type="client"/>
-	<!--All icons courtesy of Iggy-->
-	<file src="icons/fist.png"/>
-	<file src="icons/brassknuckle.png"/>
-	<file src="icons/golfclub.png"/>
-	<file src="icons/nitestick.png"/>
-	<file src="icons/knifecur.png"/>
-	<file src="icons/bat.png"/>
-	<file src="icons/shovel.png"/>
-	<file src="icons/poolcue.png"/>
-	<file src="icons/katana.png"/>
-	<file src="icons/chnsaw.png"/>
-	<file src="icons/gun_dildo1.png"/>
-	<file src="icons/gun_dildo2.png"/>
-	<file src="icons/gun_vibe1.png"/>
-	<file src="icons/flowera.png"/>
-	<file src="icons/gun_cane.png"/>
-	<file src="icons/grenade.png"/>
-	<file src="icons/teargas.png"/>
-	<file src="icons/molotov.png"/>
-	<file src="icons/colt45.png"/>
-	<file src="icons/Silenced.png"/>
-	<file src="icons/desert_eagle.png"/>
-	<file src="icons/chromegun.png"/>
-	<file src="icons/sawnoff.png"/>
-	<file src="icons/shotgspa.png"/>
-	<file src="icons/micro_uzi.png"/>
-	<file src="icons/mp5lng.png"/>
-	<file src="icons/ak47.png"/>
-	<file src="icons/m4.png"/>
-	<file src="icons/tec9.png"/>
-	<file src="icons/cuntgun.png"/>
-	<file src="icons/sniper.png"/>
-	<file src="icons/rocketla.png"/>
-	<file src="icons/heatseek.png"/>
-	<file src="icons/flame.png"/>
-	<file src="icons/minigun.png"/>
-	<file src="icons/satchel.png"/>
-	<file src="icons/explosion.png"/>
-	<file src="icons/suicide.png"/>
-	<file src="icons/rammed.png"/>
-	<file src="icons/hunter.png"/>
-	<file src="icons/fall.png"/>
-	<file src="icons/drowned.png"/>
-	<file src="icons/generic.png"/>
-	<file src="icons/headshot.png"/>
-	<file src="icons/406.png"/>
-	<file src="icons/408.png"/>
-	<file src="icons/416.png"/>
-	<file src="icons/417.png"/>
-	<file src="icons/423.png"/>
-	<file src="icons/424.png"/>
-	<file src="icons/427.png"/>
-	<file src="icons/428.png"/>
-	<file src="icons/429.png"/>
-	<file src="icons/432.png"/>
-	<file src="icons/433.png"/>
-	<file src="icons/434.png"/>
-	<file src="icons/441.png"/>
-	<file src="icons/443.png"/>
-	<file src="icons/448.png"/>
-	<file src="icons/457.png"/>
-	<file src="icons/460.png"/>
-	<file src="icons/462.png"/>
-	<file src="icons/463.png"/>
-	<file src="icons/464.png"/>
-	<file src="icons/468.png"/>
-	<file src="icons/470.png"/>
-	<file src="icons/471.png"/>
-	<file src="icons/480.png"/>
-	<file src="icons/485.png"/>
-	<file src="icons/486.png"/>
-	<file src="icons/508.png"/>
-	<file src="icons/511.png"/>
-	<file src="icons/512.png"/>
-	<file src="icons/513.png"/>
-	<file src="icons/520.png"/>
-	<file src="icons/524.png"/>
-	<file src="icons/528.png"/>
-	<file src="icons/530.png"/>
-	<file src="icons/531.png"/>
-	<file src="icons/532.png"/>
-	<file src="icons/539.png"/>
-	<file src="icons/564.png"/>
-	<file src="icons/568.png"/>
-	<file src="icons/571.png"/>
-	<file src="icons/572.png"/>
-	<file src="icons/573.png"/>
-	<file src="icons/574.png"/>
-	<file src="icons/578.png"/>
-	<file src="icons/588.png"/>
-	<file src="icons/593.png"/>
-	<file src="icons/599.png"/>
-	<file src="icons/bigtruck.png"/>
-	<file src="icons/bike.png"/>
-	<file src="icons/boat.png"/>
-	<file src="icons/boxtruck.png"/>
-	<file src="icons/bus.png"/>
-	<file src="icons/cars.png"/>
-	<file src="icons/copcar.png"/>
-	<file src="icons/crotchrocket.png"/>
-	<file src="icons/firetruck.png"/>
-	<file src="icons/maverick.png"/>
-	<file src="icons/monstertruck.png"/>
-	<file src="icons/plane.png"/>
-	<file src="icons/rccopter.png"/>
-	<file src="icons/roundvan.png"/>
-	<file src="icons/sparrow.png"/>
-	<file src="icons/train.png"/>
-	<file src="icons/fireextinguisher.png"/>
+    <info author="Talidan + Iggy" type="script" version="2.0.2"/>
+    <min_mta_version client="1.5.7-9.20447"></min_mta_version>
 
-	<export function="outputMessage" type="server"/>
-	<export function="outputMessage" type="client"/>
-	<export function="outputKillMessage" type="server"/>
-	<export function="outputKillMessage" type="client"/>
-	<export function="setKillMessageStyle" type="client"/>
-	<export function="setKillMessageStyle" type="server"/>
+    <script type="server" src="scripts/server/s.killmessages.lua"/>
+    <script type="server" src="scripts/server/s.settings.lua"/>
+
+    <script type="client" src="scripts/client/c.killmessages.lua"/>
+    <script type="client" src="scripts/client/c.ui.lua"/>
+    <script type="client" src="scripts/client/c.settings.lua"/>
+    <script type="client" src="scripts/client/c.utils.lua"/>
+
+    <export type="shared" function="outputMessage"/>
+    <export type="shared" function="outputKillMessage"/>
+
+    <!--All icons courtesy of Iggy-->
+    <file src="icons/406.png"/>
+    <file src="icons/408.png"/>
+    <file src="icons/416.png"/>
+    <file src="icons/417.png"/>
+    <file src="icons/423.png"/>
+    <file src="icons/424.png"/>
+    <file src="icons/427.png"/>
+    <file src="icons/428.png"/>
+    <file src="icons/429.png"/>
+    <file src="icons/432.png"/>
+    <file src="icons/433.png"/>
+    <file src="icons/434.png"/>
+    <file src="icons/441.png"/>
+    <file src="icons/443.png"/>
+    <file src="icons/448.png"/>
+    <file src="icons/457.png"/>
+    <file src="icons/460.png"/>
+    <file src="icons/462.png"/>
+    <file src="icons/463.png"/>
+    <file src="icons/464.png"/>
+    <file src="icons/468.png"/>
+    <file src="icons/470.png"/>
+    <file src="icons/471.png"/>
+    <file src="icons/480.png"/>
+    <file src="icons/485.png"/>
+    <file src="icons/486.png"/>
+    <file src="icons/508.png"/>
+    <file src="icons/511.png"/>
+    <file src="icons/512.png"/>
+    <file src="icons/513.png"/>
+    <file src="icons/520.png"/>
+    <file src="icons/524.png"/>
+    <file src="icons/528.png"/>
+    <file src="icons/530.png"/>
+    <file src="icons/531.png"/>
+    <file src="icons/532.png"/>
+    <file src="icons/532b.png"/>
+    <file src="icons/539.png"/>
+    <file src="icons/564.png"/>
+    <file src="icons/568.png"/>
+    <file src="icons/571.png"/>
+    <file src="icons/572.png"/>
+    <file src="icons/573.png"/>
+    <file src="icons/574.png"/>
+    <file src="icons/578.png"/>
+    <file src="icons/588.png"/>
+    <file src="icons/593.png"/>
+    <file src="icons/599.png"/>
+    <file src="icons/601.png"/>
+    <file src="icons/ak47.png"/>
+    <file src="icons/bat.png"/>
+    <file src="icons/bigtruck.png"/>
+    <file src="icons/bike.png"/>
+    <file src="icons/boat.png"/>
+    <file src="icons/boxtruck.png"/>
+    <file src="icons/brassknuckle.png"/>
+    <file src="icons/bus.png"/>
+    <file src="icons/cars.png"/>
+    <file src="icons/chnsaw.png"/>
+    <file src="icons/chromegun.png"/>
+    <file src="icons/colt45.png"/>
+    <file src="icons/copcar.png"/>
+    <file src="icons/crotchrocket.png"/>
+    <file src="icons/cuntgun.png"/>
+    <file src="icons/desert_eagle.png"/>
+    <file src="icons/drowned.png"/>
+    <file src="icons/explosion.png"/>
+    <file src="icons/fall.png"/>
+    <file src="icons/fireextinguisher.png"/>
+    <file src="icons/firetruck.png"/>
+    <file src="icons/fist.png"/>
+    <file src="icons/flame.png"/>
+    <file src="icons/flowera.png"/>
+    <file src="icons/generic.png"/>
+    <file src="icons/golfclub.png"/>
+    <file src="icons/grenade.png"/>
+    <file src="icons/gun_cane.png"/>
+    <file src="icons/gun_dildo1.png"/>
+    <file src="icons/gun_dildo2.png"/>
+    <file src="icons/gun_vibe1.png"/>
+    <file src="icons/gun_vibe2.png"/>
+    <file src="icons/headshot.png"/>
+    <file src="icons/heatseek.png"/>
+    <file src="icons/hunter.png"/>
+    <file src="icons/katana.png"/>
+    <file src="icons/knifecur.png"/>
+    <file src="icons/m4.png"/>
+    <file src="icons/maverick.png"/>
+    <file src="icons/micro_uzi.png"/>
+    <file src="icons/minigun.png"/>
+    <file src="icons/missile.png"/>
+    <file src="icons/molotov.png"/>
+    <file src="icons/monstertruck.png"/>
+    <file src="icons/mp5lng.png"/>
+    <file src="icons/nitestick.png"/>
+    <file src="icons/plane.png"/>
+    <file src="icons/poolcue.png"/>
+    <file src="icons/rammed.png"/>
+    <file src="icons/rccopter.png"/>
+    <file src="icons/rocketla.png"/>
+    <file src="icons/roundvan.png"/>
+    <file src="icons/satchel.png"/>
+    <file src="icons/sawnoff.png"/>
+    <file src="icons/shotgspa.png"/>
+    <file src="icons/shovel.png"/>
+    <file src="icons/Silenced.png"/>
+    <file src="icons/sniper.png"/>
+    <file src="icons/sparrow.png"/>
+    <file src="icons/suicide.png"/>
+    <file src="icons/teargas.png"/>
+    <file src="icons/tec9.png"/>
+    <file src="icons/train.png"/>
+
+    <settings>
+        <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
+        <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
+        <setting name="*drawMarginBottom" value="0.5" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
+        <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
+        <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
+        <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>
+    </settings>
 </meta>
diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
new file mode 100644
index 000000000..ddfcfa2be
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
@@ -0,0 +1,160 @@
+addEvent('onClientPlayerKillMessage', true)
+addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
+    if wasEventCancelled() then
+        return
+    end
+    outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
+end)
+
+function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    pR = tonumber(pR) or 255
+    pG = tonumber(pG) or 255
+    pB = tonumber(pB) or 255
+    
+    kR = tonumber(kR) or 255
+    kG = tonumber(kG) or 255
+    kB = tonumber(kB) or 255
+    
+    if (not player) or (not isElement(player)) or (getElementType(player) ~= 'player') then
+        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
+        return false
+    end
+    
+    local killerName
+    
+    if isElement(killer) then
+        if (getElementType(killer) ~= 'player') then
+            outputDebugString("outputKillMessage - Invalid 'killer' player specified", 0, 0, 0, 100)
+            return false
+        end
+        killerName = getPlayerName(killer)
+    
+    elseif (type(killer) == 'string') then
+        killerName = killer
+    
+    end
+    
+    local message = {
+        icon = getMessageIcon(weapon, killer),
+        victim = {
+            text = removeHex(getPlayerName(player)),
+            color = {pR, pG, pB},
+        }
+    }
+    
+    if (type(killerName) == 'string') then
+        message.killer = {
+            text = removeHex(killerName),
+            color = {kR, kG, kB},
+        }
+    end
+    
+    return outputMessage(message)
+end
+
+local possibleKiller
+
+function setPossibleKiller(player)
+    if possibleKiller and isTimer(possibleKiller.timer) then
+        killTimer(possibleKiller.timer)
+    end
+    
+    possibleKiller = {
+        player = player,
+        timer = setTimer(function()
+            possibleKiller = nil
+        end, 7000, 1)
+    }
+end
+
+local validExplosionTypes = {
+    [2] = true, -- rocket
+    [10] = true, -- tank grenade
+}
+
+addEventHandler('onClientExplosion', root, function(x, y, z, explosionType)
+    if (not validExplosionTypes[explosionType]) then
+        return
+    end
+    
+    if (getElementType(source) ~= 'player') then
+        return
+    end
+    
+    if (not getPedOccupiedVehicle(source)) then
+        return
+    end
+    
+    local myVehicle = getPedOccupiedVehicle(localPlayer)
+    
+    if (not myVehicle) then
+        return
+    end
+    
+    if (getDistanceBetweenPoints3D(x, y, z, getElementPosition(myVehicle)) > 10) then
+        return
+    end
+
+    setPossibleKiller(source)
+end)
+
+local vehicleWeapons = {
+    [425] = 38, -- hunter
+    [464] = 31, -- rc baron
+    [476] = 31, -- rustler
+}
+
+addEventHandler('onClientVehicleDamage', root, function(attacker, weapon)
+    if (not weapon) then
+        return
+    end
+    
+    local myVehicle = getPedOccupiedVehicle(localPlayer)
+    
+    if (source ~= myVehicle) then
+        return
+    end
+    
+    if (not attacker) or (getElementType(attacker) ~= 'vehicle') then
+        return
+    end
+    
+    local player = getVehicleOccupant(attacker)
+    
+    if (not player) then
+        return
+    end
+    
+    if (vehicleWeapons[getElementModel(attacker)] ~= weapon) then
+        return
+    end
+    
+    setPossibleKiller(player)
+end)
+
+addEventHandler('onClientPlayerWasted', localPlayer, function()
+    if (not possibleKiller) then
+        -- If there is no possible killer and the current vehicle is exploded
+        local myVehicle = getPedOccupiedVehicle(localPlayer)
+        if myVehicle and isVehicleBlown(myVehicle) then
+            triggerServerEvent('outputKillFromClient', localPlayer, localPlayer, myVehicle)
+        end
+        return
+    end
+    
+    if (not isElement(possibleKiller.player)) then
+        return
+    end
+    
+    local vehicle = getPedOccupiedVehicle(possibleKiller.player)
+    
+    if isElement(vehicle) then
+        triggerServerEvent('outputKillFromClient', localPlayer, possibleKiller.player, vehicle)
+    end
+    
+    if isTimer(possibleKiller.timer) then
+        killTimer(possibleKiller.timer)
+    end
+    
+    possibleKiller = nil
+end)
diff --git a/[gameplay]/killmessages/scripts/client/c.settings.lua b/[gameplay]/killmessages/scripts/client/c.settings.lua
new file mode 100644
index 000000000..5ec940689
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.settings.lua
@@ -0,0 +1,16 @@
+local settings = {}
+
+function getSetting(name)
+    return settings[name] or false
+end
+
+addEvent('receiveKillMessagesSettings', true)
+addEventHandler('receiveKillMessagesSettings', localPlayer, function(received)
+    for k, v in pairs(received) do -- replace only received settings.
+        settings[k] = tonumber(v)
+    end
+end)
+
+addEventHandler('onClientResourceStart', resourceRoot, function()
+    triggerServerEvent('requestKillMessagesSettings', localPlayer)
+end)
diff --git a/[gameplay]/killmessages/scripts/client/c.ui.lua b/[gameplay]/killmessages/scripts/client/c.ui.lua
new file mode 100644
index 000000000..de7ec0470
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.ui.lua
@@ -0,0 +1,112 @@
+local messages = {}
+local sW, sH = guiGetScreenSize()
+
+function outputMessage(new)
+    if (type(new) == 'string') then
+        new = {
+            victim = {
+                text = new,
+                color = {255, 255, 255},
+            },
+        }
+    end
+    
+    new.initTick = getTickCount()
+    
+    table.insert(messages, new)
+    
+    local displayLines = tonumber(getSetting('displayLines')) or 5
+    
+    local quantity = #messages
+    
+    if (quantity == 1) then
+        addEventHandler('onClientRender', root, renderMessages)
+    
+    elseif (quantity > displayLines) then
+        table.remove(messages, 1)
+    
+    end
+    
+    return true
+end
+addEvent('doOutputMessage', true)
+addEventHandler('doOutputMessage', root, outputMessage)
+
+function renderMessages()
+    local now = getTickCount()
+    
+    local lineHeight = 20
+    local font = 'default'
+    
+    local marginRight = tonumber(getSetting('drawMarginRight')) or 0.01
+    local marginBottom = tonumber(getSetting('drawMarginBottom')) or 0.035
+    local fadeTime = tonumber(getSetting('fadeTime')) or 1
+    local duration = tonumber(getSetting('duration')) or 10
+    
+    fadeTime = fadeTime * 1000
+    duration = duration * 1000
+    
+    local y = sH - (sH * marginBottom)
+    
+    local padding = 5 -- distance between texts and icon
+    
+    for k, v in ipairs(messages) do
+        local passed = now - v.initTick
+        if (passed <= duration) then
+            local alpha = 255
+            
+            if (passed <= fadeTime) then
+                alpha = 255 * passed / fadeTime
+            
+            elseif (passed >= (duration - fadeTime)) then
+                alpha = 255 - 255 * ((now - duration + fadeTime) - v.initTick) / fadeTime
+            
+            end
+            
+            local victim = v.victim
+            local victimText = victim.text
+            local victimColor = victim.color
+            victimColor = tocolor(victimColor[1], victimColor[2], victimColor[3], alpha)
+            
+            local victimWidth = dxGetTextSize(victimText, 0, 1, 1, font, false, true)
+            
+            local x = sW - (sW * marginRight) - victimWidth
+            
+            dxDrawText(victimText, x + 2, y + 2, x + victimWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
+            dxDrawText(victimText, x, y, x + victimWidth, y + lineHeight, victimColor, 1, font, 'center', 'center')
+            
+            local icon = v.icon
+            
+            if icon then
+                local texture = icon.texture
+                local iconWidth = icon.width
+                x = x - padding - iconWidth
+                dxDrawImage(x, y, iconWidth, lineHeight, texture, 0, 0, 0, tocolor(255, 255, 255, alpha))
+            end
+            
+            local killer = v.killer
+            
+            if killer then
+                local killerText = killer.text
+                local killerColor = killer.color
+                killerColor = tocolor(killerColor[1], killerColor[2], killerColor[3], alpha)
+                
+                local killerWidth = dxGetTextSize(killerText, 0, 1, 1, font, false, true)
+                
+                x = x - padding - killerWidth
+                
+                dxDrawText(killerText, x + 2, y + 2, x + killerWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
+                dxDrawText(killerText, x, y, x + killerWidth, y + lineHeight, killerColor, 1, font, 'center', 'center')
+            end
+            
+            y = y - lineHeight - padding
+        else
+            table.remove(messages, k)
+            
+            if (#messages == 0) then
+                removeEventHandler('onClientRender', root, renderMessages)
+            end
+        
+        end
+    end
+end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
new file mode 100644
index 000000000..4111be0fe
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/client/c.utils.lua
@@ -0,0 +1,202 @@
+local defaultIconsByVehType = {
+    ['Automobile'] = 'icons/cars.png',
+    ['Boat'] = 'icons/boat.png',
+    ['Plane'] = 'icons/plane.png',
+    ['Train'] = 'icons/train.png',
+}
+
+local customIcons = {
+    [0] = "icons/fist.png",
+    [1] = "icons/brassknuckle.png",
+    [2] = "icons/golfclub.png",
+    [3] = "icons/nitestick.png",
+    [4] = "icons/knifecur.png",
+    [5] = "icons/bat.png",
+    [6] = "icons/shovel.png",
+    [7] = "icons/poolcue.png",
+    [8] = "icons/katana.png",
+    [9] = "icons/chnsaw.png",
+    [10] = "icons/gun_dildo1.png",
+    [11] = "icons/gun_dildo2.png",
+    [12] = "icons/gun_vibe1.png",
+    [14] = "icons/flowera.png",
+    [15] = "icons/gun_cane.png",
+    [16] = "icons/grenade.png",
+    [17] = "icons/teargas.png",
+    [18] = "icons/molotov.png",
+    [19] = "icons/explosion.png",
+    [63] = "icons/explosion.png",
+    [22] = "icons/colt45.png",
+    [23] = "icons/Silenced.png",
+    [24] = "icons/desert_eagle.png",
+    [25] = "icons/chromegun.png",
+    [26] = "icons/sawnoff.png",
+    [27] = "icons/shotgspa.png",
+    [28] = "icons/micro_uzi.png",
+    [29] = "icons/mp5lng.png",
+    [30] = "icons/ak47.png",
+    [31] = "icons/m4.png",
+    [32] = "icons/tec9.png",
+    [33] = "icons/cuntgun.png",
+    [34] = "icons/sniper.png",
+    [35] = "icons/rocketla.png",
+    [36] = "icons/heatseek.png",
+    [37] = "icons/flame.png",
+    [38] = "icons/minigun.png",
+    [39] = "icons/satchel.png",
+    [42] = "icons/fireextinguisher.png",
+    [49] = "icons/rammed.png",
+    [50] = "icons/maverick.png",
+    [51] = "icons/explosion.png",
+    [53] = "icons/drowned.png",
+    [54] = "icons/fall.png",
+    [255] = "icons/suicide.png",
+    [256] = "icons/headshot.png",
+    
+    -----------vehicle specific icons, according to their vehicle id---------
+    [431] = "icons/bus.png",
+    [437] = "icons/bus.png",
+    [414] = "icons/boxtruck.png",
+    [456] = "icons/boxtruck.png",
+    [498] = "icons/boxtruck.png",
+    [499] = "icons/boxtruck.png",
+    [609] = "icons/boxtruck.png",
+    [440] = "icons/roundvan.png",
+    [459] = "icons/roundvan.png",
+    [482] = "icons/roundvan.png",
+    [483] = "icons/roundvan.png",
+    [582] = "icons/roundvan.png",
+    [447] = "icons/sparrow.png",
+    [469] = "icons/sparrow.png",
+    [487] = "icons/maverick.png",
+    [488] = "icons/maverick.png",
+    [497] = "icons/maverick.png",
+    [548] = "icons/maverick.png",
+    [563] = "icons/maverick.png",
+    [465] = "icons/rccopter.png",
+    [501] = "icons/rccopter.png",
+    [481] = "icons/bike.png",
+    [509] = "icons/bike.png",
+    [510] = "icons/bike.png",
+    [514] = "icons/bigtruck.png",
+    [515] = "icons/bigtruck.png",
+    [461] = "icons/crotchrocket.png",
+    [521] = "icons/crotchrocket.png",
+    [522] = "icons/crotchrocket.png",
+    [523] = "icons/crotchrocket.png",
+    [581] = "icons/crotchrocket.png",
+    [586] = "icons/crotchrocket.png",
+    [407] = "icons/firetruck.png",
+    [544] = "icons/firetruck.png",
+    [444] = "icons/monstertruck.png",
+    [556] = "icons/monstertruck.png",
+    [557] = "icons/monstertruck.png",
+    [596] = "icons/copcar.png",
+    [597] = "icons/copcar.png",
+    [598] = "icons/copcar.png",
+    [425] = "icons/hunter.png",
+    [406] = "icons/406.png",
+    [408] = "icons/408.png",
+    [416] = "icons/416.png",
+    [417] = "icons/417.png",
+    [423] = "icons/423.png",
+    [424] = "icons/424.png",
+    [427] = "icons/427.png",
+    [428] = "icons/428.png",
+    [429] = "icons/429.png",
+    [432] = "icons/432.png",
+    [433] = "icons/433.png",
+    [434] = "icons/434.png",
+    [441] = "icons/441.png",
+    [443] = "icons/443.png",
+    [448] = "icons/448.png",
+    [457] = "icons/457.png",
+    [460] = "icons/460.png",
+    [462] = "icons/462.png",
+    [463] = "icons/463.png",
+    [464] = "icons/464.png",
+    [468] = "icons/468.png",
+    [470] = "icons/470.png",
+    [471] = "icons/471.png",
+    [480] = "icons/480.png",
+    [485] = "icons/485.png",
+    [486] = "icons/486.png",
+    [508] = "icons/508.png",
+    [511] = "icons/511.png",
+    [512] = "icons/512.png",
+    [513] = "icons/513.png",
+    [520] = "icons/520.png",
+    [524] = "icons/524.png",
+    [528] = "icons/528.png",
+    [530] = "icons/530.png",
+    [531] = "icons/531.png",
+    [532] = "icons/532.png",
+    [539] = "icons/539.png",
+    [564] = "icons/564.png",
+    [568] = "icons/568.png",
+    [571] = "icons/571.png",
+    [572] = "icons/572.png",
+    [573] = "icons/573.png",
+    [574] = "icons/574.png",
+    [578] = "icons/578.png",
+    [588] = "icons/588.png",
+    [593] = "icons/593.png",
+    [599] = "icons/599.png",
+}
+
+function getMessageIcon(weapon, attacker)
+    local path
+    
+    if weapon then
+        path = customIcons[weapon] or 'icons/generic.png'
+    end
+    
+    local elemType = isElement(attacker) and getElementType(attacker)
+    
+    if (elemType == 'vehicle') then
+        local model = getElementModel(attacker)
+        path = customIcons[model] or defaultIconsByVehType[getVehicleType(attacker)] or 'icons/generic.png'
+    
+    elseif (elemType == 'player') then
+        local vehicle = getPedOccupiedVehicle(attacker)
+        if vehicle then
+            return getMessageIcon(_, vehicle)
+        end
+    end
+    
+    local texture = getTexture(path)
+    
+    if texture then
+        return {
+            texture = texture,
+            width = dxGetMaterialSize(texture)
+        }
+    end
+    
+    return false
+end
+
+local textures = {}
+
+function getTexture(path)
+    if (type(path) ~= 'string') then
+        return false
+    end
+    
+    if (textures[path] ~= nil) then
+        return textures[path]
+    end
+    
+    textures[path] = dxCreateTexture(path)
+    
+    return textures[path]
+end
+
+function removeHex(s)
+    if (type(s) == "string") then
+        while (s ~= s:gsub("#%x%x%x%x%x%x", "")) do
+            s = s:gsub("#%x%x%x%x%x%x", "")
+        end
+    end
+    return s or false
+end
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
new file mode 100644
index 000000000..f60d02a4f
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
@@ -0,0 +1,171 @@
+addEvent("onPlayerKillMessage")
+
+function createKillMessage(_, killer, weapon, bodypart, stealth)
+    local usedVehicle, killerType
+    local weapon = weapon or 255
+    
+    -- In very rare cases killer isn't nil or false but isn't an element.
+    if killer and (not isElement(killer)) then
+        killer = nil
+    end
+    
+    if killer then
+        killerType = getElementType(killer)
+        
+        -- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
+        if (killerType == 'player') then
+            local veh = getPedOccupiedVehicle(killer)
+            if veh and (getPedWeapon(killer) == 0) then
+                usedVehicle = veh
+            end
+        
+        -- Change the killer into the vehicle controller
+        elseif (killerType == 'vehicle') then
+            usedVehicle = killer
+            local controller = getVehicleController(killer)
+            if controller then
+                killer = controller
+                killerType = getElementType(killer)
+            end
+        
+        end
+    end
+    
+    -- If killed by rocket and was on foot player turn it into their current weapon
+    if (weapon == 19) and ((killerType == 'player') and (not isPedInVehicle(killer))) then
+        weapon = getPedWeapon(killer) or 51
+    end
+    
+    if killer and (killerType == 'player') then
+        -- Suicide?
+        if (source == killer) then
+            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
+                eventTriggered(source, false, weapon, bodypart, usedVehicle)
+            end
+        else
+            if triggerEvent("onPlayerKillMessage", source, killer, weapon, bodypart) then
+                eventTriggered(source, killer, weapon, bodypart, usedVehicle)
+            end
+        end
+    else
+        -- Avoid showing deaths caused by explosions, cuz they are client-side
+        if (weapon ~= 63) then
+            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
+                eventTriggered(source, false, weapon, bodypart, usedVehicle)
+            end
+        end
+    end
+end
+addEventHandler('onPlayerWasted', root, createKillMessage)
+
+addEvent('outputKillFromClient', true)
+addEventHandler('outputKillFromClient', root, function(killer, veh)
+    if (source ~= client) then
+        return
+    end
+
+    if (not isElement(killer)) then
+        return
+    end
+
+    local killerVehicle = getPedOccupiedVehicle(killer)
+
+    if (killerVehicle ~= veh) then
+        return
+    end
+    
+    -- If the vehicle exploded without suffering damage from enemies
+    if (killer == source) then
+        if triggerEvent("onPlayerKillMessage", source, false, 63) then
+            eventTriggered(source, false, 63)
+        end
+    else
+        if triggerEvent("onPlayerKillMessage", client, killer, 19) then
+            eventTriggered(client, killer, 19, nil, veh)
+        end 
+    end
+end)
+
+function eventTriggered(player, killer, weapon, bodypart, vehicle)
+    outputConsoleMessage(player, killer, vehicle, weapon)
+    
+    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
+        weapon = getElementModel(vehicle)
+    end
+    
+    local pR, pG, pB = getPlayerColor(player)
+    local kR, kG, kB = getPlayerColor(killer)
+    
+    outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    
+    return true
+end
+
+function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
+    if (not isElement(player)) or (getElementType(player) ~= 'player') then
+        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
+        return false
+    end
+    
+    return triggerClientEvent(root, 'onClientPlayerKillMessage', player, killer, weapon, pR, pG, pB, kR, kG, kB)
+end
+
+function outputMessage(message, visibleTo, r, g, b, font)
+    if (type(message) ~= "string") and (type(message) ~= "table") then
+        outputDebugString("outputMessage - Bad 'message' argument", 0, 112, 112, 112)
+        return false
+    end
+    if (not isElement(visibleTo)) then
+        outputDebugString("outputMessage - Bad 'visibleTo' argument", 0, 112, 112, 112)
+        return false
+    end
+    return triggerClientEvent(visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font)
+end
+
+function outputConsoleMessage(player, killer, vehicle, weapon)
+    if (get('outputConsole') ~= 'true') then
+        return false
+    end
+    
+    local extra = ''
+    
+    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
+        extra = (' (%s)'):format(getVehicleName(vehicle))
+    end
+    
+    local msg
+    if killer then
+        if (player == killer) then
+            msg = ('* %s killed himself.'):format(getPlayerName(player))
+        else
+            msg = ('* %s killed %s.'):format(getPlayerName(killer), getPlayerName(player))
+        end
+        local weaponName = getWeaponNameFromID(weapon)
+        if weaponName then
+            msg = msg .. (' (%s)'):format(weaponName)
+        else
+            msg = msg .. extra
+        end
+    else
+        msg = ('* %s died.%s'):format(getPlayerName(player), extra)
+    end
+    
+    if msg then
+        outputConsole(msg)
+    end
+    
+    return true
+end
+
+function getPlayerColor(player)
+    local r, g, b
+    if isElement(player) then
+        local team = getPlayerTeam(player)
+        if team then
+            r, g, b = getTeamColor(team)
+        else
+            r, g, b = getPlayerNametagColor(player)
+        end
+    end
+    return r, g, b
+end
diff --git a/[gameplay]/killmessages/scripts/server/s.settings.lua b/[gameplay]/killmessages/scripts/server/s.settings.lua
new file mode 100644
index 000000000..12850cf2c
--- /dev/null
+++ b/[gameplay]/killmessages/scripts/server/s.settings.lua
@@ -0,0 +1,28 @@
+local settings = {}
+
+addEventHandler('onResourceStart', resourceRoot, function()
+    local allSettings = {'displayLines', 'drawMarginRight', 'drawMarginBottom', 'fadeTime', 'duration', 'outputConsole'}
+    for k, v in ipairs(allSettings) do
+        settings[v] = get(v)
+    end
+end)
+
+addEvent('requestKillMessagesSettings', true)
+addEventHandler('requestKillMessagesSettings', root, function()
+    triggerClientEvent(client, 'receiveKillMessagesSettings', client, settings)
+end)
+
+addEventHandler('onSettingChange', root, function(name, _, value)
+    name = name:gsub('[%*%#%@](.*)', '%1')-- Remove leading '*','#' or '@'
+    name = name:gsub(getResourceName(resource) .. '%.(.*)', '%1')-- Remove leading 'resName.'
+    
+    if (not settings[name]) then return end
+
+    value = fromJSON(value)
+    settings[name] = value
+    
+    -- send only the changed setting
+    triggerClientEvent(root, 'receiveKillMessagesSettings', root, {
+        [name] = value
+    })
+end)
diff --git a/[gameplay]/killmessages/utils/imagelib.lua b/[gameplay]/killmessages/utils/imagelib.lua
deleted file mode 100644
index fa2d75b24..000000000
--- a/[gameplay]/killmessages/utils/imagelib.lua
+++ /dev/null
@@ -1,140 +0,0 @@
-dxImage = {}
-dxImage_mt = { __index = dxImage }
-local g_screenX,g_screenY = guiGetScreenSize()
-local visibleImages = {}
-------
-local defaults = {
-	fX							= 0.5,
-	fY							= 0.5,
-	fWidth						= 0,
-	fHeight						= 0,
-	bRelativePosition			= true,
-	bRelativeSize				= true,
-	fRot						= 0,
-	fRotXOff					= 0,
-	fRotYOff					= 0,
-	strPath						= "",
-	tColor 						= {255,255,255,255},
-	bPostGUI 					= false,
-	bVisible 					= true,
-}
-
-function dxImage:create( path, x, y, width, height, relative )
-	assert(not self.fX, "attempt to call method 'create' (a nil value)")
-	if ( type(path) ~= "string" ) or ( not tonumber(x) ) or ( not tonumber(y) ) then
-		outputDebugString ( "dxImage:create - Bad argument", 0, 112, 112, 112 )
-		return false
-	end
-    local new = {}
-	setmetatable( new, dxImage_mt )
-	--Add default settings
-	for i,v in pairs(defaults) do
-		new[i] = v
-	end
-	new.fX = x or new.fX
-	new.fY = y or new.fY
-	new.strPath = path
-	new.fWidth = width or new.fWidth
-	new.fHeight = height or new.fHeight
-	if type(relative) == "boolean" then
-		new.bRelativePosition = relative
-		new.bRelativeSize = relative
-	end
-	visibleImages[new] = true
-	return new
-end
-
-function dxImage:path(path)
-	if type(path) ~= "string" then return self.strPath end
-	self.strPath = path
-	return true
-end
-
-function dxImage:position(x,y,relative)
-	if not tonumber(x) then return self.fX, self.fY end
-	self.fX = x
-	self.fY = y
-	if type(relative) == "boolean" then
-		self.bRelativePosition = relative
-	else
-		self.bRelativePosition = true
-	end
-	return true
-end
-
-function dxImage:size(x,y,relative)
-	if not tonumber(x) then return self.fWidth, self.fHeight end
-	self.fWidth = x
-	self.fHeight = y
-	if type(relative) == "boolean" then
-		self.bRelativeSize = relative
-	else
-		self.bRelativeSize = true
-	end
-	return true
-end
-
-function dxImage:color(r,g,b,a)
-	if not tonumber(r) then return unpack(self.tColor) end
-	g = g or self.tColor[2]
-	b = b or self.tColor[3]
-	a = a or self.tColor[4]
-	self.tColor = { r,g,b,a }
-	return true
-end
-
-function dxImage:rotation(rot,xoff,yoff)
-	if not tonumber(rot) then return self.fRot,self.fRotXOff,self.fRotYOff end
-	self.fRot = rot or self.fRot
-	self.fRotXOff = xoff or self.fRotXOff
-	self.fRotYOff = yoff or self.fRotYOff
-	return true
-end
-
-function dxImage:visible(bool)
-	if type(bool) ~= "boolean" then return self.bVisible end
-	self.bVisible = bool
-	if bool then
-		visibleImages[self] = true
-	else
-		visibleImages[self] = nil
-	end
-	return true
-end
-
-function dxImage:destroy()
-	self.bDestroyed = true
-	setmetatable( self, self )
-	return true
-end
-
-function dxImage:postGUI(bool)
-	if type(bool) ~= "boolean" then return self.bPostGUI end
-	self.bPostGUI = bool
-	return true
-end
-
-addEventHandler ( "onClientRender", getRootElement(),
-	function()
-		for self,_ in pairs(visibleImages) do
-			while true do
-				if self.bDestroyed then
-					visibleImages[self] = nil
-					break
-				end
-				local x,y,width,height = self.fX,self.fY,self.fWidth,self.fHeight
-				if self.bRelativePosition then
-					x = x/g_screenX
-					y = y/g_screenY
-				end
-				if self.bRelativeSize then
-					width = width/g_screenX
-					height = height/g_screenY
-				end
-				dxDrawImage ( x,y, width, height, self.strPath, self.fRot, self.fRotXOff, self.fRotYOff, tocolor(unpack(self.tColor)), self.bPostGUI )
-				break
-			end
-		end
-	end
-)
-
diff --git a/[gameplay]/killmessages/utils/textlib.lua b/[gameplay]/killmessages/utils/textlib.lua
deleted file mode 100644
index e72ea9eac..000000000
--- a/[gameplay]/killmessages/utils/textlib.lua
+++ /dev/null
@@ -1,335 +0,0 @@
-dxText = {}
-dxText_mt = { __index = dxText }
-local idAssign,idPrefix = 0,"c"
-local g_screenX,g_screenY = guiGetScreenSize()
-local visibleText = {}
-------
-local defaults = {
-	fX						= 0.5,
-	fY						= 0.5,
-	bRelativePosition				= true,
-	strText						= "",
-	bVerticalAlign 					= "center",
-	bHorizontalAlign 				= "center",
-	tColor 						= {255,255,255,255},
-	fScale 						= 1,
-	strFont 					= "default",
-	strType						= "normal",
-	tAttributes					= {},
-	bPostGUI 					= false,
-	bColorCoded					= true,
-	bClip 						= false,
-	bWordWrap	 				= true,
-	bVisible 					= true,
-	tBoundingBox					= false, --If a bounding box is not set, it will not be used.
-	bRelativeBoundingBox				= true,
-}
-
-local validFonts = {
-	default						= true,
-	["default-bold"]				= true,
-	clear						= true,
-	arial						= true,
-	pricedown					= true,
-	bankgothic					= true,
-	diploma						= true,
-	beckett						= true,
-}
-
-local validTypes = {
-	normal						= true,
-	shadow						= true,
-	border						= true,
-	stroke						= true, --Clone of border
-}
-
-local validAlignTypes = {
-	center						= true,
-	left						= true,
-	right						= true,
-}
-
-function dxText:create(text, x, y, relative)
-	assert(not self.fX, "attempt to call method 'create' (a nil value)")
-	if type(text) ~= "string" or not tonumber(x) or not tonumber(y) then
-		outputDebugString("dxText:create - Bad argument",0,112,112,112)
-		return false
-	end
-    local new = {}
-	setmetatable(new, dxText_mt)
-	--Add default settings
-	for i,v in pairs(defaults) do
-		new[i] = v
-	end
-	idAssign = idAssign+1
-	new.id = idPrefix..idAssign
-	new.strText = text or new.strText
-	new.fX = x or new.fX
-	new.fY = y or new.fY
-	if type(relative) == "boolean" then
-		new.bRelativePosition = relative
-	end
-	visibleText[new] = true
-	return new
-end
-
-function dxText:text(text)
-	if type(text) ~= "string" then return self.strText end
-	self.strText = text
-	return true
-end
-
-function dxText:position(x,y,relative)
-	if not tonumber(x) then return self.fX,self.fY end
-	self.fX = x
-	self.fY = y
-	if type(relative) == "boolean" then
-		self.bRelativePosition = relative
-	else
-		self.bRelativePosition = true
-	end
-	return true
-end
-
-function dxText:color(r,g,b,a)
-	if not tonumber(r) then return unpack(self.tColor) end
-	g = g or self.tColor[2]
-	b = b or self.tColor[3]
-	a = a or self.tColor[4]
-	self.tColor = {r,g,b,a}
-	return true
-end
-
-function dxText:scale(scale)
-	if not tonumber(scale) then return self.fScale end
-	self.fScale = scale
-	return true
-end
-
-function dxText:visible(bool)
-	if type(bool) ~= "boolean" then return self.bVisible end
-	self.bVisible = bool
-	if bool then
-		visibleText[self] = true
-	else
-		visibleText[self] = nil
-	end
-	return true
-end
-
-function dxText:destroy()
-	self.bDestroyed = true
-	setmetatable( self, self )
-	return true
-end
-
-function dxText:extent()
-	if self.bColorCoded then
-		text = string.gsub(self.strText,"#%x%x%x%x%x%x","")
-	else
-		text = self.strText
-	end
-	local extent = dxGetTextWidth(text,self.fScale,self.strFont)
-	if self.strType == "stroke" or self.strType == "border" then
-		extent = extent + self.tAttributes[1]
-	end
-	return extent
-end
-
-function dxText:height()
-	local height = dxGetFontHeight(self.fScale, self.strFont)
-	if self.strType == "stroke" or self.strType == "border" then
-		height = height + self.tAttributes[1]
-	end
-	return height
-end
-
-function dxText:font(font)
-	if not validFonts[font] then return self.strFont end
-	self.strFont = font
-	return true
-end
-
-function dxText:postGUI(bool)
-	if type(bool) ~= "boolean" then return self.bPostGUI end
-	self.bPostGUI = bool
-	return true
-end
-
-function dxText:clip(bool)
-	if type(bool) ~= "boolean" then return self.bClip end
-	self.bClip = bool
-	return true
-end
-
-function dxText:wordWrap(bool)
-	if type(bool) ~= "boolean" then return self.bWordWrap end
-	self.bWordWrap = bool
-	return true
-end
-
-function dxText:type(type,...)
-	if not validTypes[type] then return self.strType,unpack(self.tAttributes) end
-	self.strType = type
-	self.tAttributes = {...}
-	return true
-end
-
-function dxText:align(horzA, vertA)
-	if not validAlignTypes[horzA] then return self.bHorizontalAlign,self.bVerticalAlign end
-	vertA = vertA or self.bVerticalAlign
-	self.bHorizontalAlign,self.bVerticalAlign = horzA,vertA
-	return true
-end
-
-function dxText:boundingBox(left,top,right,bottom,relative)
-	if left == nil then
-		if self.tBoundingBox then
-			return unpack(boundingBox)
-		else
-			return false
-		end
-	elseif tonumber(left) and tonumber(right) and tonumber(top) and tonumber(bottom) then
-		self.tBoundingBox = {left,top,right,bottom}
-		if type(relative) == "boolean" then
-			self.bRelativeBoundingBox = relative
-		else
-			self.bRelativeBoundingBox = true
-		end
-	else
-		self.tBoundingBox = false
-	end
-	return true
-end
-
-function dxCreateCustomDX(text,left,top,right,bottom,color,scale,font,alignX,alignY,clip,wordBreak,postGUI)
-	if not text or not left or not top then
-		return false
-	end
-	local xOffset = nil
-	local fpat = "(.-)#(%x%x%x%x%x%x)"
-	local s,e,cap,col = text:find(fpat,1)
-	local last_end = 1
-	if not alignX then
-		alignX = "left"
-	elseif alignX == "center" then
-		xOffset = -(dxGetTextWidth(string.gsub(text,"#%x%x%x%x%x%x",""),scale,font)/2)
-	else
-		xOffset = 0
-	end
-	while s do
-		if cap == "" and col then
-			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
-		end
-		if s ~= 1 or cap ~= "" then
-			dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
-			xOffset = xOffset+dxGetTextWidth(cap,scale,font)
-			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
-		end
-		last_end = e+1
-		s,e,cap,col = text:find(fpat,last_end)
-	end
-	if last_end <= #text then
-		cap = text:sub(last_end)
-		dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
-		xOffset = xOffset+dxGetTextWidth(cap,scale,font)
-	end
-	return true
-end
-
-addEventHandler("onClientRender",getRootElement(),
-	function()
-		for self,_ in pairs(visibleText) do
-			while true do
-				if self.bDestroyed then
-					visibleText[self] = nil
-					break
-				end
-				local l,t,r,b
-				--If we arent using a bounding box
-				if not self.tBoundingBox then
-					--Decide if we use relative or absolute
-					local p_screenX,p_screenY = 1,1
-					if self.bRelativePosition then
-						p_screenX,p_screenY = g_screenX,g_screenY
-					end
-					local fX,fY = (self.fX)*p_screenX,(self.fY)*p_screenY
-					if self.bHorizontalAlign == "left" then
-						l = fX
-						r = fX + g_screenX
-					elseif self.bHorizontalAlign == "right" then
-						l = fX - g_screenX
-						r = fX
-					else
-						l = fX - g_screenX
-						r = fX + g_screenX
-					end
-					if self.bVerticalAlign == "top" then
-						t = fY
-						b = fY + g_screenY
-					elseif self.bVerticalAlign == "bottom" then
-						t = fY - g_screenY
-						b = fY
-					else
-						t = fY - g_screenY
-						b = fY + g_screenY
-					end
-				elseif type(self.tBoundingBox) == "table" then
-					local b_screenX,b_screenY = 1,1
-					if self.bRelativeBoundingBox then
-						b_screenX,b_screenY = g_screenX,g_screenY
-					end
-					l,t,r,b = self.tBoundingBox[1],self.tBoundingBox[2],self.tBoundingBox[3],self.tBoundingBox[4]
-					l = l*b_screenX
-					t = t*b_screenY
-					r = r*b_screenX
-					b = b*b_screenY
-				end
-				local type,att1,att2,att3,att4,att5 = self:type()
-				if type == "border" or type == "stroke" then
-					att2 = att2 or 0
-					att3 = att3 or 0
-					att4 = att4 or 0
-					att5 = att5 or self.tColor[4]
-					outlinesize = att1 or 2
-					outlinesize = math.min(self.fScale,outlinesize) --Make sure the outline size isnt thicker than the size of the label
-					if outlinesize > 0 then
-						for offsetX=-outlinesize,outlinesize,outlinesize do
-							for offsetY=-outlinesize,outlinesize,outlinesize do
-								if not offsetX == 0 and offsetY == 0 then
-									dxCreateCustomDX(self.strText,l+offsetX,t+offsetY,r+offsetX,b+offsetY,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-								end
-							end
-						end
-					end
-				elseif type == "shadow" then
-					local shadowDist = att1
-					att2 = att2 or 0
-					att3 = att3 or 0
-					att4 = att4 or 0
-					att5 = att5 or self.tColor[4]
-					dxCreateCustomDX(self.strText,l+shadowDist,t+shadowDist,r+shadowDist,b+shadowDist,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-				end
-				dxCreateCustomDX(self.strText,l,t,r,b,tocolor(unpack(self.tColor)),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
-				break
-			end
-		end
-	end
-)
-
-if addEvent("updateDisplays",true) then
-	addEventHandler("updateDisplays",getRootElement(),
-		function(self)
-			setmetatable(self,dxText_mt)
-			--Remove any old ones with the same id
-			for text,_ in pairs(visibleText) do
-				if text.id == self.id then
-					visibleText[text] = nil
-				end
-			end
-			if self.bVisible and not self.bDestroyed then
-				visibleText[self] = true
-			end
-		end
-	)
-end
diff --git a/[gameplay]/speedometer/client.lua b/[gameplay]/speedometer/client.lua
new file mode 100644
index 000000000..23fb392eb
--- /dev/null
+++ b/[gameplay]/speedometer/client.lua
@@ -0,0 +1,82 @@
+local screenW, screenH = guiGetScreenSize()
+
+local function dxDrawRelativeImage(startX, startY, width, height, image, rot, rotX, rotY, color, postGUI)
+    dxDrawImage(startX * screenW, startY * screenH, width * screenW, height * screenH, image, rot or 0, rotX or 0, rotY or 0, color, postGUI or false)
+end
+
+function drawSpeedo()
+    local veh = getPedOccupiedVehicle(localPlayer)
+    if not veh then return end
+
+    local velx, vely, velz = getElementVelocity(veh)
+    local speed = (velx ^ 2 + vely ^ 2 + velz ^ 2) ^ (0.5)
+
+    dxDrawRelativeImage(0.66, 0.61, 0.33, 0.49, "images/disc.png")
+    dxDrawRelativeImage(0.7825, 0.61, 0.2, 0.46, "images/needle.png", -146 + (speed * 180))
+end
+
+local isSpeedoShown = false
+function toggleRender(bool)
+    if bool then
+        isSpeedoShown = true
+        addEventHandler("onClientRender", root, drawSpeedo)
+    else
+        isSpeedoShown = false
+        removeEventHandler("onClientRender", root, drawSpeedo)
+    end
+end
+
+function toggleSpeedo()
+    toggleRender(not isSpeedoShown)
+end
+addCommandHandler("speedo", toggleSpeedo)
+
+local function enterHandler(theVehicle)
+    local vehType = getVehicleType(theVehicle)
+    if (vehType == "Plane") or (vehType == "Helicopter") then return end
+
+    if not isSpeedoShown then
+        toggleRender(true)
+    end
+end
+addEventHandler("onClientPlayerVehicleEnter", localPlayer, enterHandler)
+
+local function exitHandler(theVehicle)
+    local vehType = getVehicleType(theVehicle)
+    if (vehType == "Plane") or (vehType == "Helicopter") then return end
+
+    if isSpeedoShown then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientPlayerVehicleExit", localPlayer, exitHandler)
+
+local function destroyHandler()
+    if isSpeedoShown and (getElementType(source) == "vehicle") and (getPedOccupiedVehicle(localPlayer) == source) then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientVehicleExplode", root, destroyHandler)
+addEventHandler("onClientElementDestroy", root, destroyHandler)
+
+-- If player vehicle changes in abnormal way (e.g drives into a vehicle pick-up)
+local function onVehicleTypeChange(oldModel, newModel)
+    if (getElementType(source) ~= "vehicle") then return end
+
+    local newType = getVehicleType(newModel)
+
+    if isSpeedoShown and (newType == "Plane") or (newType == "Helicopter") then
+        toggleRender(false)
+    elseif not isSpeedoShown and (newType ~= "Plane") and (newType ~= "Helicopter") then
+        toggleRender(true)
+    end
+end
+addEventHandler("onClientElementModelChange", root, onVehicleTypeChange)
+
+-- Dying in vehicle, so not triggering onClientPlayerVehicleExit
+function integrityCheck()
+    if getPedOccupiedVehicle(localPlayer) and isSpeedoShown then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientPlayerWasted", localPlayer, integrityCheck)
diff --git a/[gameplay]/speedometer/images/disc.png b/[gameplay]/speedometer/images/disc.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d80f6a937d4ed6346ebc1328dc386d19bce79dc
GIT binary patch
literal 10990
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

literal 0
HcmV?d00001

diff --git a/[gameplay]/speedometer/images/needle.png b/[gameplay]/speedometer/images/needle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce2be4d1f957b903a9ced3d9cdabe2370f614d0c
GIT binary patch
literal 1560
zcmchX`&&|X9LK@RdJ->Zg@Nfz$`oCXgi}FttYDfmFU!*K5_!YC%wiT^LT6cUTweA}
z%?#1Xlr$|9FBCH@)5=n(l!#_G%b{XEmZC$^ed$lw5BvUd&Uw!FeBPh;>+?R}Y=2)*
z!}VtC5eS5#*IwFw1Of?ek%)Er;1c@FbtVF_=Cv1X_kk3o>OK;@TaDPV5_AfApw9qo
z`0s0rLb7VWb<#1XUG8=G4UPP}9@fN(&vLy>dH{zArnZS|jGkRfQcPeDx&}A31+&a}
zkvANN?er5)(<NAo7wFiqK~q6oU5Q!5#%y$gbpqKWbEDpB5(24LYPEpZNF7q{b>uHr
z%fx?hVOwv9T!});%i@o3fIf&%Ux^`Uzj1US+TyxcHWk7{oHAL6GAIuwwPoFE;J~Bl
z3H!P50x{Q<thRe<Okm@Sh_r_-;<41jd}iv|ur3H{&nb<XL7OHMu9`!vwUVBC&9@@?
z&dVsM&u7jgzbt%iUBOASE)yuIFX>`6Ie0DRmaGy5vD~v9lGxlPcU3?hEI#+Pg`O&?
z<YNN4@b!R^_K(I#TOTiNNe7>uG~<!)wRJ*O4lxBlnwgeI6t!tE8`hvRA(p*XNOEZ(
zno{}a!3+3`TOy6o(+U)xN_$@Y_1nM9CmjeY7Wze2xU{3YdS=MMJW|FEcTjWHthQvF
zJn%6R6$YNR<}77Z&eJ8ut-#Hx!Fi+jW4Adr6*}#^Y)7?a;L3w|YG?&8)Llg(k{=C?
znmb%a<iMM;X?Y6rz$5Y}Yn?wz)B@VHx1OE3*5L|ZCKmL?UO4>bWiHB|N;@H&BaDg~
zx0j4~NWYlKCp3M(NUv(?6QZD*pEWC8&vw-@h^#e+(J&l>U3QD<t^eexw$mBO=vl@N
zyoyRaYoY7NOgi>hZ&J9RWH#IC>VDp6Gj>#4R=~ItgvCYJXL(9(5tflxcNYU0Uk^rf
z^yz`t9Q1yK2Td^XNELE<?%0K7VvRY3M;H?_%I3V7EkrP?o!?J~SM|y=^5he<pzO<M
zZ^n(h&ljmTl-A1pftPbrmh51yIAC&<3S>i^pKd9;6#2oq8ITV38ci-ebS?eThj{D(
zur>Qt@juEvmF|l0u{aGt-%LFITZciB`u?Tt#4nht?@W&P-Y91e4bny4Slrd!@)TY+
zGkP>sI1uLKR%nI0t2oiftf9wBAHO3|f#)FEd}#MRQGeO{C>P!IT5fA|jh=S@xEP-I
zd>oJ-Y+v?sZR%kUrJT(I6O@K8ISx(VCO&`x0{P(VY8!qdBO+t792n!2-;W*RH<mLs
zc4<H<k@=oc%jxPYFt=A49H*%wrUB{bDNj{hKsJ1yVVuh=A@yob)vBUs0B+`T<UW_!
zmE5HEgrB%DCPHc5;~ZOlM6-DoOqi2Dy!@o!vzGFZCg9>|G`agOQt!~;$&|=*+u9%&
zI+waHqq7qm=&7g!;kRhzU5xAhu0t{1;Dg1z3)B~0boW~%$QVLDAmmnYtUj$wZAoHb
z4I$Qyq;LY+`6@<B4PGQ4+Ka?M#iH>R^Z14tXZv|V4akp=W_x@UzesIRI?`nd0u;_=
zjMvY0tW&DyP{6b*O3vZE_$(O8XD!{Bg@G}_%|&d8^0{W|;|?JRa$;K9yNAEJHBprH
z%>^TXunXaMp#sco(#e~0L;^4xabHK=p~q5&!`UzrC_rrKlQ>a-M#C7*YU^c)g%6X~
zlq@i!E9i=pKbcEk+3DIo(<yTb*km{5XIB^IBmq%ymMx+J3~I~Yzx2@&6zAM@!=&d>
zM!J_>`GwZtCp}@ajPF|+&RV5Acfr{z_wYaX|1LBpf|Dqxss*|RyngVd-Q08J%)fHD
Bx*-4n

literal 0
HcmV?d00001

diff --git a/[gameplay]/speedometer/meta.xml b/[gameplay]/speedometer/meta.xml
new file mode 100644
index 000000000..c868b138f
--- /dev/null
+++ b/[gameplay]/speedometer/meta.xml
@@ -0,0 +1,6 @@
+<meta>
+	<info author="MTA contributors (github.com/multitheftauto/mtasa-resources)" version="1.0" type="script" description="Basic speedometer" />
+	<file src="images/disc.png" />
+	<file src="images/needle.png" />
+	<script src="client.lua" type="client" />
+</meta>
\ No newline at end of file

From 1e87a32c563a7b139bd98a5a9a237effc9f036bd Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 08:02:12 -0300
Subject: [PATCH 21/26] Revert "Revert "Revert "Merge branch 'master' of
 https://github.com/iDannz1/mtasa-resources into admin-replace-give-admin"""

This reverts commit 3de44da8e3a520b2941d5ee10a7af621d99c6a99.
---
 [admin]/admin/client/gui/admin_main.lua       |   4 +-
 [gameplay]/killmessages/definitions.lua       | 519 ++++++++++++++++++
 [gameplay]/killmessages/gui.lua               | 271 +++++++++
 .../killmessages/killmessages_client.lua      |  55 ++
 .../killmessages/killmessages_server.lua      | 192 +++++++
 [gameplay]/killmessages/meta.xml              | 257 ++++-----
 .../scripts/client/c.killmessages.lua         | 160 ------
 .../scripts/client/c.settings.lua             |  16 -
 .../killmessages/scripts/client/c.ui.lua      | 112 ----
 .../killmessages/scripts/client/c.utils.lua   | 202 -------
 .../scripts/server/s.killmessages.lua         | 171 ------
 .../scripts/server/s.settings.lua             |  28 -
 [gameplay]/killmessages/utils/imagelib.lua    | 140 +++++
 [gameplay]/killmessages/utils/textlib.lua     | 335 +++++++++++
 [gameplay]/speedometer/client.lua             |  82 ---
 [gameplay]/speedometer/images/disc.png        | Bin 10990 -> 0 bytes
 [gameplay]/speedometer/images/needle.png      | Bin 1560 -> 0 bytes
 [gameplay]/speedometer/meta.xml               |   6 -
 18 files changed, 1636 insertions(+), 914 deletions(-)
 create mode 100644 [gameplay]/killmessages/definitions.lua
 create mode 100644 [gameplay]/killmessages/gui.lua
 create mode 100644 [gameplay]/killmessages/killmessages_client.lua
 create mode 100644 [gameplay]/killmessages/killmessages_server.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.settings.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.ui.lua
 delete mode 100644 [gameplay]/killmessages/scripts/client/c.utils.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.killmessages.lua
 delete mode 100644 [gameplay]/killmessages/scripts/server/s.settings.lua
 create mode 100644 [gameplay]/killmessages/utils/imagelib.lua
 create mode 100644 [gameplay]/killmessages/utils/textlib.lua
 delete mode 100644 [gameplay]/speedometer/client.lua
 delete mode 100644 [gameplay]/speedometer/images/disc.png
 delete mode 100644 [gameplay]/speedometer/images/needle.png
 delete mode 100644 [gameplay]/speedometer/meta.xml

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 7dc143a96..035f00213 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -1391,7 +1391,7 @@ end
 
 -- anon admin
 function isAnonAdmin()
-	return (isElement(aTab1.AnonAdmin) and guiCheckBoxGetSelected ( aTab1.AnonAdmin )) or getElementData(localPlayer, 'AnonAdmin')
+	return guiCheckBoxGetSelected ( aTab1.AnonAdmin )
 end
 
 function setAnonAdmin( bOn )
@@ -1402,7 +1402,7 @@ end
 
 -- sensitive data
 function isSensitiveDataHidden()
-	return isElement(aTab1.HideSensitiveData) and guiCheckBoxGetSelected(aTab1.HideSensitiveData)
+	return guiCheckBoxGetSelected(aTab1.HideSensitiveData)
 end
 
 function setHideSensitiveData( bOn )
diff --git a/[gameplay]/killmessages/definitions.lua b/[gameplay]/killmessages/definitions.lua
new file mode 100644
index 000000000..932eaac32
--- /dev/null
+++ b/[gameplay]/killmessages/definitions.lua
@@ -0,0 +1,519 @@
+iconWidths = {
+[0] = 21,
+[1] = 15,
+[2] = 97,
+[3] = 55,
+[4] = 83,
+[5] = 72,
+[6] = 55,
+[7] = 138,
+[8] = 104,
+[9] = 59,
+[10] =40,
+[11] =31,
+[12] =41,
+[14] =10,
+[15] =71,
+[16] =13,
+[17] =10,
+[18] =4,
+[19] =17,
+[22] =35,
+[23] =50,
+[24] =37,
+[25] =75,
+[26] =67,
+[27] =66,
+[28] =17,
+[29] =35,
+[30] =70,
+[31] =71,
+[32] =22,
+[33] =75,
+[34] =86,
+[35] =74,
+[36] =75,
+[37] =19,
+[38] =54,
+[39] =8,
+[42] = 14,
+[49] = 86,
+[50] = 34,
+[51] = 17,
+[53] = 22,
+[54] = 15,
+[255] = 17,
+[256] = 20,
+[406] = 42,
+[408] = 47,
+[416] = 46,
+[417] = 33,
+[423] = 31,
+[424] = 39,
+[427] = 52,
+[428] = 43,
+[429] = 51,
+[432] = 61,
+[433] = 56,
+[434] = 45,
+[441] = 50,
+[443] = 49,
+[448] = 31,
+[457] = 26,
+[460] = 50,
+[462] = 27,
+[463] = 37,
+[464] = 43,
+[468] = 36,
+[470] = 49,
+[471] = 30,
+[480] = 52,
+[485] = 45,
+[486] = 39,
+[508] = 45,
+[511] = 49,
+[512] = 37,
+[513] = 48,
+[520] = 61,
+[524] = 41,
+[528] = 49,
+[530] = 27,
+[531] = 40,
+[532] = 42,
+[539] = 46,
+[564] = 48,
+[568] = 47,
+[571] = 41,
+[572] = 32,
+[573] = 37,
+[574] = 30,
+[578] = 37,
+[588] = 35,
+[593] = 40,
+[599] = 43,
+[601] = 48,
+--
+[400]=36,
+[401]=36,
+[402]=36,
+[403]=36,
+[404]=36,
+[405]=36,
+[409]=36,
+[410]=36,
+[411]=36,
+[412]=36,
+[413]=36,
+[415]=36,
+[418]=36,
+[419]=36,
+[420]=36,
+[421]=36,
+[422]=36,
+[426]=36,
+[435]=36,
+[436]=36,
+[438]=36,
+[439]=36,
+[445]=36,
+[449]=36,
+[450]=36,
+[451]=36,
+[458]=36,
+[466]=36,
+[467]=36,
+[474]=36,
+[475]=36,
+[477]=36,
+[478]=36,
+[479]=36,
+[489]=36,
+[490]=36,
+[491]=36,
+[492]=36,
+[494]=36,
+[495]=36,
+[496]=36,
+[500]=36,
+[503]=36,
+[504]=36,
+[505]=36,
+[506]=36,
+[507]=36,
+[516]=36,
+[517]=36,
+[518]=36,
+[525]=36,
+[526]=36,
+[527]=36,
+[529]=36,
+[533]=36,
+[534]=36,
+[535]=36,
+[536]=36,
+[540]=36,
+[541]=36,
+[542]=36,
+[543]=36,
+[545]=36,
+[546]=36,
+[547]=36,
+[549]=36,
+[550]=36,
+[551]=36,
+[552]=36,
+[554]=36,
+[555]=36,
+[558]=36,
+[559]=36,
+[560]=36,
+[561]=36,
+[562]=36,
+[565]=36,
+[566]=36,
+[567]=36,
+[575]=36,
+[576]=36,
+[579]=36,
+[580]=36,
+[583]=36,
+[584]=36,
+[585]=36,
+[587]=36,
+[589]=36,
+[591]=36,
+[594]=36,
+[600]=36,
+[602]=36,
+[603]=36,
+[604]=36,
+[605]=36,
+[606]=36,
+[607]=36,
+[608]=36,
+[610]=36,
+[611]=36,
+--
+[431]=44,
+[437]=44,
+[430]=61,
+[446]=61,
+[452]=61,
+[453]=61,
+[454]=61,
+[472]=61,
+[473]=61,
+[484]=61,
+[493]=61,
+[595]=61,
+[414]=37,
+[456]=37,
+[498]=37,
+[499]=37,
+[609]=37,
+[440]=46,
+[459]=46,
+[482]=46,
+[483]=46,
+[582]=46,
+[447]=39,
+[469]=39,
+[487]=42,
+[488]=42,
+[497]=42,
+[548]=42,
+[563]=42,
+[465]=32,
+[501]=32,
+[481]=30,
+[509]=30,
+[510]=30,
+[514]=46,
+[515]=46,
+[461]=35,
+[521]=35,
+[522]=35,
+[523]=35,
+[581]=35,
+[586]=35,
+[537]=41,
+[569]=41,
+[570]=41,
+[590]=41,
+[407]=55,
+[544]=55,
+[519]=44,
+[553]=44,
+[577]=44,
+[592]=44,
+[444]=39,
+[556]=39,
+[557]=39,
+[596]=48,
+[597]=48,
+[598]=48,
+[425]=34,
+--
+[999] = 20
+}
+--49 rammed, 50 heli blades, 53 drowning,  54 fall, 31 seaskimmer/rustler/rcbaron, hunter 38, death in vehicle no id, 52 predator
+--kill in vehicle, warp to driver
+
+icons = {
+[0] =  "icons/fist.png",
+[1] =  "icons/brassknuckle.png",
+[2] =  "icons/golfclub.png",
+[3] =  "icons/nitestick.png",
+[4] =  "icons/knifecur.png",
+[5] =  "icons/bat.png",
+[6] =  "icons/shovel.png",
+[7] =  "icons/poolcue.png",
+[8] =  "icons/katana.png",
+[9] =  "icons/chnsaw.png",
+[10] =  "icons/gun_dildo1.png",
+[11] =  "icons/gun_dildo2.png",
+[12] =  "icons/gun_vibe1.png",
+[14] =  "icons/flowera.png",
+[15] =  "icons/gun_cane.png",
+[16] =  "icons/grenade.png",
+[17] =  "icons/teargas.png",
+[18] =  "icons/molotov.png",
+[19] =  "icons/explosion.png",
+[22] =  "icons/colt45.png",
+[23] =  "icons/Silenced.png",
+[24] =  "icons/desert_eagle.png",
+[25] =  "icons/chromegun.png",
+[26] =  "icons/sawnoff.png",
+[27] =  "icons/shotgspa.png",
+[28] =  "icons/micro_uzi.png",
+[29] =  "icons/mp5lng.png",
+[30] =  "icons/ak47.png",
+[31] =  "icons/m4.png",
+[32] =  "icons/tec9.png",
+[33] =  "icons/cuntgun.png",
+[34] =  "icons/sniper.png",
+[35] =  "icons/rocketla.png",
+[36] =  "icons/heatseek.png",
+[37] =  "icons/flame.png",
+[38] =  "icons/minigun.png",
+[39] =  "icons/satchel.png",
+[42] =  "icons/fireextinguisher.png",
+[49] =  "icons/rammed.png",
+[50] =  "icons/maverick.png",
+[51] =  "icons/explosion.png",
+[53] =  "icons/drowned.png",
+[54] =  "icons/fall.png",
+[255] = "icons/suicide.png",
+[256] = "icons/headshot.png",
+-----------vehicle specific icons, according to their vehicle id---------
+[400]="icons/cars.png",
+[401]="icons/cars.png",
+[402]="icons/cars.png",
+[403]="icons/cars.png",
+[404]="icons/cars.png",
+[405]="icons/cars.png",
+[409]="icons/cars.png",
+[410]="icons/cars.png",
+[411]="icons/cars.png",
+[412]="icons/cars.png",
+[413]="icons/cars.png",
+[415]="icons/cars.png",
+[418]="icons/cars.png",
+[419]="icons/cars.png",
+[420]="icons/cars.png",
+[421]="icons/cars.png",
+[422]="icons/cars.png",
+[426]="icons/cars.png",
+[435]="icons/cars.png",
+[436]="icons/cars.png",
+[438]="icons/cars.png",
+[439]="icons/cars.png",
+[445]="icons/cars.png",
+[449]="icons/cars.png",
+[450]="icons/cars.png",
+[451]="icons/cars.png",
+[458]="icons/cars.png",
+[466]="icons/cars.png",
+[467]="icons/cars.png",
+[474]="icons/cars.png",
+[475]="icons/cars.png",
+[477]="icons/cars.png",
+[478]="icons/cars.png",
+[479]="icons/cars.png",
+[489]="icons/cars.png",
+[490]="icons/cars.png",
+[491]="icons/cars.png",
+[492]="icons/cars.png",
+[494]="icons/cars.png",
+[495]="icons/cars.png",
+[496]="icons/cars.png",
+[500]="icons/cars.png",
+[503]="icons/cars.png",
+[504]="icons/cars.png",
+[505]="icons/cars.png",
+[506]="icons/cars.png",
+[507]="icons/cars.png",
+[516]="icons/cars.png",
+[517]="icons/cars.png",
+[518]="icons/cars.png",
+[525]="icons/cars.png",
+[526]="icons/cars.png",
+[527]="icons/cars.png",
+[529]="icons/cars.png",
+[533]="icons/cars.png",
+[534]="icons/cars.png",
+[535]="icons/cars.png",
+[536]="icons/cars.png",
+[540]="icons/cars.png",
+[541]="icons/cars.png",
+[542]="icons/cars.png",
+[543]="icons/cars.png",
+[545]="icons/cars.png",
+[546]="icons/cars.png",
+[547]="icons/cars.png",
+[549]="icons/cars.png",
+[550]="icons/cars.png",
+[551]="icons/cars.png",
+[552]="icons/cars.png",
+[554]="icons/cars.png",
+[555]="icons/cars.png",
+[558]="icons/cars.png",
+[559]="icons/cars.png",
+[560]="icons/cars.png",
+[561]="icons/cars.png",
+[562]="icons/cars.png",
+[565]="icons/cars.png",
+[566]="icons/cars.png",
+[567]="icons/cars.png",
+[575]="icons/cars.png",
+[576]="icons/cars.png",
+[579]="icons/cars.png",
+[580]="icons/cars.png",
+[583]="icons/cars.png",
+[584]="icons/cars.png",
+[585]="icons/cars.png",
+[587]="icons/cars.png",
+[589]="icons/cars.png",
+[591]="icons/cars.png",
+[594]="icons/cars.png",
+[600]="icons/cars.png",
+[602]="icons/cars.png",
+[603]="icons/cars.png",
+[604]="icons/cars.png",
+[605]="icons/cars.png",
+[606]="icons/cars.png",
+[607]="icons/cars.png",
+[608]="icons/cars.png",
+[610]="icons/cars.png",
+[611]="icons/cars.png",
+--
+[431]="icons/bus.png",
+[437]="icons/bus.png",
+[430]="icons/boat.png",
+[446]="icons/boat.png",
+[452]="icons/boat.png",
+[453]="icons/boat.png",
+[454]="icons/boat.png",
+[472]="icons/boat.png",
+[473]="icons/boat.png",
+[484]="icons/boat.png",
+[493]="icons/boat.png",
+[595]="icons/boat.png",
+[414]="icons/boxtruck.png",
+[456]="icons/boxtruck.png",
+[498]="icons/boxtruck.png",
+[499]="icons/boxtruck.png",
+[609]="icons/boxtruck.png",
+[440]="icons/roundvan.png",
+[459]="icons/roundvan.png",
+[482]="icons/roundvan.png",
+[483]="icons/roundvan.png",
+[582]="icons/roundvan.png",
+[447]="icons/sparrow.png",
+[469]="icons/sparrow.png",
+[487]="icons/maverick.png",
+[488]="icons/maverick.png",
+[497]="icons/maverick.png",
+[548]="icons/maverick.png",
+[563]="icons/maverick.png",
+[465]="icons/rccopter.png",
+[501]="icons/rccopter.png",
+[481]="icons/bike.png",
+[509]="icons/bike.png",
+[510]="icons/bike.png",
+[514]="icons/bigtruck.png",
+[515]="icons/bigtruck.png",
+[461]="icons/crotchrocket.png",
+[521]="icons/crotchrocket.png",
+[522]="icons/crotchrocket.png",
+[523]="icons/crotchrocket.png",
+[581]="icons/crotchrocket.png",
+[586]="icons/crotchrocket.png",
+[537]="icons/train.png",
+[569]="icons/train.png",
+[570]="icons/train.png",
+[590]="icons/train.png",
+[407]="icons/firetruck.png",
+[544]="icons/firetruck.png",
+[519]="icons/plane.png",
+[553]="icons/plane.png",
+[577]="icons/plane.png",
+[592]="icons/plane.png",
+[444]="icons/monstertruck.png",
+[556]="icons/monstertruck.png",
+[557]="icons/monstertruck.png",
+[596]="icons/copcar.png",
+[597]="icons/copcar.png",
+[598]="icons/copcar.png",
+[425]="icons/hunter.png",
+--
+[406]="icons/406.png",
+[408]="icons/408.png",
+[416]="icons/416.png",
+[417]="icons/417.png",
+[423]="icons/423.png",
+[424]="icons/424.png",
+[427]="icons/427.png",
+[428]="icons/428.png",
+[429]="icons/429.png",
+[432]="icons/432.png",
+[433]="icons/433.png",
+[434]="icons/434.png",
+[441]="icons/441.png",
+[443]="icons/443.png",
+[448]="icons/448.png",
+[457]="icons/457.png",
+[460]="icons/460.png",
+[462]="icons/462.png",
+[463]="icons/463.png",
+[464]="icons/464.png",
+[468]="icons/468.png",
+[470]="icons/470.png",
+[471]="icons/471.png",
+[480]="icons/480.png",
+[485]="icons/485.png",
+[486]="icons/486.png",
+[508]="icons/508.png",
+[511]="icons/511.png",
+[512]="icons/512.png",
+[513]="icons/513.png",
+[520]="icons/520.png",
+[524]="icons/524.png",
+[528]="icons/528.png",
+[530]="icons/530.png",
+[531]="icons/531.png",
+[532]="icons/532.png",
+[539]="icons/539.png",
+[564]="icons/564.png",
+[568]="icons/568.png",
+[571]="icons/571.png",
+[572]="icons/572.png",
+[573]="icons/573.png",
+[574]="icons/574.png",
+[578]="icons/578.png",
+[588]="icons/588.png",
+[593]="icons/593.png",
+[599]="icons/599.png",
+--
+[999]="icons/generic.png"
+}
diff --git a/[gameplay]/killmessages/gui.lua b/[gameplay]/killmessages/gui.lua
new file mode 100644
index 000000000..96b00722a
--- /dev/null
+++ b/[gameplay]/killmessages/gui.lua
@@ -0,0 +1,271 @@
+local customKills = {}
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconPosOffY"] = -10,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local endTime
+local screenX,screenY = guiGetScreenSize ()
+local contentMessages = {}
+local fadingLines = {}
+---
+local iconOrder = {}
+
+
+function setupTextOnStart ( resource )
+	if resource ~= getThisResource() then return end
+	triggerServerEvent ( "onClientKillmessagesLoaded", getLocalPlayer() )
+end
+addEventHandler ( "onClientResourceStart", getRootElement(), setupTextOnStart )
+
+addEvent ("doSetKillMessageStyle",true)
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then align = default.align end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	if #contentMessages ~= 0 then
+		for i=1,config.lines do
+			if contentMessages[i] then
+				destroyLine ( i )
+			end
+		end
+	end
+	fadingLines = {}
+	killMessages = {}
+	if ( config.startY < 0 ) then
+		config.startY = screenY - math.abs(config.startY*screenY) - (config.iconHeight*config.lines)
+		config.startY = config.startY/screenY
+	end
+	createKillMessageGUI()
+	return true
+end
+addEventHandler ( "doSetKillMessageStyle",getRootElement(),setKillMessageStyle)
+
+function createKillMessageGUI()
+	local gap = config.iconHeight - config.textHeight
+	gap = gap/2
+	for i=1,config.lines do
+		local y = config.startY*screenY + (config.iconHeight*(i-1))
+		y = y + gap
+		contentMessages[i] = { dxText:create("",0,y) }
+	end
+	endTime = config.fadeTime + config.startFade
+end
+
+function shiftUpGUI()
+	local i = 1
+	for i=config.lines,2,-1 do
+		local y = config.startY*screenY + (config.iconHeight*(i-1)) + (config.iconHeight - config.textHeight)/2
+		local targetY = config.startY*screenY + (config.iconHeight*(i-2)) + (config.iconHeight - config.textHeight)/2
+		if contentMessages[i] then
+			for k,part in ipairs(contentMessages[i]) do
+				local x,realY = getWidgetPosition(part)
+
+				local diffY = realY - y
+				setWidgetPosition(part,x,targetY + diffY)
+			end
+		end
+	end
+	for i=1,config.lines-1 do
+		---shift up the alpha too
+		local tick = fadingLines[i+1]
+		fadingLines[i] = tick
+		fadingLines[i+1] = nil
+	end
+end
+
+addEvent ( "doOutputMessage", true )
+function outputMessage ( message, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if type(font) ~= "string" then
+		font = "default"
+	end
+	r = tonumber(r) or 255
+	g = tonumber(g) or 255
+	b = tonumber(b) or 255
+	---shift everything up
+	shiftUpGUI()
+	--Delete the first line
+	destroyLine (1)
+	table.remove ( contentMessages, 1 )
+	if type(message) == "string" then
+		message = {message}
+	end
+	local y = config.startY*screenY + (config.iconHeight*(config.lines-1)) + (config.iconHeight - config.textHeight)/2
+	local startX = config.startX
+	if startX < 1 and startX > -1 then --auto calculate whether its relative or absolute
+		startX = screenX/startX --make it relative
+	end
+	if startX < 0 then
+		startX = screenX + startX
+	end
+
+	for i,part in ipairs(message) do
+		if type(part) == "table" and part[1] == "image" then
+			if not part.resource and not part.resourceName then
+				part.resource = sourceResource
+			end
+		end
+	end
+
+	drawLine ( message, startX, y, config.align, config.lines, r, g, b, font, 1 )
+	fadeLine ( config.lines )
+end
+addEventHandler ( "doOutputMessage", getRootElement(), outputMessage )
+
+function drawLine ( message, x,y, align, line, r, g, b, font, scale )
+	--First draw it and work out the width
+	local width = 0
+	contentMessages[line] = {}
+	for i,part in ipairs(message) do
+		if type(part) == "string" then
+			local text = dxText:create ( part, width, y, false )
+			text:font ( font )
+			text:scale ( scale )
+			text:type("shadow",1)
+			text:align"left"
+			text:color ( r,g,b )
+			table.insert ( contentMessages[line], text )
+			width = width + text:extent()
+		elseif part[1] == "icon" then
+			local iconWidth = part.width or iconWidths[part.id or -1] or iconWidths[255]
+			local iconHeight = part.height or config.iconHeight
+			local image = dxImage:create ( icons[part.id or 0] or icons[255], width, y + (part.posOffY or config.iconPosOffY), iconWidth, iconHeight, false )
+			image:color ( part.r or 255, part.g or 255, part.b or 255 )
+			image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+			width = width + iconWidth
+			table.insert ( contentMessages[line], image )
+		elseif part[1] == "image" then
+			if part.width and part.path then
+				if part.resourceName then
+					part.resource = getResourceFromName(tostring(part.resourceName)) or part.resource
+				end
+				local image = dxImage:create ( ":"..getResourceName(part.resource).."/"..part.path, width, y + (part.posOffY or config.iconPosOffY), part.width, part.height or config.iconHeight, false )
+				image:color ( part.r or 255, part.g or 255, part.b or 255 )
+				image:rotation ( part.rot or 0, part.rotOffX or 0, part.rotOffY or 0 )
+				width = width + part.width
+				table.insert ( contentMessages[line], image )
+			end
+		elseif part[1] == "color" or part[1] == "colour" then
+			r = part.r or r
+			g = part.g or g
+			b = part.b or b
+		elseif part[1] == "padding" then
+			width = width + part.width or 0
+		end
+		contentMessages[line].scale = scale
+	end
+	--Now reposition everything properly
+	if align == "center" or align == "centre" then
+		x = x - width/2
+	elseif align == "right" then
+		x = x - width
+	end
+	for i,widget in ipairs(contentMessages[line]) do
+		local wx,wy = getWidgetPosition ( widget )
+		setWidgetPosition ( widget, x + wx, wy )
+	end
+	return true
+end
+
+function fadeLine ( line )
+	setLineAlpha ( line, 1 )
+	fadingLines[line] = getTickCount()
+end
+-----
+addEventHandler ( "onClientRender",getRootElement(),
+function()
+	for line,originalTick in pairs(fadingLines) do
+		local tickDifference = getTickCount() - originalTick
+		if tickDifference > endTime then
+			destroyLine ( line )
+			setLineAlpha ( line, 1 )
+			fadingLines[line] = nil
+		elseif tickDifference >  config.startFade then
+			local fadeTimeDifference = tickDifference - config.startFade
+			--calculate the alpha
+			local newAlpha = 1 - fadeTimeDifference/config.fadeTime
+			--Set all the alphas
+			setLineAlpha ( line, newAlpha )
+		end
+	end
+end )
+
+function setLineAlpha ( line, alpha )
+	for i,part in ipairs(contentMessages[line]) do
+		setWidgetAlpha ( part, alpha )
+	end
+end
+
+function destroyLine ( line )
+	for k,part in ipairs(contentMessages[line]) do
+		destroyWidget(part)
+	end
+	contentMessages[line] = {}
+end
+
+function destroyWidget ( widget )
+	if isElement(widget) then
+		destroyElement ( widget )
+	elseif type(widget) == "table" and widget.destroy then
+		widget:destroy()
+	end
+end
+
+function getWidgetPosition ( widget )
+	if isElement(widget) then
+		return guiGetPosition ( widget, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position()
+	end
+end
+
+function setWidgetPosition ( widget, x, y )
+	if isElement(widget) then
+		return guiSetPosition ( widget, x, y, false )
+	elseif type(widget) == "table" and widget.position then
+		return widget:position(x,y,false)
+	end
+end
+
+function setWidgetAlpha ( widget, alpha )
+	if isElement(widget) then
+		guiSetAlpha ( widget, alpha )
+	elseif type(widget) == "table" and widget.color then
+		local r,g,b = widget:color()
+		widget:color(r,g,b,alpha*255)
+	end
+end
diff --git a/[gameplay]/killmessages/killmessages_client.lua b/[gameplay]/killmessages/killmessages_client.lua
new file mode 100644
index 000000000..0907c2d4b
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_client.lua
@@ -0,0 +1,55 @@
+addEvent ("onClientPlayerKillMessage",true)
+function onClientPlayerKillMessage ( killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+	if wasEventCancelled() then return end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+end
+addEventHandler ("onClientPlayerKillMessage",getRootElement(),onClientPlayerKillMessage)
+
+function outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if not iconWidths[weapon] then
+		if type(weapon) ~= "string" then
+			weapon = 999
+		end
+	end
+	local killerName
+	local wastedName
+	if not tonumber(wr) then wr = 255 end
+	if not tonumber(wg) then wg = 255 end
+	if not tonumber(wb) then wb = 255 end
+	if not tonumber(kr) then kr = 255 end
+	if not tonumber(kg) then kg = 255 end
+	if not tonumber(kb) then kb = 255 end
+	if ( source ) then
+		if isElement ( source ) then
+			if getElementType ( source ) == "player" then
+				wastedName = getPlayerName ( source )
+			else
+			outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+			return false end
+		elseif type(source) == "string" then
+			wastedName = source
+		end
+	else
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+	return false end
+	if ( killer ) then
+		if isElement ( killer ) then
+			if getElementType ( killer ) == "player" then
+				killerName = getPlayerName ( killer )
+			else
+				outputDebugString ( "outputKillMessage - Invalid 'killer' player specified",0,0,0,100)
+			return false end
+		elseif type(killer) == "string" then
+			killerName = killer
+		else
+			killerName = ""
+		end
+	else killerName = "" end
+	--create the new text
+	if not killerName then
+		killerName = ""
+	end
+	return outputMessage ( {killerName, {"padding",width=3}, {"icon",id=weapon},
+		{"padding",width=3},{"color",r=wr,g=wg,b=wb}, wastedName},
+		kr,kg,kb )
+end
diff --git a/[gameplay]/killmessages/killmessages_server.lua b/[gameplay]/killmessages/killmessages_server.lua
new file mode 100644
index 000000000..9c910d651
--- /dev/null
+++ b/[gameplay]/killmessages/killmessages_server.lua
@@ -0,0 +1,192 @@
+local config = {
+["lines"] = 5,
+["startY"] = 0.35,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+local default = {
+["lines"] = 5,
+["startY"] = 0.25,
+["textHeight"] = 16,
+["iconHeight"] = 20,
+["iconSpacing"] = 4,
+["defaultWeapon"] = 255,
+["fadeTime"] = 5000,
+["startFade"] = 15000,
+["align"] = "right",
+["startX"] = -10
+}
+
+function KillMessages_onPlayerWasted(totalammo, killer, killerweapon, bodypart)
+	local usedVehicle = nil
+	local killerType = nil
+	local killerweapon = killerweapon or 255
+	-- In very rare cases killer isn't nil or false but isn't an element.
+	if (killer and not isElement(killer)) then
+		killer = nil
+	end
+	if (killer) then
+		killerType = getElementType(killer)
+	end
+	-- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
+	if (killerType == "player") then
+		local vehicle = getPedOccupiedVehicle(killer)
+		if (vehicle and getPedWeapon(killer) == 0) then
+			usedVehicle = getElementModel(vehicle)
+		end
+	end
+	-- Change the killer into the vehicle controller
+	if (killer and killerType == "vehicle") then
+		usedVehicle = getElementModel(killer)
+		killer = getVehicleController(killer) or killer
+		killerType = getElementType(killer)
+	end
+	-- If killed by rocket and was on foot player turn it into their current weapon
+	if (killerweapon == 19 and killerType == "player" and not isPedInVehicle(killer)) then
+		killerweapon = getPedWeapon(killer) or 51
+	end
+	-- Got a killer? Print the normal "* X died" if not
+	if (killer and killerType == "player") then
+		local kr, kg, kb = getPlayerNametagColor(killer)
+		if (getPlayerTeam(killer)) then
+			kr, kg, kb = getTeamColor(getPlayerTeam(killer))
+		end
+		-- Suicide?
+		if (source == killer) then
+			local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+			--outputDebugString("Cancelled: "..tostring(triggered))
+			if (triggered) then
+				eventTriggered(source, false, killerweapon, bodypart, true, usedVehicle)
+				return
+			end
+		end
+		local triggered = triggerEvent("onPlayerKillMessage", source, killer, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, killer, killerweapon, bodypart, false, usedVehicle)
+		end
+	else
+		local triggered = triggerEvent("onPlayerKillMessage", source, false, killerweapon, bodypart)
+		--outputDebugString("Cancelled: "..tostring(triggered))
+		if (triggered) then
+			eventTriggered(source, false, killerweapon, bodypart, false, usedVehicle)
+		end
+	end
+end
+addEventHandler("onPlayerWasted", root, KillMessages_onPlayerWasted)
+
+addEvent ( "onPlayerKillMessage" )
+function eventTriggered ( source,killer,weapon,bodypart,suicide,usedVehicle )
+	local wr,wg,wb = getPlayerNametagColor	( source )
+	if getPlayerTeam ( source ) then
+		wr,wg,wb = getTeamColor ( getPlayerTeam ( source ) )
+	end
+	local kr,kg,kb = false,false,false
+	if ( killer ) then
+		kr,kg,kb = getPlayerNametagColor	( killer )
+		if getPlayerTeam ( killer ) then
+			kr,kg,kb = getTeamColor ( getPlayerTeam ( killer ) )
+		end
+	end
+	if ( usedVehicle ) then
+		weapon = usedVehicle
+	end
+	outputKillMessage ( source, wr,wg,wb,killer,kr,kg,kb,weapon )
+	--
+	local extra = ""
+	if ( usedVehicle ) then
+	extra = " (Vehicle)"
+	end
+	if ( killer ) then
+		if suicide then
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself. ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(source).." killed himself."..extra )
+			end
+		else
+			local weaponName = getWeaponNameFromID ( weapon )
+			if weaponName then
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source)..". ("..weaponName..")" )
+			else
+				outputConsoleKillMessage ( "* "..getPlayerName(killer).." killed "..getPlayerName(source).."."..extra )
+			end
+		end
+	else
+		outputConsoleKillMessage ( "* "..getPlayerName(source).." died."..extra )
+	end
+	--
+end
+
+function outputConsoleKillMessage ( text )
+	outputConsole ( text )
+end
+
+function outputKillMessage ( killed, wr,wg,wb,killer,kr,kg,kb,weapon,width,resource )
+	if ( resource ) then resource = getResourceName(resource) end
+	if not isElement(killed) then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	if not getElementType(killed) == "player" then
+		outputDebugString ( "outputKillMessage - Invalid 'wasted' player specified",0,0,0,100)
+		return false
+	end
+	return triggerClientEvent(getRootElement(),"onClientPlayerKillMessage",killed,killer,weapon,wr,wg,wb,kr,kg,kb,width,resource )
+end
+
+function outputMessage ( message, visibleTo, r, g, b, font )
+	if type(message) ~= "string" and type(message) ~= "table" then
+		outputDebugString ( "outputMessage - Bad 'message' argument", 0, 112, 112, 112 )
+		return false
+	end
+	if not isElement(visibleTo) then
+		outputDebugString ( "outputMessage - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+	--Turn any resources into resource names
+	if type(message) == "table" then
+		for i,part in ipairs(message) do
+			if type(part) == "table" and part[1] == "image" then
+				if part.resource then
+					message[i].resourceName = getResourceName(part.resource)
+				else
+					part.resourceName = getResourceName(sourceResource)
+				end
+			end
+		end
+	end
+	return triggerClientEvent ( visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font )
+end
+
+function setKillMessageStyle ( startX,startY,align,lines,fadeStart,fadeAnimTime )
+	if ( not startX ) then startX = default.startX end
+	if ( not startY ) then startY = default.startY end
+	if ( not align ) then startY = align.startY end
+	if ( not lines ) then lines = default.lines end
+	if ( not fadeStart ) then fadeStart = default.startFade end
+	if ( not fadeAnimTime ) then fadeAnimTime = default.fadeTime end
+	config.startX = startX
+	config.startY = startY
+	config.align = align
+	config.lines = lines
+	config.startFade = fadeStart
+	config.fadeTime = fadeAnimTime
+	for k,v in ipairs(getElementsByType"player") do
+		triggerClientEvent(v,"doSetKillMessageStyle",v,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+	end
+	return true
+end
+
+addEvent ("onClientKillmessagesLoaded",true)
+addEventHandler ( "onClientKillmessagesLoaded", getRootElement(),
+function()
+	triggerClientEvent(client,"doSetKillMessageStyle",client,config.startX,config.startY,config.alignX,config.lines,config.startFade,config.fadeTime)
+end )
diff --git a/[gameplay]/killmessages/meta.xml b/[gameplay]/killmessages/meta.xml
index fd9ecb86e..99993348a 100644
--- a/[gameplay]/killmessages/meta.xml
+++ b/[gameplay]/killmessages/meta.xml
@@ -1,138 +1,125 @@
 <meta>
-    <info author="Talidan + Iggy" type="script" version="2.0.2"/>
-    <min_mta_version client="1.5.7-9.20447"></min_mta_version>
+	<info author="Talidan + Iggy" type="script" version="2.0.1"/>
+	<script src="utils/textlib.lua" type="client"/>
+	<script src="utils/imagelib.lua" type="client"/>
+	<script src="killmessages_client.lua" type="client"/>
+	<script src="killmessages_server.lua" type="server"/>
+	<script src="gui.lua" type="client"/>
+	<script src="definitions.lua" type="client"/>
+	<!--All icons courtesy of Iggy-->
+	<file src="icons/fist.png"/>
+	<file src="icons/brassknuckle.png"/>
+	<file src="icons/golfclub.png"/>
+	<file src="icons/nitestick.png"/>
+	<file src="icons/knifecur.png"/>
+	<file src="icons/bat.png"/>
+	<file src="icons/shovel.png"/>
+	<file src="icons/poolcue.png"/>
+	<file src="icons/katana.png"/>
+	<file src="icons/chnsaw.png"/>
+	<file src="icons/gun_dildo1.png"/>
+	<file src="icons/gun_dildo2.png"/>
+	<file src="icons/gun_vibe1.png"/>
+	<file src="icons/flowera.png"/>
+	<file src="icons/gun_cane.png"/>
+	<file src="icons/grenade.png"/>
+	<file src="icons/teargas.png"/>
+	<file src="icons/molotov.png"/>
+	<file src="icons/colt45.png"/>
+	<file src="icons/Silenced.png"/>
+	<file src="icons/desert_eagle.png"/>
+	<file src="icons/chromegun.png"/>
+	<file src="icons/sawnoff.png"/>
+	<file src="icons/shotgspa.png"/>
+	<file src="icons/micro_uzi.png"/>
+	<file src="icons/mp5lng.png"/>
+	<file src="icons/ak47.png"/>
+	<file src="icons/m4.png"/>
+	<file src="icons/tec9.png"/>
+	<file src="icons/cuntgun.png"/>
+	<file src="icons/sniper.png"/>
+	<file src="icons/rocketla.png"/>
+	<file src="icons/heatseek.png"/>
+	<file src="icons/flame.png"/>
+	<file src="icons/minigun.png"/>
+	<file src="icons/satchel.png"/>
+	<file src="icons/explosion.png"/>
+	<file src="icons/suicide.png"/>
+	<file src="icons/rammed.png"/>
+	<file src="icons/hunter.png"/>
+	<file src="icons/fall.png"/>
+	<file src="icons/drowned.png"/>
+	<file src="icons/generic.png"/>
+	<file src="icons/headshot.png"/>
+	<file src="icons/406.png"/>
+	<file src="icons/408.png"/>
+	<file src="icons/416.png"/>
+	<file src="icons/417.png"/>
+	<file src="icons/423.png"/>
+	<file src="icons/424.png"/>
+	<file src="icons/427.png"/>
+	<file src="icons/428.png"/>
+	<file src="icons/429.png"/>
+	<file src="icons/432.png"/>
+	<file src="icons/433.png"/>
+	<file src="icons/434.png"/>
+	<file src="icons/441.png"/>
+	<file src="icons/443.png"/>
+	<file src="icons/448.png"/>
+	<file src="icons/457.png"/>
+	<file src="icons/460.png"/>
+	<file src="icons/462.png"/>
+	<file src="icons/463.png"/>
+	<file src="icons/464.png"/>
+	<file src="icons/468.png"/>
+	<file src="icons/470.png"/>
+	<file src="icons/471.png"/>
+	<file src="icons/480.png"/>
+	<file src="icons/485.png"/>
+	<file src="icons/486.png"/>
+	<file src="icons/508.png"/>
+	<file src="icons/511.png"/>
+	<file src="icons/512.png"/>
+	<file src="icons/513.png"/>
+	<file src="icons/520.png"/>
+	<file src="icons/524.png"/>
+	<file src="icons/528.png"/>
+	<file src="icons/530.png"/>
+	<file src="icons/531.png"/>
+	<file src="icons/532.png"/>
+	<file src="icons/539.png"/>
+	<file src="icons/564.png"/>
+	<file src="icons/568.png"/>
+	<file src="icons/571.png"/>
+	<file src="icons/572.png"/>
+	<file src="icons/573.png"/>
+	<file src="icons/574.png"/>
+	<file src="icons/578.png"/>
+	<file src="icons/588.png"/>
+	<file src="icons/593.png"/>
+	<file src="icons/599.png"/>
+	<file src="icons/bigtruck.png"/>
+	<file src="icons/bike.png"/>
+	<file src="icons/boat.png"/>
+	<file src="icons/boxtruck.png"/>
+	<file src="icons/bus.png"/>
+	<file src="icons/cars.png"/>
+	<file src="icons/copcar.png"/>
+	<file src="icons/crotchrocket.png"/>
+	<file src="icons/firetruck.png"/>
+	<file src="icons/maverick.png"/>
+	<file src="icons/monstertruck.png"/>
+	<file src="icons/plane.png"/>
+	<file src="icons/rccopter.png"/>
+	<file src="icons/roundvan.png"/>
+	<file src="icons/sparrow.png"/>
+	<file src="icons/train.png"/>
+	<file src="icons/fireextinguisher.png"/>
 
-    <script type="server" src="scripts/server/s.killmessages.lua"/>
-    <script type="server" src="scripts/server/s.settings.lua"/>
-
-    <script type="client" src="scripts/client/c.killmessages.lua"/>
-    <script type="client" src="scripts/client/c.ui.lua"/>
-    <script type="client" src="scripts/client/c.settings.lua"/>
-    <script type="client" src="scripts/client/c.utils.lua"/>
-
-    <export type="shared" function="outputMessage"/>
-    <export type="shared" function="outputKillMessage"/>
-
-    <!--All icons courtesy of Iggy-->
-    <file src="icons/406.png"/>
-    <file src="icons/408.png"/>
-    <file src="icons/416.png"/>
-    <file src="icons/417.png"/>
-    <file src="icons/423.png"/>
-    <file src="icons/424.png"/>
-    <file src="icons/427.png"/>
-    <file src="icons/428.png"/>
-    <file src="icons/429.png"/>
-    <file src="icons/432.png"/>
-    <file src="icons/433.png"/>
-    <file src="icons/434.png"/>
-    <file src="icons/441.png"/>
-    <file src="icons/443.png"/>
-    <file src="icons/448.png"/>
-    <file src="icons/457.png"/>
-    <file src="icons/460.png"/>
-    <file src="icons/462.png"/>
-    <file src="icons/463.png"/>
-    <file src="icons/464.png"/>
-    <file src="icons/468.png"/>
-    <file src="icons/470.png"/>
-    <file src="icons/471.png"/>
-    <file src="icons/480.png"/>
-    <file src="icons/485.png"/>
-    <file src="icons/486.png"/>
-    <file src="icons/508.png"/>
-    <file src="icons/511.png"/>
-    <file src="icons/512.png"/>
-    <file src="icons/513.png"/>
-    <file src="icons/520.png"/>
-    <file src="icons/524.png"/>
-    <file src="icons/528.png"/>
-    <file src="icons/530.png"/>
-    <file src="icons/531.png"/>
-    <file src="icons/532.png"/>
-    <file src="icons/532b.png"/>
-    <file src="icons/539.png"/>
-    <file src="icons/564.png"/>
-    <file src="icons/568.png"/>
-    <file src="icons/571.png"/>
-    <file src="icons/572.png"/>
-    <file src="icons/573.png"/>
-    <file src="icons/574.png"/>
-    <file src="icons/578.png"/>
-    <file src="icons/588.png"/>
-    <file src="icons/593.png"/>
-    <file src="icons/599.png"/>
-    <file src="icons/601.png"/>
-    <file src="icons/ak47.png"/>
-    <file src="icons/bat.png"/>
-    <file src="icons/bigtruck.png"/>
-    <file src="icons/bike.png"/>
-    <file src="icons/boat.png"/>
-    <file src="icons/boxtruck.png"/>
-    <file src="icons/brassknuckle.png"/>
-    <file src="icons/bus.png"/>
-    <file src="icons/cars.png"/>
-    <file src="icons/chnsaw.png"/>
-    <file src="icons/chromegun.png"/>
-    <file src="icons/colt45.png"/>
-    <file src="icons/copcar.png"/>
-    <file src="icons/crotchrocket.png"/>
-    <file src="icons/cuntgun.png"/>
-    <file src="icons/desert_eagle.png"/>
-    <file src="icons/drowned.png"/>
-    <file src="icons/explosion.png"/>
-    <file src="icons/fall.png"/>
-    <file src="icons/fireextinguisher.png"/>
-    <file src="icons/firetruck.png"/>
-    <file src="icons/fist.png"/>
-    <file src="icons/flame.png"/>
-    <file src="icons/flowera.png"/>
-    <file src="icons/generic.png"/>
-    <file src="icons/golfclub.png"/>
-    <file src="icons/grenade.png"/>
-    <file src="icons/gun_cane.png"/>
-    <file src="icons/gun_dildo1.png"/>
-    <file src="icons/gun_dildo2.png"/>
-    <file src="icons/gun_vibe1.png"/>
-    <file src="icons/gun_vibe2.png"/>
-    <file src="icons/headshot.png"/>
-    <file src="icons/heatseek.png"/>
-    <file src="icons/hunter.png"/>
-    <file src="icons/katana.png"/>
-    <file src="icons/knifecur.png"/>
-    <file src="icons/m4.png"/>
-    <file src="icons/maverick.png"/>
-    <file src="icons/micro_uzi.png"/>
-    <file src="icons/minigun.png"/>
-    <file src="icons/missile.png"/>
-    <file src="icons/molotov.png"/>
-    <file src="icons/monstertruck.png"/>
-    <file src="icons/mp5lng.png"/>
-    <file src="icons/nitestick.png"/>
-    <file src="icons/plane.png"/>
-    <file src="icons/poolcue.png"/>
-    <file src="icons/rammed.png"/>
-    <file src="icons/rccopter.png"/>
-    <file src="icons/rocketla.png"/>
-    <file src="icons/roundvan.png"/>
-    <file src="icons/satchel.png"/>
-    <file src="icons/sawnoff.png"/>
-    <file src="icons/shotgspa.png"/>
-    <file src="icons/shovel.png"/>
-    <file src="icons/Silenced.png"/>
-    <file src="icons/sniper.png"/>
-    <file src="icons/sparrow.png"/>
-    <file src="icons/suicide.png"/>
-    <file src="icons/teargas.png"/>
-    <file src="icons/tec9.png"/>
-    <file src="icons/train.png"/>
-
-    <settings>
-        <setting name="*displayLines" value="5" friendlyname="Display lines" accept="1-10" group="killmessages" desc="The number of lines displayed"/>
-        <setting name="*drawMarginRight" value="0.01" friendlyname="Margin right" accept="0-1" group="killmessages" desc="Margin from right (relative)"/>
-        <setting name="*drawMarginBottom" value="0.5" friendlyname="Margin bottom" accept="0-1" group="killmessages" desc="Margin from bottom (relative)"/>
-        <setting name="*fadeTime" value="1" friendlyname="Fade time" accept="0-3" group="killmessages" desc="Fade (in/out) time (seconds)"/>
-        <setting name="*duration" value="10" friendlyname="Message duration" accept="0-20" group="killmessages" desc="The duration of each message (seconds)"/>
-        <setting name="*outputConsole" value="true" friendlyname="Output messages to console" accept="true-false" group="killmessages" desc="Send messages to console?"/>
-    </settings>
+	<export function="outputMessage" type="server"/>
+	<export function="outputMessage" type="client"/>
+	<export function="outputKillMessage" type="server"/>
+	<export function="outputKillMessage" type="client"/>
+	<export function="setKillMessageStyle" type="client"/>
+	<export function="setKillMessageStyle" type="server"/>
 </meta>
diff --git a/[gameplay]/killmessages/scripts/client/c.killmessages.lua b/[gameplay]/killmessages/scripts/client/c.killmessages.lua
deleted file mode 100644
index ddfcfa2be..000000000
--- a/[gameplay]/killmessages/scripts/client/c.killmessages.lua
+++ /dev/null
@@ -1,160 +0,0 @@
-addEvent('onClientPlayerKillMessage', true)
-addEventHandler('onClientPlayerKillMessage', root, function(killer, weapon, pR, pG, pB, kR, kG, kB)
-    if wasEventCancelled() then
-        return
-    end
-    outputKillMessage(source, pR, pG, pB, killer, kR, kG, kB, weapon)
-end)
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    pR = tonumber(pR) or 255
-    pG = tonumber(pG) or 255
-    pB = tonumber(pB) or 255
-    
-    kR = tonumber(kR) or 255
-    kG = tonumber(kG) or 255
-    kB = tonumber(kB) or 255
-    
-    if (not player) or (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    local killerName
-    
-    if isElement(killer) then
-        if (getElementType(killer) ~= 'player') then
-            outputDebugString("outputKillMessage - Invalid 'killer' player specified", 0, 0, 0, 100)
-            return false
-        end
-        killerName = getPlayerName(killer)
-    
-    elseif (type(killer) == 'string') then
-        killerName = killer
-    
-    end
-    
-    local message = {
-        icon = getMessageIcon(weapon, killer),
-        victim = {
-            text = removeHex(getPlayerName(player)),
-            color = {pR, pG, pB},
-        }
-    }
-    
-    if (type(killerName) == 'string') then
-        message.killer = {
-            text = removeHex(killerName),
-            color = {kR, kG, kB},
-        }
-    end
-    
-    return outputMessage(message)
-end
-
-local possibleKiller
-
-function setPossibleKiller(player)
-    if possibleKiller and isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = {
-        player = player,
-        timer = setTimer(function()
-            possibleKiller = nil
-        end, 7000, 1)
-    }
-end
-
-local validExplosionTypes = {
-    [2] = true, -- rocket
-    [10] = true, -- tank grenade
-}
-
-addEventHandler('onClientExplosion', root, function(x, y, z, explosionType)
-    if (not validExplosionTypes[explosionType]) then
-        return
-    end
-    
-    if (getElementType(source) ~= 'player') then
-        return
-    end
-    
-    if (not getPedOccupiedVehicle(source)) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (not myVehicle) then
-        return
-    end
-    
-    if (getDistanceBetweenPoints3D(x, y, z, getElementPosition(myVehicle)) > 10) then
-        return
-    end
-
-    setPossibleKiller(source)
-end)
-
-local vehicleWeapons = {
-    [425] = 38, -- hunter
-    [464] = 31, -- rc baron
-    [476] = 31, -- rustler
-}
-
-addEventHandler('onClientVehicleDamage', root, function(attacker, weapon)
-    if (not weapon) then
-        return
-    end
-    
-    local myVehicle = getPedOccupiedVehicle(localPlayer)
-    
-    if (source ~= myVehicle) then
-        return
-    end
-    
-    if (not attacker) or (getElementType(attacker) ~= 'vehicle') then
-        return
-    end
-    
-    local player = getVehicleOccupant(attacker)
-    
-    if (not player) then
-        return
-    end
-    
-    if (vehicleWeapons[getElementModel(attacker)] ~= weapon) then
-        return
-    end
-    
-    setPossibleKiller(player)
-end)
-
-addEventHandler('onClientPlayerWasted', localPlayer, function()
-    if (not possibleKiller) then
-        -- If there is no possible killer and the current vehicle is exploded
-        local myVehicle = getPedOccupiedVehicle(localPlayer)
-        if myVehicle and isVehicleBlown(myVehicle) then
-            triggerServerEvent('outputKillFromClient', localPlayer, localPlayer, myVehicle)
-        end
-        return
-    end
-    
-    if (not isElement(possibleKiller.player)) then
-        return
-    end
-    
-    local vehicle = getPedOccupiedVehicle(possibleKiller.player)
-    
-    if isElement(vehicle) then
-        triggerServerEvent('outputKillFromClient', localPlayer, possibleKiller.player, vehicle)
-    end
-    
-    if isTimer(possibleKiller.timer) then
-        killTimer(possibleKiller.timer)
-    end
-    
-    possibleKiller = nil
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.settings.lua b/[gameplay]/killmessages/scripts/client/c.settings.lua
deleted file mode 100644
index 5ec940689..000000000
--- a/[gameplay]/killmessages/scripts/client/c.settings.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local settings = {}
-
-function getSetting(name)
-    return settings[name] or false
-end
-
-addEvent('receiveKillMessagesSettings', true)
-addEventHandler('receiveKillMessagesSettings', localPlayer, function(received)
-    for k, v in pairs(received) do -- replace only received settings.
-        settings[k] = tonumber(v)
-    end
-end)
-
-addEventHandler('onClientResourceStart', resourceRoot, function()
-    triggerServerEvent('requestKillMessagesSettings', localPlayer)
-end)
diff --git a/[gameplay]/killmessages/scripts/client/c.ui.lua b/[gameplay]/killmessages/scripts/client/c.ui.lua
deleted file mode 100644
index de7ec0470..000000000
--- a/[gameplay]/killmessages/scripts/client/c.ui.lua
+++ /dev/null
@@ -1,112 +0,0 @@
-local messages = {}
-local sW, sH = guiGetScreenSize()
-
-function outputMessage(new)
-    if (type(new) == 'string') then
-        new = {
-            victim = {
-                text = new,
-                color = {255, 255, 255},
-            },
-        }
-    end
-    
-    new.initTick = getTickCount()
-    
-    table.insert(messages, new)
-    
-    local displayLines = tonumber(getSetting('displayLines')) or 5
-    
-    local quantity = #messages
-    
-    if (quantity == 1) then
-        addEventHandler('onClientRender', root, renderMessages)
-    
-    elseif (quantity > displayLines) then
-        table.remove(messages, 1)
-    
-    end
-    
-    return true
-end
-addEvent('doOutputMessage', true)
-addEventHandler('doOutputMessage', root, outputMessage)
-
-function renderMessages()
-    local now = getTickCount()
-    
-    local lineHeight = 20
-    local font = 'default'
-    
-    local marginRight = tonumber(getSetting('drawMarginRight')) or 0.01
-    local marginBottom = tonumber(getSetting('drawMarginBottom')) or 0.035
-    local fadeTime = tonumber(getSetting('fadeTime')) or 1
-    local duration = tonumber(getSetting('duration')) or 10
-    
-    fadeTime = fadeTime * 1000
-    duration = duration * 1000
-    
-    local y = sH - (sH * marginBottom)
-    
-    local padding = 5 -- distance between texts and icon
-    
-    for k, v in ipairs(messages) do
-        local passed = now - v.initTick
-        if (passed <= duration) then
-            local alpha = 255
-            
-            if (passed <= fadeTime) then
-                alpha = 255 * passed / fadeTime
-            
-            elseif (passed >= (duration - fadeTime)) then
-                alpha = 255 - 255 * ((now - duration + fadeTime) - v.initTick) / fadeTime
-            
-            end
-            
-            local victim = v.victim
-            local victimText = victim.text
-            local victimColor = victim.color
-            victimColor = tocolor(victimColor[1], victimColor[2], victimColor[3], alpha)
-            
-            local victimWidth = dxGetTextSize(victimText, 0, 1, 1, font, false, true)
-            
-            local x = sW - (sW * marginRight) - victimWidth
-            
-            dxDrawText(victimText, x + 2, y + 2, x + victimWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-            dxDrawText(victimText, x, y, x + victimWidth, y + lineHeight, victimColor, 1, font, 'center', 'center')
-            
-            local icon = v.icon
-            
-            if icon then
-                local texture = icon.texture
-                local iconWidth = icon.width
-                x = x - padding - iconWidth
-                dxDrawImage(x, y, iconWidth, lineHeight, texture, 0, 0, 0, tocolor(255, 255, 255, alpha))
-            end
-            
-            local killer = v.killer
-            
-            if killer then
-                local killerText = killer.text
-                local killerColor = killer.color
-                killerColor = tocolor(killerColor[1], killerColor[2], killerColor[3], alpha)
-                
-                local killerWidth = dxGetTextSize(killerText, 0, 1, 1, font, false, true)
-                
-                x = x - padding - killerWidth
-                
-                dxDrawText(killerText, x + 2, y + 2, x + killerWidth, y + lineHeight, tocolor(0, 0, 0, alpha), 1, font, 'center', 'center')
-                dxDrawText(killerText, x, y, x + killerWidth, y + lineHeight, killerColor, 1, font, 'center', 'center')
-            end
-            
-            y = y - lineHeight - padding
-        else
-            table.remove(messages, k)
-            
-            if (#messages == 0) then
-                removeEventHandler('onClientRender', root, renderMessages)
-            end
-        
-        end
-    end
-end
diff --git a/[gameplay]/killmessages/scripts/client/c.utils.lua b/[gameplay]/killmessages/scripts/client/c.utils.lua
deleted file mode 100644
index 4111be0fe..000000000
--- a/[gameplay]/killmessages/scripts/client/c.utils.lua
+++ /dev/null
@@ -1,202 +0,0 @@
-local defaultIconsByVehType = {
-    ['Automobile'] = 'icons/cars.png',
-    ['Boat'] = 'icons/boat.png',
-    ['Plane'] = 'icons/plane.png',
-    ['Train'] = 'icons/train.png',
-}
-
-local customIcons = {
-    [0] = "icons/fist.png",
-    [1] = "icons/brassknuckle.png",
-    [2] = "icons/golfclub.png",
-    [3] = "icons/nitestick.png",
-    [4] = "icons/knifecur.png",
-    [5] = "icons/bat.png",
-    [6] = "icons/shovel.png",
-    [7] = "icons/poolcue.png",
-    [8] = "icons/katana.png",
-    [9] = "icons/chnsaw.png",
-    [10] = "icons/gun_dildo1.png",
-    [11] = "icons/gun_dildo2.png",
-    [12] = "icons/gun_vibe1.png",
-    [14] = "icons/flowera.png",
-    [15] = "icons/gun_cane.png",
-    [16] = "icons/grenade.png",
-    [17] = "icons/teargas.png",
-    [18] = "icons/molotov.png",
-    [19] = "icons/explosion.png",
-    [63] = "icons/explosion.png",
-    [22] = "icons/colt45.png",
-    [23] = "icons/Silenced.png",
-    [24] = "icons/desert_eagle.png",
-    [25] = "icons/chromegun.png",
-    [26] = "icons/sawnoff.png",
-    [27] = "icons/shotgspa.png",
-    [28] = "icons/micro_uzi.png",
-    [29] = "icons/mp5lng.png",
-    [30] = "icons/ak47.png",
-    [31] = "icons/m4.png",
-    [32] = "icons/tec9.png",
-    [33] = "icons/cuntgun.png",
-    [34] = "icons/sniper.png",
-    [35] = "icons/rocketla.png",
-    [36] = "icons/heatseek.png",
-    [37] = "icons/flame.png",
-    [38] = "icons/minigun.png",
-    [39] = "icons/satchel.png",
-    [42] = "icons/fireextinguisher.png",
-    [49] = "icons/rammed.png",
-    [50] = "icons/maverick.png",
-    [51] = "icons/explosion.png",
-    [53] = "icons/drowned.png",
-    [54] = "icons/fall.png",
-    [255] = "icons/suicide.png",
-    [256] = "icons/headshot.png",
-    
-    -----------vehicle specific icons, according to their vehicle id---------
-    [431] = "icons/bus.png",
-    [437] = "icons/bus.png",
-    [414] = "icons/boxtruck.png",
-    [456] = "icons/boxtruck.png",
-    [498] = "icons/boxtruck.png",
-    [499] = "icons/boxtruck.png",
-    [609] = "icons/boxtruck.png",
-    [440] = "icons/roundvan.png",
-    [459] = "icons/roundvan.png",
-    [482] = "icons/roundvan.png",
-    [483] = "icons/roundvan.png",
-    [582] = "icons/roundvan.png",
-    [447] = "icons/sparrow.png",
-    [469] = "icons/sparrow.png",
-    [487] = "icons/maverick.png",
-    [488] = "icons/maverick.png",
-    [497] = "icons/maverick.png",
-    [548] = "icons/maverick.png",
-    [563] = "icons/maverick.png",
-    [465] = "icons/rccopter.png",
-    [501] = "icons/rccopter.png",
-    [481] = "icons/bike.png",
-    [509] = "icons/bike.png",
-    [510] = "icons/bike.png",
-    [514] = "icons/bigtruck.png",
-    [515] = "icons/bigtruck.png",
-    [461] = "icons/crotchrocket.png",
-    [521] = "icons/crotchrocket.png",
-    [522] = "icons/crotchrocket.png",
-    [523] = "icons/crotchrocket.png",
-    [581] = "icons/crotchrocket.png",
-    [586] = "icons/crotchrocket.png",
-    [407] = "icons/firetruck.png",
-    [544] = "icons/firetruck.png",
-    [444] = "icons/monstertruck.png",
-    [556] = "icons/monstertruck.png",
-    [557] = "icons/monstertruck.png",
-    [596] = "icons/copcar.png",
-    [597] = "icons/copcar.png",
-    [598] = "icons/copcar.png",
-    [425] = "icons/hunter.png",
-    [406] = "icons/406.png",
-    [408] = "icons/408.png",
-    [416] = "icons/416.png",
-    [417] = "icons/417.png",
-    [423] = "icons/423.png",
-    [424] = "icons/424.png",
-    [427] = "icons/427.png",
-    [428] = "icons/428.png",
-    [429] = "icons/429.png",
-    [432] = "icons/432.png",
-    [433] = "icons/433.png",
-    [434] = "icons/434.png",
-    [441] = "icons/441.png",
-    [443] = "icons/443.png",
-    [448] = "icons/448.png",
-    [457] = "icons/457.png",
-    [460] = "icons/460.png",
-    [462] = "icons/462.png",
-    [463] = "icons/463.png",
-    [464] = "icons/464.png",
-    [468] = "icons/468.png",
-    [470] = "icons/470.png",
-    [471] = "icons/471.png",
-    [480] = "icons/480.png",
-    [485] = "icons/485.png",
-    [486] = "icons/486.png",
-    [508] = "icons/508.png",
-    [511] = "icons/511.png",
-    [512] = "icons/512.png",
-    [513] = "icons/513.png",
-    [520] = "icons/520.png",
-    [524] = "icons/524.png",
-    [528] = "icons/528.png",
-    [530] = "icons/530.png",
-    [531] = "icons/531.png",
-    [532] = "icons/532.png",
-    [539] = "icons/539.png",
-    [564] = "icons/564.png",
-    [568] = "icons/568.png",
-    [571] = "icons/571.png",
-    [572] = "icons/572.png",
-    [573] = "icons/573.png",
-    [574] = "icons/574.png",
-    [578] = "icons/578.png",
-    [588] = "icons/588.png",
-    [593] = "icons/593.png",
-    [599] = "icons/599.png",
-}
-
-function getMessageIcon(weapon, attacker)
-    local path
-    
-    if weapon then
-        path = customIcons[weapon] or 'icons/generic.png'
-    end
-    
-    local elemType = isElement(attacker) and getElementType(attacker)
-    
-    if (elemType == 'vehicle') then
-        local model = getElementModel(attacker)
-        path = customIcons[model] or defaultIconsByVehType[getVehicleType(attacker)] or 'icons/generic.png'
-    
-    elseif (elemType == 'player') then
-        local vehicle = getPedOccupiedVehicle(attacker)
-        if vehicle then
-            return getMessageIcon(_, vehicle)
-        end
-    end
-    
-    local texture = getTexture(path)
-    
-    if texture then
-        return {
-            texture = texture,
-            width = dxGetMaterialSize(texture)
-        }
-    end
-    
-    return false
-end
-
-local textures = {}
-
-function getTexture(path)
-    if (type(path) ~= 'string') then
-        return false
-    end
-    
-    if (textures[path] ~= nil) then
-        return textures[path]
-    end
-    
-    textures[path] = dxCreateTexture(path)
-    
-    return textures[path]
-end
-
-function removeHex(s)
-    if (type(s) == "string") then
-        while (s ~= s:gsub("#%x%x%x%x%x%x", "")) do
-            s = s:gsub("#%x%x%x%x%x%x", "")
-        end
-    end
-    return s or false
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.killmessages.lua b/[gameplay]/killmessages/scripts/server/s.killmessages.lua
deleted file mode 100644
index f60d02a4f..000000000
--- a/[gameplay]/killmessages/scripts/server/s.killmessages.lua
+++ /dev/null
@@ -1,171 +0,0 @@
-addEvent("onPlayerKillMessage")
-
-function createKillMessage(_, killer, weapon, bodypart, stealth)
-    local usedVehicle, killerType
-    local weapon = weapon or 255
-    
-    -- In very rare cases killer isn't nil or false but isn't an element.
-    if killer and (not isElement(killer)) then
-        killer = nil
-    end
-    
-    if killer then
-        killerType = getElementType(killer)
-        
-        -- Sometimes the killer is returned as the driver instead of vehicle, like when driving a Rhino but we need the vehicle ID
-        if (killerType == 'player') then
-            local veh = getPedOccupiedVehicle(killer)
-            if veh and (getPedWeapon(killer) == 0) then
-                usedVehicle = veh
-            end
-        
-        -- Change the killer into the vehicle controller
-        elseif (killerType == 'vehicle') then
-            usedVehicle = killer
-            local controller = getVehicleController(killer)
-            if controller then
-                killer = controller
-                killerType = getElementType(killer)
-            end
-        
-        end
-    end
-    
-    -- If killed by rocket and was on foot player turn it into their current weapon
-    if (weapon == 19) and ((killerType == 'player') and (not isPedInVehicle(killer))) then
-        weapon = getPedWeapon(killer) or 51
-    end
-    
-    if killer and (killerType == 'player') then
-        -- Suicide?
-        if (source == killer) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        else
-            if triggerEvent("onPlayerKillMessage", source, killer, weapon, bodypart) then
-                eventTriggered(source, killer, weapon, bodypart, usedVehicle)
-            end
-        end
-    else
-        -- Avoid showing deaths caused by explosions, cuz they are client-side
-        if (weapon ~= 63) then
-            if triggerEvent("onPlayerKillMessage", source, false, weapon, bodypart) then
-                eventTriggered(source, false, weapon, bodypart, usedVehicle)
-            end
-        end
-    end
-end
-addEventHandler('onPlayerWasted', root, createKillMessage)
-
-addEvent('outputKillFromClient', true)
-addEventHandler('outputKillFromClient', root, function(killer, veh)
-    if (source ~= client) then
-        return
-    end
-
-    if (not isElement(killer)) then
-        return
-    end
-
-    local killerVehicle = getPedOccupiedVehicle(killer)
-
-    if (killerVehicle ~= veh) then
-        return
-    end
-    
-    -- If the vehicle exploded without suffering damage from enemies
-    if (killer == source) then
-        if triggerEvent("onPlayerKillMessage", source, false, 63) then
-            eventTriggered(source, false, 63)
-        end
-    else
-        if triggerEvent("onPlayerKillMessage", client, killer, 19) then
-            eventTriggered(client, killer, 19, nil, veh)
-        end 
-    end
-end)
-
-function eventTriggered(player, killer, weapon, bodypart, vehicle)
-    outputConsoleMessage(player, killer, vehicle, weapon)
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        weapon = getElementModel(vehicle)
-    end
-    
-    local pR, pG, pB = getPlayerColor(player)
-    local kR, kG, kB = getPlayerColor(killer)
-    
-    outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    
-    return true
-end
-
-function outputKillMessage(player, pR, pG, pB, killer, kR, kG, kB, weapon)
-    if (not isElement(player)) or (getElementType(player) ~= 'player') then
-        outputDebugString("outputKillMessage - Invalid 'wasted' player specified", 0, 0, 0, 100)
-        return false
-    end
-    
-    return triggerClientEvent(root, 'onClientPlayerKillMessage', player, killer, weapon, pR, pG, pB, kR, kG, kB)
-end
-
-function outputMessage(message, visibleTo, r, g, b, font)
-    if (type(message) ~= "string") and (type(message) ~= "table") then
-        outputDebugString("outputMessage - Bad 'message' argument", 0, 112, 112, 112)
-        return false
-    end
-    if (not isElement(visibleTo)) then
-        outputDebugString("outputMessage - Bad 'visibleTo' argument", 0, 112, 112, 112)
-        return false
-    end
-    return triggerClientEvent(visibleTo, "doOutputMessage", visibleTo, message, r, g, b, font)
-end
-
-function outputConsoleMessage(player, killer, vehicle, weapon)
-    if (get('outputConsole') ~= 'true') then
-        return false
-    end
-    
-    local extra = ''
-    
-    if isElement(vehicle) and (getElementType(vehicle) == 'vehicle') then
-        extra = (' (%s)'):format(getVehicleName(vehicle))
-    end
-    
-    local msg
-    if killer then
-        if (player == killer) then
-            msg = ('* %s killed himself.'):format(getPlayerName(player))
-        else
-            msg = ('* %s killed %s.'):format(getPlayerName(killer), getPlayerName(player))
-        end
-        local weaponName = getWeaponNameFromID(weapon)
-        if weaponName then
-            msg = msg .. (' (%s)'):format(weaponName)
-        else
-            msg = msg .. extra
-        end
-    else
-        msg = ('* %s died.%s'):format(getPlayerName(player), extra)
-    end
-    
-    if msg then
-        outputConsole(msg)
-    end
-    
-    return true
-end
-
-function getPlayerColor(player)
-    local r, g, b
-    if isElement(player) then
-        local team = getPlayerTeam(player)
-        if team then
-            r, g, b = getTeamColor(team)
-        else
-            r, g, b = getPlayerNametagColor(player)
-        end
-    end
-    return r, g, b
-end
diff --git a/[gameplay]/killmessages/scripts/server/s.settings.lua b/[gameplay]/killmessages/scripts/server/s.settings.lua
deleted file mode 100644
index 12850cf2c..000000000
--- a/[gameplay]/killmessages/scripts/server/s.settings.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local settings = {}
-
-addEventHandler('onResourceStart', resourceRoot, function()
-    local allSettings = {'displayLines', 'drawMarginRight', 'drawMarginBottom', 'fadeTime', 'duration', 'outputConsole'}
-    for k, v in ipairs(allSettings) do
-        settings[v] = get(v)
-    end
-end)
-
-addEvent('requestKillMessagesSettings', true)
-addEventHandler('requestKillMessagesSettings', root, function()
-    triggerClientEvent(client, 'receiveKillMessagesSettings', client, settings)
-end)
-
-addEventHandler('onSettingChange', root, function(name, _, value)
-    name = name:gsub('[%*%#%@](.*)', '%1')-- Remove leading '*','#' or '@'
-    name = name:gsub(getResourceName(resource) .. '%.(.*)', '%1')-- Remove leading 'resName.'
-    
-    if (not settings[name]) then return end
-
-    value = fromJSON(value)
-    settings[name] = value
-    
-    -- send only the changed setting
-    triggerClientEvent(root, 'receiveKillMessagesSettings', root, {
-        [name] = value
-    })
-end)
diff --git a/[gameplay]/killmessages/utils/imagelib.lua b/[gameplay]/killmessages/utils/imagelib.lua
new file mode 100644
index 000000000..fa2d75b24
--- /dev/null
+++ b/[gameplay]/killmessages/utils/imagelib.lua
@@ -0,0 +1,140 @@
+dxImage = {}
+dxImage_mt = { __index = dxImage }
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleImages = {}
+------
+local defaults = {
+	fX							= 0.5,
+	fY							= 0.5,
+	fWidth						= 0,
+	fHeight						= 0,
+	bRelativePosition			= true,
+	bRelativeSize				= true,
+	fRot						= 0,
+	fRotXOff					= 0,
+	fRotYOff					= 0,
+	strPath						= "",
+	tColor 						= {255,255,255,255},
+	bPostGUI 					= false,
+	bVisible 					= true,
+}
+
+function dxImage:create( path, x, y, width, height, relative )
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if ( type(path) ~= "string" ) or ( not tonumber(x) ) or ( not tonumber(y) ) then
+		outputDebugString ( "dxImage:create - Bad argument", 0, 112, 112, 112 )
+		return false
+	end
+    local new = {}
+	setmetatable( new, dxImage_mt )
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	new.strPath = path
+	new.fWidth = width or new.fWidth
+	new.fHeight = height or new.fHeight
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+		new.bRelativeSize = relative
+	end
+	visibleImages[new] = true
+	return new
+end
+
+function dxImage:path(path)
+	if type(path) ~= "string" then return self.strPath end
+	self.strPath = path
+	return true
+end
+
+function dxImage:position(x,y,relative)
+	if not tonumber(x) then return self.fX, self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxImage:size(x,y,relative)
+	if not tonumber(x) then return self.fWidth, self.fHeight end
+	self.fWidth = x
+	self.fHeight = y
+	if type(relative) == "boolean" then
+		self.bRelativeSize = relative
+	else
+		self.bRelativeSize = true
+	end
+	return true
+end
+
+function dxImage:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = { r,g,b,a }
+	return true
+end
+
+function dxImage:rotation(rot,xoff,yoff)
+	if not tonumber(rot) then return self.fRot,self.fRotXOff,self.fRotYOff end
+	self.fRot = rot or self.fRot
+	self.fRotXOff = xoff or self.fRotXOff
+	self.fRotYOff = yoff or self.fRotYOff
+	return true
+end
+
+function dxImage:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleImages[self] = true
+	else
+		visibleImages[self] = nil
+	end
+	return true
+end
+
+function dxImage:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxImage:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+addEventHandler ( "onClientRender", getRootElement(),
+	function()
+		for self,_ in pairs(visibleImages) do
+			while true do
+				if self.bDestroyed then
+					visibleImages[self] = nil
+					break
+				end
+				local x,y,width,height = self.fX,self.fY,self.fWidth,self.fHeight
+				if self.bRelativePosition then
+					x = x/g_screenX
+					y = y/g_screenY
+				end
+				if self.bRelativeSize then
+					width = width/g_screenX
+					height = height/g_screenY
+				end
+				dxDrawImage ( x,y, width, height, self.strPath, self.fRot, self.fRotXOff, self.fRotYOff, tocolor(unpack(self.tColor)), self.bPostGUI )
+				break
+			end
+		end
+	end
+)
+
diff --git a/[gameplay]/killmessages/utils/textlib.lua b/[gameplay]/killmessages/utils/textlib.lua
new file mode 100644
index 000000000..e72ea9eac
--- /dev/null
+++ b/[gameplay]/killmessages/utils/textlib.lua
@@ -0,0 +1,335 @@
+dxText = {}
+dxText_mt = { __index = dxText }
+local idAssign,idPrefix = 0,"c"
+local g_screenX,g_screenY = guiGetScreenSize()
+local visibleText = {}
+------
+local defaults = {
+	fX						= 0.5,
+	fY						= 0.5,
+	bRelativePosition				= true,
+	strText						= "",
+	bVerticalAlign 					= "center",
+	bHorizontalAlign 				= "center",
+	tColor 						= {255,255,255,255},
+	fScale 						= 1,
+	strFont 					= "default",
+	strType						= "normal",
+	tAttributes					= {},
+	bPostGUI 					= false,
+	bColorCoded					= true,
+	bClip 						= false,
+	bWordWrap	 				= true,
+	bVisible 					= true,
+	tBoundingBox					= false, --If a bounding box is not set, it will not be used.
+	bRelativeBoundingBox				= true,
+}
+
+local validFonts = {
+	default						= true,
+	["default-bold"]				= true,
+	clear						= true,
+	arial						= true,
+	pricedown					= true,
+	bankgothic					= true,
+	diploma						= true,
+	beckett						= true,
+}
+
+local validTypes = {
+	normal						= true,
+	shadow						= true,
+	border						= true,
+	stroke						= true, --Clone of border
+}
+
+local validAlignTypes = {
+	center						= true,
+	left						= true,
+	right						= true,
+}
+
+function dxText:create(text, x, y, relative)
+	assert(not self.fX, "attempt to call method 'create' (a nil value)")
+	if type(text) ~= "string" or not tonumber(x) or not tonumber(y) then
+		outputDebugString("dxText:create - Bad argument",0,112,112,112)
+		return false
+	end
+    local new = {}
+	setmetatable(new, dxText_mt)
+	--Add default settings
+	for i,v in pairs(defaults) do
+		new[i] = v
+	end
+	idAssign = idAssign+1
+	new.id = idPrefix..idAssign
+	new.strText = text or new.strText
+	new.fX = x or new.fX
+	new.fY = y or new.fY
+	if type(relative) == "boolean" then
+		new.bRelativePosition = relative
+	end
+	visibleText[new] = true
+	return new
+end
+
+function dxText:text(text)
+	if type(text) ~= "string" then return self.strText end
+	self.strText = text
+	return true
+end
+
+function dxText:position(x,y,relative)
+	if not tonumber(x) then return self.fX,self.fY end
+	self.fX = x
+	self.fY = y
+	if type(relative) == "boolean" then
+		self.bRelativePosition = relative
+	else
+		self.bRelativePosition = true
+	end
+	return true
+end
+
+function dxText:color(r,g,b,a)
+	if not tonumber(r) then return unpack(self.tColor) end
+	g = g or self.tColor[2]
+	b = b or self.tColor[3]
+	a = a or self.tColor[4]
+	self.tColor = {r,g,b,a}
+	return true
+end
+
+function dxText:scale(scale)
+	if not tonumber(scale) then return self.fScale end
+	self.fScale = scale
+	return true
+end
+
+function dxText:visible(bool)
+	if type(bool) ~= "boolean" then return self.bVisible end
+	self.bVisible = bool
+	if bool then
+		visibleText[self] = true
+	else
+		visibleText[self] = nil
+	end
+	return true
+end
+
+function dxText:destroy()
+	self.bDestroyed = true
+	setmetatable( self, self )
+	return true
+end
+
+function dxText:extent()
+	if self.bColorCoded then
+		text = string.gsub(self.strText,"#%x%x%x%x%x%x","")
+	else
+		text = self.strText
+	end
+	local extent = dxGetTextWidth(text,self.fScale,self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		extent = extent + self.tAttributes[1]
+	end
+	return extent
+end
+
+function dxText:height()
+	local height = dxGetFontHeight(self.fScale, self.strFont)
+	if self.strType == "stroke" or self.strType == "border" then
+		height = height + self.tAttributes[1]
+	end
+	return height
+end
+
+function dxText:font(font)
+	if not validFonts[font] then return self.strFont end
+	self.strFont = font
+	return true
+end
+
+function dxText:postGUI(bool)
+	if type(bool) ~= "boolean" then return self.bPostGUI end
+	self.bPostGUI = bool
+	return true
+end
+
+function dxText:clip(bool)
+	if type(bool) ~= "boolean" then return self.bClip end
+	self.bClip = bool
+	return true
+end
+
+function dxText:wordWrap(bool)
+	if type(bool) ~= "boolean" then return self.bWordWrap end
+	self.bWordWrap = bool
+	return true
+end
+
+function dxText:type(type,...)
+	if not validTypes[type] then return self.strType,unpack(self.tAttributes) end
+	self.strType = type
+	self.tAttributes = {...}
+	return true
+end
+
+function dxText:align(horzA, vertA)
+	if not validAlignTypes[horzA] then return self.bHorizontalAlign,self.bVerticalAlign end
+	vertA = vertA or self.bVerticalAlign
+	self.bHorizontalAlign,self.bVerticalAlign = horzA,vertA
+	return true
+end
+
+function dxText:boundingBox(left,top,right,bottom,relative)
+	if left == nil then
+		if self.tBoundingBox then
+			return unpack(boundingBox)
+		else
+			return false
+		end
+	elseif tonumber(left) and tonumber(right) and tonumber(top) and tonumber(bottom) then
+		self.tBoundingBox = {left,top,right,bottom}
+		if type(relative) == "boolean" then
+			self.bRelativeBoundingBox = relative
+		else
+			self.bRelativeBoundingBox = true
+		end
+	else
+		self.tBoundingBox = false
+	end
+	return true
+end
+
+function dxCreateCustomDX(text,left,top,right,bottom,color,scale,font,alignX,alignY,clip,wordBreak,postGUI)
+	if not text or not left or not top then
+		return false
+	end
+	local xOffset = nil
+	local fpat = "(.-)#(%x%x%x%x%x%x)"
+	local s,e,cap,col = text:find(fpat,1)
+	local last_end = 1
+	if not alignX then
+		alignX = "left"
+	elseif alignX == "center" then
+		xOffset = -(dxGetTextWidth(string.gsub(text,"#%x%x%x%x%x%x",""),scale,font)/2)
+	else
+		xOffset = 0
+	end
+	while s do
+		if cap == "" and col then
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		if s ~= 1 or cap ~= "" then
+			dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+			xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+			color = tocolor(tonumber("0x"..col:sub(1,2)), tonumber("0x"..col:sub(3,4)), tonumber("0x"..col:sub(5,6)),255)
+		end
+		last_end = e+1
+		s,e,cap,col = text:find(fpat,last_end)
+	end
+	if last_end <= #text then
+		cap = text:sub(last_end)
+		dxDrawText(cap,left+xOffset,top,left+xOffset,bottom,color,scale,font,alignX,alignY,false,false,postGUI)
+		xOffset = xOffset+dxGetTextWidth(cap,scale,font)
+	end
+	return true
+end
+
+addEventHandler("onClientRender",getRootElement(),
+	function()
+		for self,_ in pairs(visibleText) do
+			while true do
+				if self.bDestroyed then
+					visibleText[self] = nil
+					break
+				end
+				local l,t,r,b
+				--If we arent using a bounding box
+				if not self.tBoundingBox then
+					--Decide if we use relative or absolute
+					local p_screenX,p_screenY = 1,1
+					if self.bRelativePosition then
+						p_screenX,p_screenY = g_screenX,g_screenY
+					end
+					local fX,fY = (self.fX)*p_screenX,(self.fY)*p_screenY
+					if self.bHorizontalAlign == "left" then
+						l = fX
+						r = fX + g_screenX
+					elseif self.bHorizontalAlign == "right" then
+						l = fX - g_screenX
+						r = fX
+					else
+						l = fX - g_screenX
+						r = fX + g_screenX
+					end
+					if self.bVerticalAlign == "top" then
+						t = fY
+						b = fY + g_screenY
+					elseif self.bVerticalAlign == "bottom" then
+						t = fY - g_screenY
+						b = fY
+					else
+						t = fY - g_screenY
+						b = fY + g_screenY
+					end
+				elseif type(self.tBoundingBox) == "table" then
+					local b_screenX,b_screenY = 1,1
+					if self.bRelativeBoundingBox then
+						b_screenX,b_screenY = g_screenX,g_screenY
+					end
+					l,t,r,b = self.tBoundingBox[1],self.tBoundingBox[2],self.tBoundingBox[3],self.tBoundingBox[4]
+					l = l*b_screenX
+					t = t*b_screenY
+					r = r*b_screenX
+					b = b*b_screenY
+				end
+				local type,att1,att2,att3,att4,att5 = self:type()
+				if type == "border" or type == "stroke" then
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					outlinesize = att1 or 2
+					outlinesize = math.min(self.fScale,outlinesize) --Make sure the outline size isnt thicker than the size of the label
+					if outlinesize > 0 then
+						for offsetX=-outlinesize,outlinesize,outlinesize do
+							for offsetY=-outlinesize,outlinesize,outlinesize do
+								if not offsetX == 0 and offsetY == 0 then
+									dxCreateCustomDX(self.strText,l+offsetX,t+offsetY,r+offsetX,b+offsetY,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+								end
+							end
+						end
+					end
+				elseif type == "shadow" then
+					local shadowDist = att1
+					att2 = att2 or 0
+					att3 = att3 or 0
+					att4 = att4 or 0
+					att5 = att5 or self.tColor[4]
+					dxCreateCustomDX(self.strText,l+shadowDist,t+shadowDist,r+shadowDist,b+shadowDist,tocolor(att2,att3,att4,att5),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				end
+				dxCreateCustomDX(self.strText,l,t,r,b,tocolor(unpack(self.tColor)),self.fScale,self.strFont,self.bHorizontalAlign,self.bVerticalAlign,self.bClip,self.bWordWrap,self.bPostGUI,self.bColorCoded)
+				break
+			end
+		end
+	end
+)
+
+if addEvent("updateDisplays",true) then
+	addEventHandler("updateDisplays",getRootElement(),
+		function(self)
+			setmetatable(self,dxText_mt)
+			--Remove any old ones with the same id
+			for text,_ in pairs(visibleText) do
+				if text.id == self.id then
+					visibleText[text] = nil
+				end
+			end
+			if self.bVisible and not self.bDestroyed then
+				visibleText[self] = true
+			end
+		end
+	)
+end
diff --git a/[gameplay]/speedometer/client.lua b/[gameplay]/speedometer/client.lua
deleted file mode 100644
index 23fb392eb..000000000
--- a/[gameplay]/speedometer/client.lua
+++ /dev/null
@@ -1,82 +0,0 @@
-local screenW, screenH = guiGetScreenSize()
-
-local function dxDrawRelativeImage(startX, startY, width, height, image, rot, rotX, rotY, color, postGUI)
-    dxDrawImage(startX * screenW, startY * screenH, width * screenW, height * screenH, image, rot or 0, rotX or 0, rotY or 0, color, postGUI or false)
-end
-
-function drawSpeedo()
-    local veh = getPedOccupiedVehicle(localPlayer)
-    if not veh then return end
-
-    local velx, vely, velz = getElementVelocity(veh)
-    local speed = (velx ^ 2 + vely ^ 2 + velz ^ 2) ^ (0.5)
-
-    dxDrawRelativeImage(0.66, 0.61, 0.33, 0.49, "images/disc.png")
-    dxDrawRelativeImage(0.7825, 0.61, 0.2, 0.46, "images/needle.png", -146 + (speed * 180))
-end
-
-local isSpeedoShown = false
-function toggleRender(bool)
-    if bool then
-        isSpeedoShown = true
-        addEventHandler("onClientRender", root, drawSpeedo)
-    else
-        isSpeedoShown = false
-        removeEventHandler("onClientRender", root, drawSpeedo)
-    end
-end
-
-function toggleSpeedo()
-    toggleRender(not isSpeedoShown)
-end
-addCommandHandler("speedo", toggleSpeedo)
-
-local function enterHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if not isSpeedoShown then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientPlayerVehicleEnter", localPlayer, enterHandler)
-
-local function exitHandler(theVehicle)
-    local vehType = getVehicleType(theVehicle)
-    if (vehType == "Plane") or (vehType == "Helicopter") then return end
-
-    if isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerVehicleExit", localPlayer, exitHandler)
-
-local function destroyHandler()
-    if isSpeedoShown and (getElementType(source) == "vehicle") and (getPedOccupiedVehicle(localPlayer) == source) then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientVehicleExplode", root, destroyHandler)
-addEventHandler("onClientElementDestroy", root, destroyHandler)
-
--- If player vehicle changes in abnormal way (e.g drives into a vehicle pick-up)
-local function onVehicleTypeChange(oldModel, newModel)
-    if (getElementType(source) ~= "vehicle") then return end
-
-    local newType = getVehicleType(newModel)
-
-    if isSpeedoShown and (newType == "Plane") or (newType == "Helicopter") then
-        toggleRender(false)
-    elseif not isSpeedoShown and (newType ~= "Plane") and (newType ~= "Helicopter") then
-        toggleRender(true)
-    end
-end
-addEventHandler("onClientElementModelChange", root, onVehicleTypeChange)
-
--- Dying in vehicle, so not triggering onClientPlayerVehicleExit
-function integrityCheck()
-    if getPedOccupiedVehicle(localPlayer) and isSpeedoShown then
-        toggleRender(false)
-    end
-end
-addEventHandler("onClientPlayerWasted", localPlayer, integrityCheck)
diff --git a/[gameplay]/speedometer/images/disc.png b/[gameplay]/speedometer/images/disc.png
deleted file mode 100644
index 8d80f6a937d4ed6346ebc1328dc386d19bce79dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10990
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

diff --git a/[gameplay]/speedometer/images/needle.png b/[gameplay]/speedometer/images/needle.png
deleted file mode 100644
index ce2be4d1f957b903a9ced3d9cdabe2370f614d0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1560
zcmchX`&&|X9LK@RdJ->Zg@Nfz$`oCXgi}FttYDfmFU!*K5_!YC%wiT^LT6cUTweA}
z%?#1Xlr$|9FBCH@)5=n(l!#_G%b{XEmZC$^ed$lw5BvUd&Uw!FeBPh;>+?R}Y=2)*
z!}VtC5eS5#*IwFw1Of?ek%)Er;1c@FbtVF_=Cv1X_kk3o>OK;@TaDPV5_AfApw9qo
z`0s0rLb7VWb<#1XUG8=G4UPP}9@fN(&vLy>dH{zArnZS|jGkRfQcPeDx&}A31+&a}
zkvANN?er5)(<NAo7wFiqK~q6oU5Q!5#%y$gbpqKWbEDpB5(24LYPEpZNF7q{b>uHr
z%fx?hVOwv9T!});%i@o3fIf&%Ux^`Uzj1US+TyxcHWk7{oHAL6GAIuwwPoFE;J~Bl
z3H!P50x{Q<thRe<Okm@Sh_r_-;<41jd}iv|ur3H{&nb<XL7OHMu9`!vwUVBC&9@@?
z&dVsM&u7jgzbt%iUBOASE)yuIFX>`6Ie0DRmaGy5vD~v9lGxlPcU3?hEI#+Pg`O&?
z<YNN4@b!R^_K(I#TOTiNNe7>uG~<!)wRJ*O4lxBlnwgeI6t!tE8`hvRA(p*XNOEZ(
zno{}a!3+3`TOy6o(+U)xN_$@Y_1nM9CmjeY7Wze2xU{3YdS=MMJW|FEcTjWHthQvF
zJn%6R6$YNR<}77Z&eJ8ut-#Hx!Fi+jW4Adr6*}#^Y)7?a;L3w|YG?&8)Llg(k{=C?
znmb%a<iMM;X?Y6rz$5Y}Yn?wz)B@VHx1OE3*5L|ZCKmL?UO4>bWiHB|N;@H&BaDg~
zx0j4~NWYlKCp3M(NUv(?6QZD*pEWC8&vw-@h^#e+(J&l>U3QD<t^eexw$mBO=vl@N
zyoyRaYoY7NOgi>hZ&J9RWH#IC>VDp6Gj>#4R=~ItgvCYJXL(9(5tflxcNYU0Uk^rf
z^yz`t9Q1yK2Td^XNELE<?%0K7VvRY3M;H?_%I3V7EkrP?o!?J~SM|y=^5he<pzO<M
zZ^n(h&ljmTl-A1pftPbrmh51yIAC&<3S>i^pKd9;6#2oq8ITV38ci-ebS?eThj{D(
zur>Qt@juEvmF|l0u{aGt-%LFITZciB`u?Tt#4nht?@W&P-Y91e4bny4Slrd!@)TY+
zGkP>sI1uLKR%nI0t2oiftf9wBAHO3|f#)FEd}#MRQGeO{C>P!IT5fA|jh=S@xEP-I
zd>oJ-Y+v?sZR%kUrJT(I6O@K8ISx(VCO&`x0{P(VY8!qdBO+t792n!2-;W*RH<mLs
zc4<H<k@=oc%jxPYFt=A49H*%wrUB{bDNj{hKsJ1yVVuh=A@yob)vBUs0B+`T<UW_!
zmE5HEgrB%DCPHc5;~ZOlM6-DoOqi2Dy!@o!vzGFZCg9>|G`agOQt!~;$&|=*+u9%&
zI+waHqq7qm=&7g!;kRhzU5xAhu0t{1;Dg1z3)B~0boW~%$QVLDAmmnYtUj$wZAoHb
z4I$Qyq;LY+`6@<B4PGQ4+Ka?M#iH>R^Z14tXZv|V4akp=W_x@UzesIRI?`nd0u;_=
zjMvY0tW&DyP{6b*O3vZE_$(O8XD!{Bg@G}_%|&d8^0{W|;|?JRa$;K9yNAEJHBprH
z%>^TXunXaMp#sco(#e~0L;^4xabHK=p~q5&!`UzrC_rrKlQ>a-M#C7*YU^c)g%6X~
zlq@i!E9i=pKbcEk+3DIo(<yTb*km{5XIB^IBmq%ymMx+J3~I~Yzx2@&6zAM@!=&d>
zM!J_>`GwZtCp}@ajPF|+&RV5Acfr{z_wYaX|1LBpf|Dqxss*|RyngVd-Q08J%)fHD
Bx*-4n

diff --git a/[gameplay]/speedometer/meta.xml b/[gameplay]/speedometer/meta.xml
deleted file mode 100644
index c868b138f..000000000
--- a/[gameplay]/speedometer/meta.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<meta>
-	<info author="MTA contributors (github.com/multitheftauto/mtasa-resources)" version="1.0" type="script" description="Basic speedometer" />
-	<file src="images/disc.png" />
-	<file src="images/needle.png" />
-	<script src="client.lua" type="client" />
-</meta>
\ No newline at end of file

From c60ff34ea359181b4d4af50422c5b619b6b9d52e Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 08:10:32 -0300
Subject: [PATCH 22/26] revert speedometer changes

---
 [gameplay]/speedometer/client.lua        |  82 +++++++++++++++++++++++
 [gameplay]/speedometer/images/disc.png   | Bin 0 -> 10990 bytes
 [gameplay]/speedometer/images/needle.png | Bin 0 -> 1560 bytes
 [gameplay]/speedometer/meta.xml          |   6 ++
 4 files changed, 88 insertions(+)
 create mode 100644 [gameplay]/speedometer/client.lua
 create mode 100644 [gameplay]/speedometer/images/disc.png
 create mode 100644 [gameplay]/speedometer/images/needle.png
 create mode 100644 [gameplay]/speedometer/meta.xml

diff --git a/[gameplay]/speedometer/client.lua b/[gameplay]/speedometer/client.lua
new file mode 100644
index 000000000..23fb392eb
--- /dev/null
+++ b/[gameplay]/speedometer/client.lua
@@ -0,0 +1,82 @@
+local screenW, screenH = guiGetScreenSize()
+
+local function dxDrawRelativeImage(startX, startY, width, height, image, rot, rotX, rotY, color, postGUI)
+    dxDrawImage(startX * screenW, startY * screenH, width * screenW, height * screenH, image, rot or 0, rotX or 0, rotY or 0, color, postGUI or false)
+end
+
+function drawSpeedo()
+    local veh = getPedOccupiedVehicle(localPlayer)
+    if not veh then return end
+
+    local velx, vely, velz = getElementVelocity(veh)
+    local speed = (velx ^ 2 + vely ^ 2 + velz ^ 2) ^ (0.5)
+
+    dxDrawRelativeImage(0.66, 0.61, 0.33, 0.49, "images/disc.png")
+    dxDrawRelativeImage(0.7825, 0.61, 0.2, 0.46, "images/needle.png", -146 + (speed * 180))
+end
+
+local isSpeedoShown = false
+function toggleRender(bool)
+    if bool then
+        isSpeedoShown = true
+        addEventHandler("onClientRender", root, drawSpeedo)
+    else
+        isSpeedoShown = false
+        removeEventHandler("onClientRender", root, drawSpeedo)
+    end
+end
+
+function toggleSpeedo()
+    toggleRender(not isSpeedoShown)
+end
+addCommandHandler("speedo", toggleSpeedo)
+
+local function enterHandler(theVehicle)
+    local vehType = getVehicleType(theVehicle)
+    if (vehType == "Plane") or (vehType == "Helicopter") then return end
+
+    if not isSpeedoShown then
+        toggleRender(true)
+    end
+end
+addEventHandler("onClientPlayerVehicleEnter", localPlayer, enterHandler)
+
+local function exitHandler(theVehicle)
+    local vehType = getVehicleType(theVehicle)
+    if (vehType == "Plane") or (vehType == "Helicopter") then return end
+
+    if isSpeedoShown then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientPlayerVehicleExit", localPlayer, exitHandler)
+
+local function destroyHandler()
+    if isSpeedoShown and (getElementType(source) == "vehicle") and (getPedOccupiedVehicle(localPlayer) == source) then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientVehicleExplode", root, destroyHandler)
+addEventHandler("onClientElementDestroy", root, destroyHandler)
+
+-- If player vehicle changes in abnormal way (e.g drives into a vehicle pick-up)
+local function onVehicleTypeChange(oldModel, newModel)
+    if (getElementType(source) ~= "vehicle") then return end
+
+    local newType = getVehicleType(newModel)
+
+    if isSpeedoShown and (newType == "Plane") or (newType == "Helicopter") then
+        toggleRender(false)
+    elseif not isSpeedoShown and (newType ~= "Plane") and (newType ~= "Helicopter") then
+        toggleRender(true)
+    end
+end
+addEventHandler("onClientElementModelChange", root, onVehicleTypeChange)
+
+-- Dying in vehicle, so not triggering onClientPlayerVehicleExit
+function integrityCheck()
+    if getPedOccupiedVehicle(localPlayer) and isSpeedoShown then
+        toggleRender(false)
+    end
+end
+addEventHandler("onClientPlayerWasted", localPlayer, integrityCheck)
diff --git a/[gameplay]/speedometer/images/disc.png b/[gameplay]/speedometer/images/disc.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d80f6a937d4ed6346ebc1328dc386d19bce79dc
GIT binary patch
literal 10990
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

literal 0
HcmV?d00001

diff --git a/[gameplay]/speedometer/images/needle.png b/[gameplay]/speedometer/images/needle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce2be4d1f957b903a9ced3d9cdabe2370f614d0c
GIT binary patch
literal 1560
zcmchX`&&|X9LK@RdJ->Zg@Nfz$`oCXgi}FttYDfmFU!*K5_!YC%wiT^LT6cUTweA}
z%?#1Xlr$|9FBCH@)5=n(l!#_G%b{XEmZC$^ed$lw5BvUd&Uw!FeBPh;>+?R}Y=2)*
z!}VtC5eS5#*IwFw1Of?ek%)Er;1c@FbtVF_=Cv1X_kk3o>OK;@TaDPV5_AfApw9qo
z`0s0rLb7VWb<#1XUG8=G4UPP}9@fN(&vLy>dH{zArnZS|jGkRfQcPeDx&}A31+&a}
zkvANN?er5)(<NAo7wFiqK~q6oU5Q!5#%y$gbpqKWbEDpB5(24LYPEpZNF7q{b>uHr
z%fx?hVOwv9T!});%i@o3fIf&%Ux^`Uzj1US+TyxcHWk7{oHAL6GAIuwwPoFE;J~Bl
z3H!P50x{Q<thRe<Okm@Sh_r_-;<41jd}iv|ur3H{&nb<XL7OHMu9`!vwUVBC&9@@?
z&dVsM&u7jgzbt%iUBOASE)yuIFX>`6Ie0DRmaGy5vD~v9lGxlPcU3?hEI#+Pg`O&?
z<YNN4@b!R^_K(I#TOTiNNe7>uG~<!)wRJ*O4lxBlnwgeI6t!tE8`hvRA(p*XNOEZ(
zno{}a!3+3`TOy6o(+U)xN_$@Y_1nM9CmjeY7Wze2xU{3YdS=MMJW|FEcTjWHthQvF
zJn%6R6$YNR<}77Z&eJ8ut-#Hx!Fi+jW4Adr6*}#^Y)7?a;L3w|YG?&8)Llg(k{=C?
znmb%a<iMM;X?Y6rz$5Y}Yn?wz)B@VHx1OE3*5L|ZCKmL?UO4>bWiHB|N;@H&BaDg~
zx0j4~NWYlKCp3M(NUv(?6QZD*pEWC8&vw-@h^#e+(J&l>U3QD<t^eexw$mBO=vl@N
zyoyRaYoY7NOgi>hZ&J9RWH#IC>VDp6Gj>#4R=~ItgvCYJXL(9(5tflxcNYU0Uk^rf
z^yz`t9Q1yK2Td^XNELE<?%0K7VvRY3M;H?_%I3V7EkrP?o!?J~SM|y=^5he<pzO<M
zZ^n(h&ljmTl-A1pftPbrmh51yIAC&<3S>i^pKd9;6#2oq8ITV38ci-ebS?eThj{D(
zur>Qt@juEvmF|l0u{aGt-%LFITZciB`u?Tt#4nht?@W&P-Y91e4bny4Slrd!@)TY+
zGkP>sI1uLKR%nI0t2oiftf9wBAHO3|f#)FEd}#MRQGeO{C>P!IT5fA|jh=S@xEP-I
zd>oJ-Y+v?sZR%kUrJT(I6O@K8ISx(VCO&`x0{P(VY8!qdBO+t792n!2-;W*RH<mLs
zc4<H<k@=oc%jxPYFt=A49H*%wrUB{bDNj{hKsJ1yVVuh=A@yob)vBUs0B+`T<UW_!
zmE5HEgrB%DCPHc5;~ZOlM6-DoOqi2Dy!@o!vzGFZCg9>|G`agOQt!~;$&|=*+u9%&
zI+waHqq7qm=&7g!;kRhzU5xAhu0t{1;Dg1z3)B~0boW~%$QVLDAmmnYtUj$wZAoHb
z4I$Qyq;LY+`6@<B4PGQ4+Ka?M#iH>R^Z14tXZv|V4akp=W_x@UzesIRI?`nd0u;_=
zjMvY0tW&DyP{6b*O3vZE_$(O8XD!{Bg@G}_%|&d8^0{W|;|?JRa$;K9yNAEJHBprH
z%>^TXunXaMp#sco(#e~0L;^4xabHK=p~q5&!`UzrC_rrKlQ>a-M#C7*YU^c)g%6X~
zlq@i!E9i=pKbcEk+3DIo(<yTb*km{5XIB^IBmq%ymMx+J3~I~Yzx2@&6zAM@!=&d>
zM!J_>`GwZtCp}@ajPF|+&RV5Acfr{z_wYaX|1LBpf|Dqxss*|RyngVd-Q08J%)fHD
Bx*-4n

literal 0
HcmV?d00001

diff --git a/[gameplay]/speedometer/meta.xml b/[gameplay]/speedometer/meta.xml
new file mode 100644
index 000000000..c868b138f
--- /dev/null
+++ b/[gameplay]/speedometer/meta.xml
@@ -0,0 +1,6 @@
+<meta>
+	<info author="MTA contributors (github.com/multitheftauto/mtasa-resources)" version="1.0" type="script" description="Basic speedometer" />
+	<file src="images/disc.png" />
+	<file src="images/needle.png" />
+	<script src="client.lua" type="client" />
+</meta>
\ No newline at end of file

From a6d22978237711dbf76205b00d8a29288dbb3cc5 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 08:14:03 -0300
Subject: [PATCH 23/26] revert unwanted changes

---
 [admin]/admin/client/gui/admin_main.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index 035f00213..7dc143a96 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -1391,7 +1391,7 @@ end
 
 -- anon admin
 function isAnonAdmin()
-	return guiCheckBoxGetSelected ( aTab1.AnonAdmin )
+	return (isElement(aTab1.AnonAdmin) and guiCheckBoxGetSelected ( aTab1.AnonAdmin )) or getElementData(localPlayer, 'AnonAdmin')
 end
 
 function setAnonAdmin( bOn )
@@ -1402,7 +1402,7 @@ end
 
 -- sensitive data
 function isSensitiveDataHidden()
-	return guiCheckBoxGetSelected(aTab1.HideSensitiveData)
+	return isElement(aTab1.HideSensitiveData) and guiCheckBoxGetSelected(aTab1.HideSensitiveData)
 end
 
 function setHideSensitiveData( bOn )

From 271ee1856b2b986bc2807a48f87ecc0d1f81d702 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 09:58:46 -0300
Subject: [PATCH 24/26] fix typo

---
 [admin]/admin/client/gui/admin_permissions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index 0cd009bb3..2923957b1 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -26,7 +26,7 @@ function aPermissions.Show(player)
         guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
         aPermissions.RemoveGroup = guiCreateButton(0.39, 0.18, 0.075, 0.68, '>\n>\n>', true, aPermissions.Form)
         
-        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Avaiable groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Available groups:"):format(getPlayerName(player)), true, aPermissions.Form)
         aPermissions.AllGroups = guiCreateGridList(0.62, 0.18, 0.35, 0.68, true, aPermissions.Form)
         guiGridListAddColumn(aPermissions.AllGroups, "Group Name", 0.85)
         aPermissions.AddGroup = guiCreateButton(0.535, 0.18, 0.075, 0.68, '<\n<\n<', true, aPermissions.Form)

From 42ffecd5bde918e8174557c467fa4baa3316a655 Mon Sep 17 00:00:00 2001
From: Breno Danyel <bdls1704@hotmail.com>
Date: Sun, 4 Jul 2021 10:10:49 -0300
Subject: [PATCH 25/26] disable buttons if there is no item selected

---
 [admin]/admin/client/gui/admin_permissions.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index 2923957b1..c68f9779e 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -25,11 +25,13 @@ function aPermissions.Show(player)
         aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
         guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
         aPermissions.RemoveGroup = guiCreateButton(0.39, 0.18, 0.075, 0.68, '>\n>\n>', true, aPermissions.Form)
-        
+        guiSetEnabled(aPermissions.RemoveGroup, false)
+
         aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Available groups:"):format(getPlayerName(player)), true, aPermissions.Form)
         aPermissions.AllGroups = guiCreateGridList(0.62, 0.18, 0.35, 0.68, true, aPermissions.Form)
         guiGridListAddColumn(aPermissions.AllGroups, "Group Name", 0.85)
         aPermissions.AddGroup = guiCreateButton(0.535, 0.18, 0.075, 0.68, '<\n<\n<', true, aPermissions.Form)
+        guiSetEnabled(aPermissions.AddGroup, false)
 
         aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form)
         aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form)
@@ -83,6 +85,10 @@ function aPermissions.onClick(button)
             aPermissions.ConfirmChange(false)
         elseif (source == aPermissions.AddGroup) then
             aPermissions.ConfirmChange(true)
+        elseif (source == aPermissions.AllGroups) then
+            guiSetEnabled(aPermissions.AddGroup, guiGridListGetSelectedItem(aPermissions.AllGroups) > -1)
+        elseif (source == aPermissions.PlayerGroups) then
+            guiSetEnabled(aPermissions.RemoveGroup, guiGridListGetSelectedItem(aPermissions.PlayerGroups) > -1)
         end
     end
 end

From 5f8b070736fe7af4a5cca27023bb9eba37f5d0b8 Mon Sep 17 00:00:00 2001
From: iDannz <bdls1704@hotmail.com>
Date: Fri, 16 Jul 2021 13:08:15 -0300
Subject: [PATCH 26/26] fix window/label text not updating

---
 [admin]/admin/client/gui/admin_permissions.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua
index c68f9779e..73b9557a3 100644
--- a/[admin]/admin/client/gui/admin_permissions.lua
+++ b/[admin]/admin/client/gui/admin_permissions.lua
@@ -18,16 +18,16 @@ addEvent('aOnPermissionsChange', true)
 function aPermissions.Show(player)
     if (not aPermissions.Form) then
         local x, y = guiGetScreenSize()
-        aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, ("Manage %s's permissions"):format(getPlayerName(player)), false)
+        aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, '', false)
         guiSetAlpha(aPermissions.Form, 1)
         
-        aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, ("%s's groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, '', true, aPermissions.Form)
         aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form)
         guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85)
         aPermissions.RemoveGroup = guiCreateButton(0.39, 0.18, 0.075, 0.68, '>\n>\n>', true, aPermissions.Form)
         guiSetEnabled(aPermissions.RemoveGroup, false)
 
-        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, ("Available groups:"):format(getPlayerName(player)), true, aPermissions.Form)
+        aPermissions.LabelAllPerms = guiCreateLabel(0.62, 0.1, 0.35, 0.07, "Available groups:", true, aPermissions.Form)
         aPermissions.AllGroups = guiCreateGridList(0.62, 0.18, 0.35, 0.68, true, aPermissions.Form)
         guiGridListAddColumn(aPermissions.AllGroups, "Group Name", 0.85)
         aPermissions.AddGroup = guiCreateButton(0.535, 0.18, 0.075, 0.68, '<\n<\n<', true, aPermissions.Form)
@@ -43,6 +43,8 @@ function aPermissions.Show(player)
         --Register With Admin Form
         aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close)
     end
+    guiSetText(aPermissions.Form, ("Manage %s's permissions"):format(getPlayerName(player)))
+    guiSetText(aPermissions.LabelYourPerms, ("%s's groups:"):format(getPlayerName(player)))
     aPermissions.SelectedPlayer = player
     aPermissions.Refresh()
     guiSetVisible(aPermissions.Form, true)