From 3cade4af50ed4f944edf171ee3a81e1966ab4b84 Mon Sep 17 00:00:00 2001
From: worldspawn <worldspawn@riseup.net>
Date: Sat, 29 Jul 2017 17:46:47 -0600
Subject: [PATCH] updates ive forgotten about

---
 lua/autorun/sh_themer_loader.lua |  5 ++++-
 lua/themer/main.lua              | 23 +++++++++++++++++++----
 lua/themer/spawnmenu.lua         | 22 +++++++++++++++++++++-
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/lua/autorun/sh_themer_loader.lua b/lua/autorun/sh_themer_loader.lua
index 0d4dc43..ccfc881 100644
--- a/lua/autorun/sh_themer_loader.lua
+++ b/lua/autorun/sh_themer_loader.lua
@@ -3,7 +3,10 @@ AddCSLuaFile("themer/main.lua")
 AddCSLuaFile("themer/iconbrowser.lua")
 AddCSLuaFile("themer/spawnmenu.lua")
 
-if SERVER then return end
+if SERVER then
+	resource.AddWorkshop("938347376")
+	return
+end
 include'skins/themer.lua'
 
 surface.CreateFont("Themer.Title",{
diff --git a/lua/themer/main.lua b/lua/themer/main.lua
index 6884674..ada231d 100644
--- a/lua/themer/main.lua
+++ b/lua/themer/main.lua
@@ -31,14 +31,14 @@ local function ColorHack()
 		DMenuOption.Init = function(self)
 			self:SetContentAlignment(4)
 			self:SetTextInset(30,0)
-			self:SetTextColor(self:GetSkin().Colours.Label.Default)
+			self:SetTextColor(self:GetSkin().Colours.Label.Dark)
 			self:SetChecked(false)
 		end
 		DTextEntry.GetTextColor = function(self)
-			return self.m_colText || self:GetSkin().Colours.Label.Default
+			return self.m_colText || self:GetSkin().Colours.Label.Dark
 		end
 		DTextEntry.GetCursorColor = function(self)
-			return self.m_colCursor || self:GetSkin().Colours.Label.Default
+			return self.m_colCursor || self:GetSkin().Colours.Label.Dark
 		end
 
 		derma.DefineControl( "DMenuOption", "Menu Option Line", DMenuOption, "DButton" )
@@ -54,6 +54,12 @@ concommand.Add("themer_refresh_derma",function()
 	include'skins/themer.lua'
 	derma.RefreshSkins()
 	ColorHack()
+
+	for k,v in pairs(hook.GetTable()["ForceDermaSkin"]) do
+		if k ~= "Themer" then
+			hook.Remove("ForceDermaSkin", k)
+		end
+	end
 end)
 
 hook.Add("SpawnMenuOpen","Themer.IconHack",function()
@@ -120,10 +126,19 @@ end)
 hook.Add("PlayerInitialSpawn","Themer.ColorTweaks",function()
 	timer.Simple(0,function()
 		ColorHack()
+		for k,v in pairs(hook.GetTable()["ForceDermaSkin"]) do
+			if k ~= "Themer" then
+				hook.Remove("ForceDermaSkin", k)
+			end
+		end
 	end)
 end)
 
-hook.Remove("ForceDermaSkin", "CISKIN.Force")
+for k,v in pairs(hook.GetTable()["ForceDermaSkin"]) do
+	if k ~= "Themer" then
+		hook.Remove("ForceDermaSkin", k)
+	end
+end
 
 if hook.GetTable()["OnGamemodeLoaded"] and hook.GetTable()["OnGamemodeLoaded"]["CreateMenuBar"] then
 	local oldCreateMenuBar = oldCreateMenuBar or hook.GetTable()["OnGamemodeLoaded"]["CreateMenuBar"]
diff --git a/lua/themer/spawnmenu.lua b/lua/themer/spawnmenu.lua
index 97aa034..ee08b70 100644
--- a/lua/themer/spawnmenu.lua
+++ b/lua/themer/spawnmenu.lua
@@ -24,17 +24,37 @@ All changes require applying changes.]])
 
 	panel:CheckBox("Use Custom Skin","themer_enabled")
 
-	local list = panel:ComboBox("Skin:","derma_skinname")
+	local files = {}
+
 	for _,f in pairs(file.Find("materials/gwenskin/*.png","GAME")) do
 		f = f:gsub(".png","")
+		files[f] = true
+	end
+	for _,f in pairs(file.Find("materials/gwenskin/*.png","THIRDPARTY")) do
+		f = f:gsub(".png","")
+		files[f] = true
+	end
+
+	local list = panel:ComboBox("Skin:","derma_skinname")
+	for f,_ in pairs(files) do
 		list:AddChoice(f)
 	end
 
 	local reload = panel:Button("Refresh List")
 	reload.DoClick = function(s)
 		list:Clear()
+		files = {}
+
 		for _,f in pairs(file.Find("materials/gwenskin/*.png","GAME")) do
 			f = f:gsub(".png","")
+			files[f] = true
+		end
+		for _,f in pairs(file.Find("materials/gwenskin/*.png","THIRDPARTY")) do
+			f = f:gsub(".png","")
+			files[f] = true
+		end
+
+		for f,_ in pairs(files) do
 			list:AddChoice(f)
 		end
 	end