Donations update

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

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);
+}

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);
+}

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);
 }

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()`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.

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"

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

mods/don_loadout/code/donations/donator.dm

@@ -37,15 +37,16 @@
 /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
 
-/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)
@@ -63,6 +64,3 @@
 			return FALSE
 
 	CRASH("This code should not be accessible")
-
-/datum/donator_info/proc/has_item(type)
-	return "[type]" in items

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)

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