From 34697746f04cd24a3c7ad3b3213b2523b6015838 Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:48:25 +0300
Subject: [PATCH 1/4] Fix donations data fetching from unexisting table

---
 mods/don_loadout/code/donations/donations.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/don_loadout/code/donations/donations.dm b/mods/don_loadout/code/donations/donations.dm
index 9674f0a13718b..eeaac13415353 100644
--- a/mods/don_loadout/code/donations/donations.dm
+++ b/mods/don_loadout/code/donations/donations.dm
@@ -29,7 +29,7 @@
 
 	var/DBQuery/query = dbcon.NewQuery({"
 		SELECT CAST(SUM(amount) as UNSIGNED INTEGER)
-		FROM budget
+		FROM `[sqlfdbkdbutil]`.`budget`
 		WHERE
 			ckey = '[player.ckey]' AND
 			is_valid = TRUE AND

From f38271f24979c294bd289a6184dfbc547acda9bd Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:48:55 +0300
Subject: [PATCH 2/4] Implement donations OOC colors

---
 code/datums/communication/ooc.dm              |  8 ++++-
 .../browserassets/css/browserOutput.css       | 22 ++++++++++++++
 .../browserassets/css/browserOutput_white.css | 22 ++++++++++++++
 mods/don_loadout/README.md                    |  1 +
 mods/don_loadout/_don_loadout.dme             |  2 +-
 mods/don_loadout/code/donations/donator.dm    |  8 +++--
 mods/don_loadout/code/donations/ooc_color.dm  | 29 -------------------
 .../don_loadout/code/donations/preferences.dm |  4 +++
 8 files changed, 62 insertions(+), 34 deletions(-)
 delete mode 100644 mods/don_loadout/code/donations/ooc_color.dm
 create mode 100644 mods/don_loadout/code/donations/preferences.dm

diff --git a/code/datums/communication/ooc.dm b/code/datums/communication/ooc.dm
index 426b0ff12fac1..1d112c3d886cb 100644
--- a/code/datums/communication/ooc.dm
+++ b/code/datums/communication/ooc.dm
@@ -34,10 +34,16 @@
 	var/can_badmin = !is_stealthed && can_select_ooc_color(C) && (C.prefs.ooccolor != initial(C.prefs.ooccolor))
 	var/ooc_color = C.prefs.ooccolor
 
+	// [SIERRA-ADD] - DON_LOADOUT
+	var/ckey_prefix = C.donator_info.get_decorated_message(C, "<EM>[C.key]:</EM>")
+	// [/SIERRA-ADD]
 	for(var/client/target in GLOB.clients)
 		if(target.is_key_ignored(C.key)) // If we're ignored by this person, then do nothing.
 			continue
-		var/sent_message = "[create_text_tag("ooc", "OOC:", target)] <EM>[C.key]:</EM> [SPAN_CLASS("message linkify", "[message]")]"
+		// [SIERRA-EDIT] - DON_LOADOUT
+		// var/sent_message = "[create_text_tag("ooc", "OOC:", target)] <EM>[C.key]:</EM> [SPAN_CLASS("message linkify", "[message]")]" // SIERRA-EDIT - ORIGINAL
+		var/sent_message = "[create_text_tag("ooc", "OOC:", target)] [ckey_prefix] [SPAN_CLASS("message linkify", "[message]")]"
+		// [/SIERRA-EDIT]
 		if(can_badmin)
 			receive_communication(C, target, SPAN_COLOR(ooc_color, SPAN_CLASS("ooc", sent_message)))
 		else
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
index 89305692c5653..e325161e852fc 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -418,3 +418,25 @@ h1.alert, h2.alert		{color: #a4bad6;}
 .german                    {color: #4d5d53;}
 .lirris                    {color: #023638;}
 .alain                     {color: #6a1b9a;}
+
+/* DON_LOADOUT */
+.dt_1 {
+	font-weight: bold;
+	color: rgb(83, 107, 189);
+	text-shadow: 0 0 8px rgba(83, 107, 189, .6);
+}
+.dt_2 {
+	font-weight: bold;
+	color: rgb(91, 16, 212);
+	text-shadow: 0 0 8px rgba(91, 16, 212, .6);
+}
+.dt_3 {
+	font-weight: bold;
+	color: rgb(175, 48, 207);
+	text-shadow: 0 0 8px rgba(175, 48, 207, .6);
+}
+.dt_4 {
+	font-weight: bold;
+	color: rgb(229, 25, 219);
+	text-shadow: 0 0 8px rgba(229, 25, 219, .6);
+}
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css
index 22ae69907a513..14e4c5671f767 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput_white.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css
@@ -415,3 +415,25 @@ h1.alert, h2.alert		{color: #000080;}
 .german                    {color: #4d5d53;}
 .lirris                    {color: #023638;}
 .alain                     {color: #6a1b9a;}
+
+/* DON_LOADOUT */
+.dt_1 {
+	font-weight: bold;
+	color: rgb(83, 107, 189);
+	text-shadow: 0 0 8px rgba(83, 107, 189, .6);
+}
+.dt_2 {
+	font-weight: bold;
+	color: rgb(91, 16, 212);
+	text-shadow: 0 0 8px rgba(91, 16, 212, .6);
+}
+.dt_3 {
+	font-weight: bold;
+	color: rgb(175, 48, 207);
+	text-shadow: 0 0 8px rgba(175, 48, 207, .6);
+}
+.dt_4 {
+	font-weight: bold;
+	color: rgb(229, 25, 219);
+	text-shadow: 0 0 8px rgba(229, 25, 219, .6);
+}
diff --git a/mods/don_loadout/README.md b/mods/don_loadout/README.md
index 2e8e4963a8eec..5b08c30c646e3 100644
--- a/mods/don_loadout/README.md
+++ b/mods/don_loadout/README.md
@@ -30,6 +30,7 @@ ID мода: DON_LOADOUT
 ### Изменения *кор кода*
 
 - `code/modules/client/preference_setup/general/05_preview.dm`: `/datum/preferences/proc/dress_preview_mob()`
+- `code/datums/communication/ooc.dm`: `/singleton/communication_channel/ooc/do_communicate()`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
diff --git a/mods/don_loadout/_don_loadout.dme b/mods/don_loadout/_don_loadout.dme
index aa5f064f35e30..56a8b7d35b3bb 100644
--- a/mods/don_loadout/_don_loadout.dme
+++ b/mods/don_loadout/_don_loadout.dme
@@ -5,7 +5,7 @@
 
 #include "code/donations/donations.dm"
 #include "code/donations/donator.dm"
-#include "code/donations/ooc_color.dm"
+#include "code/donations/preferences.dm"
 
 #include "code/loadout/gear_tweak.dm"
 #include "code/loadout/gear.dm"
diff --git a/mods/don_loadout/code/donations/donator.dm b/mods/don_loadout/code/donations/donator.dm
index 761951b71e91e..805022719f694 100644
--- a/mods/don_loadout/code/donations/donator.dm
+++ b/mods/don_loadout/code/donations/donator.dm
@@ -42,10 +42,12 @@
 /datum/donator_info/proc/on_donation_tier_loaded(client/C)
 	return
 
-/datum/donator_info/proc/get_decorated_ooc_name(client/C)
+/datum/donator_info/proc/get_decorated_message(client/C, message)
 	if(!SScharacter_setup.initialized || isnull(donation_type))
-		return C.key
-	return "<span class='[donation_tier_to_css_class(donation_type)]'>[C.key]</span>"
+		return message
+	if (C.get_preference_value(/datum/client_preference/ooc_donation_color) != GLOB.PREF_SHOW)
+		return message
+	return "<span class='[donation_tier_to_css_class(donation_type)]'>[message]</span>"
 
 /datum/donator_info/proc/get_full_donation_tier()
 	return donation_tier_decorated(donation_type)
diff --git a/mods/don_loadout/code/donations/ooc_color.dm b/mods/don_loadout/code/donations/ooc_color.dm
deleted file mode 100644
index 9e1b8133318ad..0000000000000
--- a/mods/don_loadout/code/donations/ooc_color.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-// SIERRA TODO: Переместить в коркод
-/singleton/communication_channel/ooc/do_communicate(client/C, message)
-	var/datum/admins/holder = C.holder
-	var/is_stealthed = C.is_stealthed()
-
-	var/ooc_style = "everyone"
-	if(holder && !is_stealthed)
-		ooc_style = "elevated"
-		if(holder.rights & R_MOD)
-			ooc_style = "moderator"
-		if(holder.rights & R_DEBUG)
-			ooc_style = "developer"
-		if(holder.rights & R_ADMIN)
-			ooc_style = "admin"
-
-	var/can_badmin = !is_stealthed && can_select_ooc_color(C) && (C.prefs.ooccolor != initial(C.prefs.ooccolor))
-	var/ooc_color = C.prefs.ooccolor
-
-
-	var/ckey = C.donator_info.get_decorated_ooc_name(C)
-	for(var/client/target in GLOB.clients)
-		if(target.is_key_ignored(C.key)) // If we're ignored by this person, then do nothing.
-			continue
-
-		var/sent_message = "[create_text_tag("ooc", "OOC:", target)] <EM>[ckey]:</EM> [SPAN_CLASS("message linkify", "[message]")]"
-		if(can_badmin)
-			receive_communication(C, target, SPAN_COLOR(ooc_color, SPAN_CLASS("ooc", sent_message)))
-		else
-			receive_communication(C, target, SPAN_CLASS("ooc", SPAN_CLASS(ooc_style, sent_message)))
diff --git a/mods/don_loadout/code/donations/preferences.dm b/mods/don_loadout/code/donations/preferences.dm
new file mode 100644
index 0000000000000..de13dc398fd52
--- /dev/null
+++ b/mods/don_loadout/code/donations/preferences.dm
@@ -0,0 +1,4 @@
+/datum/client_preference/ooc_donation_color
+	description = "OOC donator color"
+	key = "OOC_DONATION_COLOR"
+	options = list(GLOB.PREF_SHOW, GLOB.PREF_HIDE)

From b9f1f08d645a3901d11514572827803009b1f52a Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:50:12 +0300
Subject: [PATCH 3/4] Update loadout tiers appearance

---
 html/browser/common.css | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/html/browser/common.css b/html/browser/common.css
index 34a45e86fe5ae..a05b9f8677a73 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -423,23 +423,29 @@ a.gray.selected {	box-shadow: inset 0 0 0 1px #ebebeb; }
 a.linkOn.selected { box-shadow: inset 0 0 0 1px #aeebae; }
 a.linkOff.selected { box-shadow: inset 0 0 0 1px #ebebeb; }
 
+/**************
+   SierraBay
+**************/
+
+/* DON_LOADOUT */
+
 .dt_1 {
 	font-weight: bold;
 	color: rgb(83, 107, 189);
-	text-shadow: 0 0 8px rgba(83, 107, 189, .4);
+	text-shadow: 0 0 8px rgba(83, 107, 189, .6);
 }
 .dt_2 {
 	font-weight: bold;
 	color: rgb(91, 16, 212);
-	text-shadow: 0 0 8px rgba(91, 16, 212, .4);
+	text-shadow: 0 0 8px rgba(91, 16, 212, .6);
 }
 .dt_3 {
 	font-weight: bold;
 	color: rgb(175, 48, 207);
-	text-shadow: 0 0 8px rgba(175, 48, 207, .4);
+	text-shadow: 0 0 8px rgba(175, 48, 207, .6);
 }
 .dt_4 {
 	font-weight: bold;
 	color: rgb(229, 25, 219);
-	text-shadow: 0 0 8px rgba(229, 25, 219, .4);
+	text-shadow: 0 0 8px rgba(229, 25, 219, .6);
 }

From 856ff0c0a13b3d56fec9f0ac999708a7c09bfd37 Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:50:28 +0300
Subject: [PATCH 4/4] Remove unused donations data

---
 mods/don_loadout/code/donations/donator.dm | 4 ----
 mods/don_loadout/code/loadout/loadout.dm   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/mods/don_loadout/code/donations/donator.dm b/mods/don_loadout/code/donations/donator.dm
index 805022719f694..87cc07327d34e 100644
--- a/mods/don_loadout/code/donations/donator.dm
+++ b/mods/don_loadout/code/donations/donator.dm
@@ -37,7 +37,6 @@
 /datum/donator_info
 	var/donator = FALSE
 	var/donation_type = DONATION_TIER_NONE
-	var/list/items = new
 
 /datum/donator_info/proc/on_donation_tier_loaded(client/C)
 	return
@@ -65,6 +64,3 @@
 			return FALSE
 
 	CRASH("This code should not be accessible")
-
-/datum/donator_info/proc/has_item(type)
-	return "[type]" in items
diff --git a/mods/don_loadout/code/loadout/loadout.dm b/mods/don_loadout/code/loadout/loadout.dm
index 2034390828c10..c40e29e419151 100644
--- a/mods/don_loadout/code/loadout/loadout.dm
+++ b/mods/don_loadout/code/loadout/loadout.dm
@@ -172,7 +172,7 @@
 		entry += "</td></tr>"
 
 		if(!hide_unavailable_gear || allowed_to_see || ticked)
-			if(user.client.donator_info.has_item(G.type) || (G.donation_tier && user.client.donator_info.donation_tier_available(G.donation_tier)))
+			if(G.donation_tier && user.client.donator_info.donation_tier_available(G.donation_tier))
 				purchased_gears += entry
 			else if(G.donation_tier)
 				paid_gears += entry