cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 10:34:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #16240 from ShadowLarkens/revert"

Browse Source 
This reverts commit 885171f985, reversing
changes made to 3e314f8064.
This commit is contained in:
ShadowLarkens
2024-09-01 13:12:20 -07:00
parent 49dda94177
commit f9052dbb60
186 changed files with 5029 additions and 2255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/ooc.dm
+5 -5
View File
@@ -15,7 +15,7 @@
msg = sanitize(msg)
if(!msg) return
if(!is_preference_enabled(/datum/client_preference/show_ooc))
if(!prefs?.read_preference(/datum/preference/toggle/show_ooc))
to_chat(src, "<span class='warning'>You have OOC muted.</span>")
return
@@ -66,7 +66,7 @@
msg = GLOB.is_valid_url.Replace(msg,"<span class='linkify'>$1</span>")
for(var/client/target in GLOB.clients)
if(target.is_preference_enabled(/datum/client_preference/show_ooc))
if(target.prefs?.read_preference(/datum/preference/toggle/show_ooc))
if(target.is_key_ignored(key)) // If we're ignored by this person, then do nothing.
continue
var/display_name = src.key
@@ -101,7 +101,7 @@
if(!msg)
return
if(!is_preference_enabled(/datum/client_preference/show_looc))
if(!prefs?.read_preference(/datum/preference/toggle/show_looc))
to_chat(src, "<span class='danger'>You have LOOC muted.</span>")
return
@@ -159,7 +159,7 @@
// Everyone in normal viewing range of the LOOC
for(var/mob/viewer in m_viewers)
if(viewer.client && viewer.client.is_preference_enabled(/datum/client_preference/show_looc))
if(viewer.client && viewer.client.prefs?.read_preference(/datum/preference/toggle/show_looc))
receivers |= viewer.client
else if(istype(viewer,/mob/observer/eye)) // For AI eyes and the like
var/mob/observer/eye/E = viewer
@@ -168,7 +168,7 @@
// Admins with RLOOC displayed who weren't already in
for(var/client/admin in GLOB.admins)
if(!(admin in receivers) && admin.is_preference_enabled(/datum/client_preference/holder/show_rlooc))
if(!(admin in receivers) && admin.prefs?.read_preference(/datum/preference/toggle/holder/show_rlooc))
if(check_rights(R_SERVER, FALSE, admin)) //Stop rLOOC showing for retired staff
r_receivers |= admin
code/modules/client/verbs/typing.dm
+7 -7
View File
@@ -7,7 +7,7 @@
src << output('html/typing_indicator.html', "commandbar_spy")
/client/proc/handle_commandbar_typing(href_list)
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator))
return
if(length(href_list["verb"]) < 1 || !(lowertext(href_list["verb"]) in IC_VERBS) || text2num(href_list["argument_length"]) < 1)
@@ -31,10 +31,10 @@
/** Sets the mob as "thinking" - with indicator and the TRAIT_THINKING_IN_CHARACTER trait */
/client/proc/start_thinking(channel)
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator))
return FALSE
if(channel == "Whis" || channel == "Subtle" || channel == "whisper" || channel == "subtle")
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator_subtle))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator_subtle))
return FALSE
ADD_TRAIT(mob, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
mob.create_thinking_indicator()
@@ -50,10 +50,10 @@
/client/proc/start_typing(channel)
var/mob/client_mob = mob
client_mob.remove_thinking_indicator()
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator) || !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator) || !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER))
return FALSE
if(channel == "Whis" || channel == "Subtle" || channel == "whisper" || channel == "subtle")
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator_subtle))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator_subtle))
return FALSE
client_mob.create_typing_indicator()
addtimer(CALLBACK(src, PROC_REF(stop_typing), channel), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
@@ -67,10 +67,10 @@
return FALSE
var/mob/client_mob = mob
client_mob.remove_typing_indicator()
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator) || !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator) || !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER))
return FALSE
if(channel == "Whis" || channel == "Subtle" || channel == "whisper" || channel == "subtle")
if(!is_preference_enabled(/datum/client_preference/show_typing_indicator_subtle))
if(!prefs?.read_preference(/datum/preference/toggle/show_typing_indicator_subtle))
return FALSE
client_mob.create_thinking_indicator()