From a89abd5ae8a9cde4cc15a1c7179c95c2932fc614 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Wed, 27 Jun 2018 00:30:30 +0200 Subject: [PATCH] Remove OOC metadata --- code/modules/client/preferences.dm | 12 ------------ code/modules/client/preferences_savefile.dm | 3 --- code/modules/mob/living/living.dm | 15 --------------- config/config.txt | 3 --- 4 files changed, 33 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4f903f12c62..926d63ed3d9 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -102,9 +102,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) // 0 = character settings, 1 = game preferences var/current_tab = 0 - // OOC Metadata: - var/metadata = "" - var/unlock_content = 0 var/list/ignoring = list() @@ -579,9 +576,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(unlock_content || check_rights_for(user.client, R_ADMIN)) dat += "OOC Color:     Change
" - if(CONFIG_GET(flag/allow_metadata)) - dat += "OOC Notes: Edit
" - dat += "" if(user.client.holder) @@ -1116,17 +1110,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_age) age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN) - if("metadata") - var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata) as message|null - if(new_metadata) - metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN)) - if("hair") var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null if(new_hair) hair_color = sanitize_hexcolor(new_hair) - if("hair_style") var/new_hair_style if(gender == MALE) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 199a0eab6b5..e1a748b2cbf 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -211,7 +211,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["features["mcolor"]"] , "#FFF") //Character - S["OOC_Notes"] >> metadata S["real_name"] >> real_name S["name_is_always_random"] >> be_random_name S["body_is_always_random"] >> be_random_body @@ -275,7 +274,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car update_character(needs_update, S) //needs_update == savefile_version if we need an update (positive integer) //Sanitize - metadata = sanitize_text(metadata, initial(metadata)) real_name = reject_bad_name(real_name) if(!features["mcolor"] || features["mcolor"] == "#000") features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") @@ -343,7 +341,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //load_character will sanitize any bad data, so assume up-to-date.) //Character - WRITE_FILE(S["OOC_Notes"] , metadata) WRITE_FILE(S["real_name"] , real_name) WRITE_FILE(S["name_is_always_random"] , be_random_name) WRITE_FILE(S["body_is_always_random"] , be_random_body) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c46f839601e..4858e249b84 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -446,21 +446,6 @@ /mob/living/proc/update_damage_overlays() return -/mob/living/proc/Examine_OOC() - set name = "Examine Meta-Info (OOC)" - set category = "OOC" - set src in view() - - if(CONFIG_GET(flag/allow_metadata)) - if(client) - to_chat(src, "[src]'s Metainfo:
[client.prefs.metadata]") - else - to_chat(src, "[src] does not have any stored information!") - else - to_chat(src, "OOC Metadata is not supported by this server!") - - return - /mob/living/Move(atom/newloc, direct) if (buckled && buckled.loc != newloc) //not updating position if (!buckled.anchored) diff --git a/config/config.txt b/config/config.txt index 56f19ba8564..2c857b99312 100644 --- a/config/config.txt +++ b/config/config.txt @@ -140,9 +140,6 @@ ALLOW_ADMIN_OOCCOLOR ## Job slot open/close by identification consoles delay in seconds ID_CONSOLE_JOBSLOT_DELAY 30 -## If metadata is supported -ALLOW_METADATA - ## allow players to initiate a restart vote #ALLOW_VOTE_RESTART