diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index c500e83c6ff..5727a024149 100644 --- a/code/__defines/misc.dm +++ b/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) diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm index 53b66f76899..1c654a2a72c 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -97,8 +97,7 @@ "Progress Bars: [(pref.toggles_secondary & PROGRESS_BARS) ? "Yes" : "No"]
", "Floating Messages: [(pref.toggles_secondary & FLOATING_MESSAGES) ? "Yes" : "No"]
", "Static Space: [(pref.toggles_secondary & PARALLAX_IS_STATIC) ? "Yes" : "No"]
", - "Hotkey Mode Default: [(pref.toggles_secondary & HOTKEY_DEFAULT) ? "On" : "Off"]
", - "Goonchat: [(pref.toggles_secondary & GOONCHAT_ON) ? "On" : "Off"]
" + "Hotkey Mode Default: [(pref.toggles_secondary & HOTKEY_DEFAULT) ? "On" : "Off"]
" ) . = 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, "If you had dark mode on with Goonchat prior to switching chats, your accent icons will probably not work. Restart your game.") - /datum/category_item/player_setup_item/player_global/settings/proc/validate_current_character() if (!establish_db_connection(dbcon)) return pref.current_character diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js index 54125be38d3..1146c8b98d8 100644 --- a/code/modules/goonchat/browserassets/js/browserOutput.js +++ b/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(); diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 95b9e597e43..9a551a772da 100644 --- a/code/modules/mob/login.dm +++ b/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() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index dfa9c62e90f..875d2e5e3da 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/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 "" + 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) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 1f4dc480b4c..82ed522058e 100644 --- a/code/stylesheet.dm +++ b/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;} diff --git a/html/changelogs/mattatlas-revertgcpref.yml b/html/changelogs/mattatlas-revertgcpref.yml new file mode 100644 index 00000000000..6edbbbbfcf6 --- /dev/null +++ b/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."