Revert "Adds a preference to toggle Goonchat off." (#12270)

code/__defines/misc.dm

@@ -65,7 +65,6 @@
 #define PARALLAX_IS_STATIC 0x8
 #define FLOATING_MESSAGES 0x10
 #define HOTKEY_DEFAULT 0x20
-#define GOONCHAT_ON   0x40
 
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|CHAT_GHOSTLOOC)
 

code/modules/client/preference_setup/global/02_settings.dm

@@ -97,8 +97,7 @@
 		"<b>Progress Bars:</b> <a href='?src=\ref[src];paratoggle=[PROGRESS_BARS]'><b>[(pref.toggles_secondary & PROGRESS_BARS) ? "Yes" : "No"]</b></a><br>",
 		"<b>Floating Messages:</b> <a href='?src=\ref[src];paratoggle=[FLOATING_MESSAGES]'><b>[(pref.toggles_secondary & FLOATING_MESSAGES) ? "Yes" : "No"]</b></a><br>",
 		"<b>Static Space:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_IS_STATIC]'><b>[(pref.toggles_secondary & PARALLAX_IS_STATIC) ? "Yes" : "No"]</b></a><br>",
-		"<b>Hotkey Mode Default:</b> <a href='?src=\ref[src];paratoggle=[HOTKEY_DEFAULT]'><b>[(pref.toggles_secondary & HOTKEY_DEFAULT) ? "On" : "Off"]</b></a><br>",
-		"<b>Goonchat:</b> <a href='?src=\ref[src];paratoggle=[GOONCHAT_ON]'><b>[(pref.toggles_secondary & GOONCHAT_ON) ? "On" : "Off"]</b></a><br>"
+		"<b>Hotkey Mode Default:</b> <a href='?src=\ref[src];paratoggle=[HOTKEY_DEFAULT]'><b>[(pref.toggles_secondary & HOTKEY_DEFAULT) ? "On" : "Off"]</b></a><br>"
 	)
 
 	. = dat.Join()
@@ -117,25 +116,10 @@
 	if(href_list["paratoggle"])
 		var/flag = text2num(href_list["paratoggle"])
 		pref.toggles_secondary ^= flag
-		toggle_flag(flag)
 		return TOPIC_REFRESH
 
 	return ..()
 
-/datum/category_item/player_setup_item/player_global/settings/proc/toggle_flag(var/flag)
-	var/mob/M = preference_mob()
-	var/client/C = M.client
-	switch(flag)
-		if(GOONCHAT_ON)
-			if(pref.toggles_secondary & GOONCHAT_ON)
-				C.chatOutput.loaded = FALSE
-				C.chatOutput.start()
-			else
-				C.chatOutput.ehjax_send(data = "setWhiteTheme")
-				winset(C, "output", "is-visible=true;is-disabled=false")
-				winset(C, "browseroutput", "is-visible=false")
-				to_chat(C, "<span class='danger'>If you had dark mode on with Goonchat prior to switching chats, your accent icons will probably not work. Restart your game.</span>")
-
 /datum/category_item/player_setup_item/player_global/settings/proc/validate_current_character()
 	if (!establish_db_connection(dbcon))
 		return pref.current_character

code/modules/goonchat/browserassets/js/browserOutput.js

@@ -517,10 +517,6 @@ function ehjaxCallback(data) {
 		opts.pingTime = Date.now();
 		runByond('?_src_=chat&proc=ping');
 
-	} else if (data == 'setWhiteTheme'){
-		setTheme('white');
-		savedConfig.stheme = 'white';
-
 	} else if (data == 'pong') {
 		if (opts.pingDisabled) {return;}
 		opts.pongTime = Date.now();

code/modules/mob/login.dm

@@ -71,6 +71,8 @@
 
 	player_age = client.player_age
 
+	client.chatOutput.start()
+
 	if(loc && !isturf(loc))
 		client.eye = loc
 		client.perspective = EYE_PERSPECTIVE
@@ -93,6 +95,3 @@
 
 	// Check code/modules/admin/verbs/antag-ooc.dm for definition
 	client.add_aooc_if_necessary()
-
-	if(client.prefs.toggles_secondary & GOONCHAT_ON)
-		client.chatOutput.start()

code/modules/mob/mob_helpers.dm

@@ -1170,11 +1170,8 @@ proc/is_blind(A)
 		var/datum/accent/a = SSrecords.accents[used_accent]
 		if(istype(a))
 			var/final_icon = a.tag_icon
-			if(client.prefs.toggles_secondary & GOONCHAT_ON)
-				var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat)
-				return S.icon_tag(final_icon)
-			else
-				return "<img src='\ref['./icons/accent_tags.dmi']' iconstate='[final_icon]'>"
+			var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat)
+			return S.icon_tag(final_icon)
 
 /mob/proc/flash_eyes(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /obj/screen/fullscreen/flash)
 	for(var/mob/M in contents)

code/stylesheet.dm

@@ -66,7 +66,6 @@ em						{font-style: normal;font-weight: bold;}
 .say					{}
 .alert					{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}
-.vote					{color: #6c18c0}
 
 .emote					{font-style: italic;}
 

html/changelogs/mattatlas-revertgcpref.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscdel: "Removed the goonchat toggle due to cache issues."