cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes preference instantation runtime (#48048)

Browse Source
This commit is contained in:
AnturK
2019-11-30 04:13:24 -08:00
committed by Rob Bailey
parent 94292142a4
commit c2e89e88bf
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+12 -8
View File
@@ -412,14 +412,18 @@ GLOBAL_LIST_EMPTY(species_list)
/proc/deadchat_broadcast(message, source=null, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR)
message = "<span class='deadsay'>[source]<span class='linkify'>[message]</span></span>"
for(var/mob/M in GLOB.player_list)
var/datum/preferences/prefs
var/chat_toggles = TOGGLES_DEFAULT_CHAT
var/toggles = TOGGLES_DEFAULT
var/list/ignoring
if(M.client.prefs)
prefs = M.client.prefs
else
prefs = new
var/datum/preferences/prefs = M.client.prefs
chat_toggles = prefs.chat_toggles
toggles = prefs.toggles
ignoring = prefs.ignoring
var/override = FALSE
if(M.client.holder && (prefs.chat_toggles & CHAT_DEAD))
if(M.client.holder && (chat_toggles & CHAT_DEAD))
override = TRUE
if(HAS_TRAIT(M, TRAIT_SIXTHSENSE))
override = TRUE
@@ -427,15 +431,15 @@ GLOBAL_LIST_EMPTY(species_list)
continue
if(M.stat != DEAD && !override)
continue
if(speaker_key && speaker_key in prefs.ignoring)
if(speaker_key && speaker_key in ignoring)
continue
switch(message_type)
if(DEADCHAT_DEATHRATTLE)
if(prefs.toggles & DISABLE_DEATHRATTLE)
if(toggles & DISABLE_DEATHRATTLE)
continue
if(DEADCHAT_ARRIVALRATTLE)
if(prefs.toggles & DISABLE_ARRIVALRATTLE)
if(toggles & DISABLE_ARRIVALRATTLE)
continue
if(isobserver(M))
code/modules/client/preferences.dm
+1 -1
View File
@@ -129,7 +129,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//we couldn't load character data so just randomize the character appearance + name
random_character() //let's create a random character then - rather than a fat, bald and naked man.
key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys
C.update_movement_keys()
C?.update_movement_keys()
real_name = pref_species.random_name(gender,1)
if(!loaded_preferences_successfully)
save_preferences()