diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 1bbdebe8cf8..0ef043c5cb3 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -212,4 +212,4 @@ /datum/browser/clean/get_footer() return {" -"} \ No newline at end of file +"} diff --git a/code/game/sound.dm b/code/game/sound.dm index 3722deba617..b0de4318c5b 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -135,7 +135,7 @@ var/const/SURROUND_CAP = 7 return if(prefs.toggles & SOUND_LOBBY) if(istype(src)) - src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS + src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBY) // MAD JAMS /proc/get_rand_frequency() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5aa5dc1d092..0e9453c2bc1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1,7 +1,6 @@ //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless var/list/admin_verbs_default = list( /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ - /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/ /client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/ /client/proc/hide_verbs, /*hides all our adminverbs*/ /client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/ @@ -55,9 +54,6 @@ var/list/admin_verbs_admin = list( /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ - /client/proc/toggleprayers, /*toggles prayers on/off*/ -// /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/ - /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/secrets, /client/proc/shuttle_magic, @@ -72,8 +68,6 @@ var/list/admin_verbs_admin = list( /client/proc/free_slot, /*frees slot for chosen job*/ /client/proc/cmd_admin_change_custom_event, /client/proc/cmd_admin_rejuvenate, - /client/proc/toggleattacklogs, - /client/proc/toggledebuglogs, /client/proc/check_customitem_activity, // /client/proc/man_up, // /client/proc/global_man_up, @@ -171,7 +165,6 @@ var/list/admin_verbs_debug = list( /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/callproc, - /client/proc/toggledebuglogs, /client/proc/qdel_toggle, // /vg/ /client/proc/cmd_admin_dump_instances, // /vg/ /client/proc/cmd_admin_dump_machine_type_list, // /vg/ @@ -218,9 +211,6 @@ var/list/admin_verbs_polling = list( var/list/admin_verbs_hideable = list( /client/proc/set_ooc, /client/proc/deadmin_self, -// /client/proc/deadchat, - /client/proc/toggleprayers, - /client/proc/toggle_hear_radio, /datum/admins/proc/show_traitor_panel, /datum/admins/proc/toggleenter, /datum/admins/proc/toggleguests, @@ -295,7 +285,6 @@ var/list/admin_verbs_mod = list( /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/ - /client/proc/toggledebuglogs, /datum/admins/proc/PlayerNotes, /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/cmd_mod_say, @@ -910,17 +899,6 @@ var/list/admin_verbs_mod = list( job_master.FreeRole(job) return -/client/proc/toggleattacklogs() - set name = "Toggle Attack Log Messages" - set category = "Preferences" - - prefs.toggles ^= CHAT_ATTACKLOGS - prefs.save_preferences_sqlite(src, ckey) - if (prefs.toggles & CHAT_ATTACKLOGS) - to_chat(usr, "You now will get attack log messages") - else - to_chat(usr, "You now won't get attack log messages") - /client/proc/commandname() set name = "Set Command Name" set category = "Fun" @@ -929,18 +907,6 @@ var/list/admin_verbs_mod = list( if(text) change_command_name(text) -/client/proc/toggledebuglogs() - set name = "Toggle Debug Log Messages" - set category = "Preferences" - - prefs.toggles ^= CHAT_DEBUGLOGS - prefs.save_preferences_sqlite(src, ckey) - if (prefs.toggles & CHAT_DEBUGLOGS) - to_chat(usr, "You now will get debug log messages") - else - to_chat(usr, "You now won't get debug log messages") - - /client/proc/man_up(mob/T as mob in mob_list) set category = "Fun" set name = "Man Up" diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index aaedf0b3503..4dfc033ee0b 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -345,7 +345,7 @@ /client/verb/resend_resources() set name = "Resend Resources" set desc = "Re-send resources for NanoUI. May help those with NanoUI issues." - set category = "Preferences" + set category = "OOC" to_chat(usr, "Re-sending NanoUI resources. This may result in lag.") nanomanager.send_resources(src) @@ -429,3 +429,12 @@ var/obj/item/clothing/under/U = H.get_item_by_slot(slot_w_uniform) if(istype(U)) U.update_holomap() + +/client/verb/SwapSides() + set name = "swapsides" + set hidden = 1 + var/newsplit = 100 - text2num(winget(usr, "mainwindow.mainvsplit", "splitter")) + if(winget(usr, "mainwindow.mainvsplit", "right") == "rpane") + winset(usr, "mainwindow.mainvsplit", "right=mapwindow;left=rpane;splitter=[newsplit]") + else + winset(usr, "mainwindow.mainvsplit", "right=rpane;left=mapwindow;splitter=[newsplit]") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3afe781a6a3..34b31ae6587 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1,4 +1,7 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 +#define CHARACTER_SETUP 0 +#define UI_SETUP 1 +#define GENERAL_SETUP 2 +#define SPECIAL_ROLES_SETUP 3 var/list/preferences_datums = list() @@ -9,7 +12,7 @@ var/global/list/special_roles = list( ROLE_CHANGELING = IS_MODE_COMPILED("changeling"), ROLE_CULTIST = IS_MODE_COMPILED("cult"), ROLE_PLANT = 1, - "infested monkey" = IS_MODE_COMPILED("monkey"), +// "infested monkey" = IS_MODE_COMPILED("monkey"), ROLE_MALF = IS_MODE_COMPILED("malfunction"), //ROLE_NINJA = 1, ROLE_OPERATIVE = IS_MODE_COMPILED("nuclear"), @@ -34,6 +37,7 @@ var/list/antag_roles = list( ROLE_VAMPIRE = IS_MODE_COMPILED("vampire"), ROLE_VOXRAIDER = IS_MODE_COMPILED("heist"), ROLE_WIZARD = 1, +// "infested monkey" = IS_MODE_COMPILED("monkey"), ) var/list/nonantag_roles = list( @@ -273,62 +277,85 @@ var/const/MAX_SAVE_SLOTS = 8 return dat -/datum/preferences/proc/setup_special(var/dat, var/user) - dat += {"
-

General Settings

- Space Parallax: [space_parallax ? "Enabled" : "Disabled"]
- Parallax Speed: [parallax_speed]
- Space Dust: [space_dust ? "Yes" : "No"]
- Play admin midis: [(toggles & SOUND_MIDI) ? "Yes" : "No"]
- Play lobby music: [(toggles & SOUND_LOBBY) ? "Yes" : "No"]
- Hear streamed media: [(toggles & SOUND_STREAMING) ? "Yes" : "No"]
- Use WMP: [(usewmp) ? "Yes" : "No"]
- Use NanoUI: [(usenanoui) ? "Yes" : "No"]
- Progress Bars: [(progress_bars) ? "Yes" : "No"]
- Randomized Character Slot: [randomslot ? "Yes" : "No"]
- Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearby Speech"]
- Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearby Emotes"]
- Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearby Speakers"]
- Ghost PDA: [(toggles & CHAT_GHOSTPDA) ? "All PDA Messages" : "No PDA Messages"]
- Special Windows: [special_popup ? "Yes" : "No"]
- Character Records: [jobban_isbanned(user, "Records") ? "Banned" : "Set
"] - Show Tooltips: [(tooltips) ? "Yes" : "No"]
- "} +/datum/preferences/proc/setup_special(var/dat, var/mob/user) + if(user.client.holder) + dat += {" +

Admin Only Settings

+ "} + + dat += {" +

General Settings

+"} if(config.allow_Metadata) dat += "OOC Notes: Edit
" - dat += "

Antagonist Settings

" - - if(jobban_isbanned(user, "Syndicate")) - dat += "You are banned from antagonist roles." - else - for (var/i in antag_roles) - if(antag_roles[i]) //if mode is available on the server - if(jobban_isbanned(user, i)) - dat += "Be [i]: \[BANNED]
" - else if(i == "pai candidate") - if(jobban_isbanned(user, "pAI")) - dat += "Be [i]: \[BANNED]
" - else - var/wikiroute = role_wiki[i] - dat += "Be [i]: [roles[i] & ROLEPREF_ENABLE ? "Yes" : "No"] [wikiroute ? "wiki" : ""]
" - - dat += "

Special Roles Settings

" - - for (var/i in nonantag_roles) - if(nonantag_roles[i]) //if mode is available on the server - if(jobban_isbanned(user, i)) - dat += "Be [i]: \[BANNED]
" - else if(i == "pai candidate") - if(jobban_isbanned(user, "pAI")) - dat += "Be [i]: \[BANNED]
" - else - var/wikiroute = role_wiki[i] - dat += "Be [i]: [roles[i] & ROLEPREF_ENABLE ? "Yes" : "No"] [wikiroute ? "wiki" : ""]
" - - dat += "
" return dat + /datum/preferences/proc/getPrefLevelText(var/datum/job/job) if(GetJobDepartment(job, 1) & job.flag) return "High" @@ -338,6 +365,7 @@ var/const/MAX_SAVE_SLOTS = 8 return "Low" else return "NEVER" + /datum/preferences/proc/getPrefLevelUpOrDown(var/datum/job/job, var/inc) if(GetJobDepartment(job, 1) & job.flag) if(inc) @@ -549,20 +577,23 @@ var/const/MAX_SAVE_SLOTS = 8 else dat += "Please create an account to save your preferences." - dat += "
Character Settings | " - dat += "UI Settings | " - dat += "General Settings

" + dat += "
Character Settings | " + dat += "UI Settings | " + dat += "General Settings | " + dat += "Special Roles

" if(appearance_isbanned(user)) dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game.
" switch(current_tab) - if(0) + if(CHARACTER_SETUP) dat = setup_character_options(dat, user) - if(1) + if(UI_SETUP) dat = setup_UI(dat, user) - if(2) + if(GENERAL_SETUP) dat = setup_special(dat, user) + if(SPECIAL_ROLES_SETUP) + dat = configure_special_roles(dat, user) dat += "
" @@ -923,13 +954,11 @@ NOTE: The change will take effect AFTER any current recruiting periods."} save_character_sqlite(user.ckey, user, default_slot) return 1 + /datum/preferences/proc/process_link(mob/user, list/href_list) if(!user) return - if(!istype(user, /mob/new_player)) - return - if(href_list["preference"] == "job") switch(href_list["task"]) if("close") @@ -1296,7 +1325,6 @@ NOTE: The change will take effect AFTER any current recruiting periods."} if(new_relation) nanotrasen_relation = new_relation - if("limbs") var/list/limb_input = list( "Left Leg [organ_data[LIMB_LEFT_LEG]]" = LIMB_LEFT_LEG, @@ -1472,9 +1500,18 @@ NOTE: The change will take effect AFTER any current recruiting periods."} if("lobby_music") toggles ^= SOUND_LOBBY if(toggles & SOUND_LOBBY) - user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) + if(istype(user,/mob/new_player)) + user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBY) else - user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) + user << sound(null, repeat = 0, wait = 0, volume = 0, channel = CHANNEL_LOBBY) + + if("volume") + user.client.set_new_volume() + + if("ambience") + toggles ^= SOUND_AMBIENCE + if(!(toggles & SOUND_LOBBY)) + user << sound(null, repeat = 0, wait = 0, volume = 0, channel = CHANNEL_AMBIENCE) if("jukebox") toggles ^= SOUND_STREAMING @@ -1499,6 +1536,12 @@ NOTE: The change will take effect AFTER any current recruiting periods."} if("ghost_pda") toggles ^= CHAT_GHOSTPDA + if("show_ooc") + toggles ^= CHAT_OOC + + if("show_looc") + toggles ^= CHAT_LOOC + if("save") if(world.timeofday >= (lastPolled + POLLED_LIMIT)) save_preferences_sqlite(user, user.ckey) @@ -1527,6 +1570,24 @@ NOTE: The change will take effect AFTER any current recruiting periods."} if("tab") if(href_list["tab"]) current_tab = text2num(href_list["tab"]) + + if(user.client.holder) + switch(href_list["preference"]) + if("hear_ahelp") + toggles ^= SOUND_ADMINHELP + + if("hear_prayer") + toggles ^= CHAT_PRAYER + + if("hear_radio") + toggles ^= CHAT_GHOSTRADIO + + if("hear_attack") + toggles ^= CHAT_ATTACKLOGS + + if("hear_debug") + toggles ^= CHAT_DEBUGLOGS + ShowChoices(user) return 1 @@ -1665,8 +1726,8 @@ NOTE: The change will take effect AFTER any current recruiting periods."} /datum/preferences/proc/close_load_dialog(mob/user) user << browse(null, "window=saves") -/datum/preferences/proc/configure_special_roles(var/mob/user) - var/html={"
+/datum/preferences/proc/configure_special_roles(var/dat, var/mob/user) + dat+={"

Special Role Preferences

@@ -1675,44 +1736,94 @@ NOTE: The change will take effect AFTER any current recruiting periods."} Legend
Never:
-
Always answer no to this role.
+
Automatically respond 'no' to all requests to become this role.
No:
-
Answer no for this round. (Default)
+
Responds no to requests to become this role, with options to sign up to become it. Default.
Yes:
-
Answer yes for this round.
+
Responds yes to requests to become this role, with options to opt out of becoming it.
Always:
-
Always answer yes to this role.
+
Automatically respond 'yes' to all requests to become this role.
- + +
- + + + + "} + + + dat += {" + + - - - "} - for(var/role_id in special_roles) - var/desire = get_role_desire_str(roles[role_id]) - html += {" - - - - - - "} - html += {" + "} + + if(jobban_isbanned(user, "Syndicate")) + dat += "" + else + for(var/role_id in antag_roles) + dat += "" + dat += "" + if(antag_roles[role_id]) //if mode is available on the server + if(jobban_isbanned(user, role_id)) + dat += "" + else if(role_id == "pai candidate") + if(jobban_isbanned(user, "pAI")) + dat += "" + else + var/wikiroute = role_wiki[role_id] + var/desire = get_role_desire_str(roles[role_id]) + dat += {" + + + + + "} + + dat += "" + + dat += {" + + + + + + + "} + + for(var/role_id in nonantag_roles) + dat += "" + dat += "" + if(nonantag_roles[role_id]) //if mode is available on the server + if(jobban_isbanned(user, role_id)) + dat += "" + else if(role_id == "pai candidate") + if(jobban_isbanned(user, "pAI")) + dat += "" + else + var/wikiroute = role_wiki[role_id] + var/desire = get_role_desire_str(roles[role_id]) + dat += {" + + + + + "} + + dat += {"
Role

Antagonist Roles

RoleInstructions Never No Yes Always
[role_id]

You are banned from antagonist roles

[capitalize(role_id)]\[BANNED]\[BANNED][wikiroute ? "Role Wiki" : "None"]

Non-Antagonist Roles

RoleInstructionsNeverNoYesAlways
[capitalize(role_id)]\[BANNED]\[BANNED][wikiroute ? "Role Wiki" : ""]
+
-
"} - var/datum/browser/B = new /datum/browser/clean(user, "roles", "Role Selections", 300, 390) - B.set_content(html) - B.add_stylesheet("specialroles", 'html/browser/config_roles.css') - B.open() + +
"} + return dat /datum/preferences/Topic(href, href_list) if(!usr || !client) @@ -1725,3 +1836,16 @@ NOTE: The change will take effect AFTER any current recruiting periods."} return SetRoles(usr, href_list) if("set_role") return SetRole(usr, href_list) + +/client/verb/modify_preferences(page as num) + set name = "modifypreferences" + set hidden = 1 + if(!prefs.saveloaded) + to_chat(src, "Your character preferences have not yet loaded.") + return + switch(page) + if(1) + prefs.current_tab = GENERAL_SETUP + if(2) + prefs.current_tab = SPECIAL_ROLES_SETUP + prefs.ShowChoices(usr) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm deleted file mode 100644 index 4f0e07c3450..00000000000 --- a/code/modules/client/preferences_toggles.dm +++ /dev/null @@ -1,303 +0,0 @@ -//toggles -/client/verb/toggle_ghost_ears() - set name = "Show/Hide GhostEars" - set category = "Preferences" - set desc = "Toggle Between seeing all mob speech, and only speech of nearby mobs" - prefs.toggles ^= CHAT_GHOSTEARS - to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") - prefs.save_preferences_sqlite(src, ckey) - feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/toggle_ghost_sight() - set name = "Show/Hide GhostSight" - set category = "Preferences" - set desc = "Toggle Between seeing all mob emotes, and only emotes of nearby mobs" - prefs.toggles ^= CHAT_GHOSTSIGHT - to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") - prefs.save_preferences_sqlite(src, ckey) - feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/toggle_ghost_radio() - set name = "Enable/Disable GhostRadio" - set category = "Preferences" - set desc = "Toggle between hearing all radio chatter, or only from nearby speakers" - prefs.toggles ^= CHAT_GHOSTRADIO - to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].") - prefs.save_preferences_sqlite(src, ckey) - feedback_add_details("admin_verb","TGR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/toggle_ghost_pda() - set name = "Enable/Disable GhostPDA" - set category = "Preferences" - set desc = "Toggle between hearing all PDA messages, or none" - prefs.toggles ^= CHAT_GHOSTPDA - to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTPDA) ? "hear all PDA messages in the world" : "hear no PDA messages at all"].") - prefs.save_preferences_sqlite(src, ckey) - feedback_add_details("admin_verb","TGP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/toggle_hear_radio() - set name = "Show/Hide RadioChatter" - set category = "Preferences" - set desc = "Toggle seeing radiochatter from radios and speakers" - - if(!holder) - return - prefs.toggles ^= CHAT_RADIO - prefs.save_preferences_sqlite(src, ckey) - to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers") - feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/toggleadminhelpsound() - set name = "Hear/Silence Adminhelps" - set category = "Preferences" - set desc = "Toggle hearing a notification when admin PMs are recieved" - - if(!holder) - return - prefs.toggles ^= SOUND_ADMINHELP - prefs.save_preferences_sqlite(src, ckey) - to_chat(usr, "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") - feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/deadchat() // Deadchat toggle is usable by anyone. - set name = "Show/Hide Deadchat" - set category = "Preferences" - set desc ="Toggles seeing deadchat" - prefs.toggles ^= CHAT_DEAD - prefs.save_preferences_sqlite(src, ckey) - - if(src.holder) - to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") - else - to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") - - feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/toggleprayers() - set name = "Show/Hide Prayers" - set category = "Preferences" - set desc = "Toggles seeing prayers" - - prefs.toggles ^= CHAT_PRAYER - prefs.save_preferences_sqlite(src, ckey) - to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") - feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/toggletitlemusic() - set name = "Hear/Silence LobbyMusic" - set category = "Preferences" - set desc = "Toggles hearing the GameLobby music" - prefs.toggles ^= SOUND_LOBBY - prefs.save_preferences_sqlite(src, ckey) - if(prefs.toggles & SOUND_LOBBY) - to_chat(src, "You will now hear music in the game lobby.") - if(istype(mob, /mob/new_player)) - playtitlemusic() - else - to_chat(src, "You will no longer hear music in the game lobby.") - if(istype(mob, /mob/new_player)) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)// stop the jamsz - - feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/togglemidis() - set name = "Hear/Silence Midis" - set category = "Preferences" - set desc = "Toggles hearing sounds uploaded by admins" - prefs.toggles ^= SOUND_MIDI - prefs.save_preferences_sqlite(src, ckey) - if(prefs.toggles & SOUND_MIDI) - to_chat(src, "You will now hear any sounds uploaded by admins.") - else - var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777) - break_sound.priority = 255 - src << break_sound //breaks the client's sound output on channel 777 - - to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.") - feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/verb/listen_ooc() - set name = "Show/Hide OOC" - set category = "Preferences" - set desc = "Toggles seeing OutOfCharacter chat" - prefs.toggles ^= CHAT_OOC - prefs.save_preferences_sqlite(src,ckey) - to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") - feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - -/client/verb/listen_looc() - set name = "Show/Hide LOOC" - set category = "Preferences" - set desc = "Toggles seeing Local OutOfCharacter chat" - prefs.toggles ^= CHAT_LOOC - prefs.save_preferences_sqlite(src, ckey) - to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") - feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - -/client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful - set name = "Hear/Silence Ambience" - set category = "Preferences" - set desc = "Toggles hearing ambient sound effects" - prefs.toggles ^= SOUND_AMBIENCE - prefs.save_preferences_sqlite(src, ckey) - if(prefs.toggles & SOUND_AMBIENCE) - to_chat(src, "You will now hear ambient sounds.") - else - to_chat(src, "You will no longer hear ambient sounds.") - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) - feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - -/client/verb/change_ui() - set name = "Change UI" - set category = "Preferences" - set desc = "Configure your user interface" - - if(!ishuman(usr)) - to_chat(usr, "This only for human") - return - - var/UI_style_new = input(usr, "Select a style, we recommend White for customization") in list("White", "Midnight", "Orange", "old") - if(!UI_style_new) - return - - var/UI_style_alpha_new = input(usr, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num - if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) - return - - var/UI_style_color_new = input(usr, "Choose your UI color, dark colors are not recommended!") as color|null - if(!UI_style_color_new) - return - - //update UI - var/list/icons = usr.hud_used.adding + usr.hud_used.other +usr.hud_used.hotkeybuttons - icons.Add(usr.zone_sel) - - if(alert("Like it? Save changes?",,"Yes", "No") == "Yes") - prefs.UI_style = UI_style_new - prefs.UI_style_alpha = UI_style_alpha_new - prefs.UI_style_color = UI_style_color_new - prefs.save_preferences_sqlite(src, ckey) - to_chat(usr, "UI was saved") - for(var/obj/screen/I in icons) - if(I.color && I.alpha) - I.icon = ui_style2icon(UI_style_new) - I.color = UI_style_color_new - I.alpha = UI_style_alpha_new - -/client/verb/toggle_media() - set name = "Hear/Silence Streaming" - set category = "Preferences" - set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)" - - prefs.toggles ^= SOUND_STREAMING - prefs.save_preferences_sqlite(src, ckey) - to_chat(usr, "You will [(prefs.toggles & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.") - if(!media) - return - if(prefs.toggles & SOUND_STREAMING) - media.update_music() - else - media.stop_music() - -/client/verb/toggle_wmp() - set name = "Change Streaming Program" - set category = "Preferences" - set desc = "Toggle between using VLC and WMP to stream jukebox media" - - prefs.usewmp = !prefs.usewmp - prefs.save_preferences_sqlite(src, ckey) - to_chat(usr, "You will use [(prefs.usewmp) ? "WMP" : "VLC"] to hear streamed media.") - if(!media) - return - media.stop_music() - media.playerstyle = (prefs.usewmp ? PLAYER_OLD_HTML : PLAYER_HTML) - if(prefs.toggles & SOUND_STREAMING) - media.open() - media.update_music() - -/client/verb/setup_special_roles() - set name = "Setup Special Roles" - set category = "Preferences" - set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)" - - prefs.configure_special_roles(usr) - -/client/verb/toggle_nanoui() - set name = "Toggle nanoUI" - set category = "Preferences" - set desc = "Toggle using nanoUI or retro style UIs for objects that support both." - prefs.usenanoui = !prefs.usenanoui - - prefs.save_preferences_sqlite(src, ckey) - - if(!prefs.usenanoui) - to_chat(usr, "You will no longer use nanoUI on cross compatible UIs.") - else - to_chat(usr, "You will now use nanoUI on cross compatible UIs.") - -/client/verb/toggle_tooltips() - set name = "Toggle Tooltips" - set category = "Preferences" - set desc = "Toggle tooltips on mouseover." - - prefs.tooltips = !prefs.tooltips - prefs.save_preferences_sqlite(src,ckey) - to_chat(usr, "Tooltips are now [prefs.tooltips ? "enabled." : "disabled."]") - -/client/verb/toggle_progress_bars() - set name = "Toggle Progress Bars" - set category = "Preferences" - set desc = "Toggle the display of a progress bar above the target of action." - prefs.progress_bars = !prefs.progress_bars - - prefs.save_preferences_sqlite(src,ckey) - - if(!prefs.progress_bars) - to_chat(usr, "You will no longer see progress bars when doing delayed actions.") - else - to_chat(usr, "You will now see progress bars when doing delayed actions") - -/client/verb/toggle_space_parallax() - set name = "Toggle Space Parallax" - set category = "Preferences" - set desc = "Toggle the parallax effect of space turfs." - prefs.space_parallax = !prefs.space_parallax - - prefs.save_preferences_sqlite(src,ckey) - - if(!prefs.space_parallax) - to_chat(usr, "Space parallax is now deactivated.") - else - to_chat(usr, "Space parallax is now activated.") - - if(mob && mob.hud_used) - mob.hud_used.update_parallax_existence() - -/client/verb/toggle_space_dust() - set name = "Toggle Space Dust" - set category = "Preferences" - set desc = "Toggle the presence of dust on space turfs." - prefs.space_dust = !prefs.space_dust - - prefs.save_preferences_sqlite(src,ckey) - - if(!prefs.space_dust) - to_chat(usr, "Space dust is now deactivated.") - else - to_chat(usr, "Space dust is now activated.") - - if(mob && mob.hud_used) - mob.hud_used.update_parallax_existence() - -/client/verb/toggle_parallax_speed() - set name = "Change Parallax Speed" - set category = "Preferences" - set desc = "Change the speed at which parallax moves." - - prefs.parallax_speed = min(max(input(usr, "Enter a number between 0 and 5 included (default=2)","Parallax Speed Preferences",prefs.parallax_speed),0),5) - - prefs.save_preferences_sqlite(src,ckey) \ No newline at end of file diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 057e1894676..3ce4fd206ec 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -214,14 +214,17 @@ to_chat(#define MP_DEBUG(x) owner, x) /client/verb/change_volume() set name = "Set Volume" - set category = "Preferences" + set category = "OOC" set desc = "Set jukebox volume" + +/client/proc/set_new_volume() if(!media || !istype(media)) to_chat(usr, "You have no media datum to change, if you're not in the lobby tell an admin.") return + var/oldvolume = prefs.volume var/value = input("Choose your Jukebox volume.", "Jukebox volume", media.volume) value = round(max(0, min(100, value))) media.update_volume(value) - if(prefs) + if(prefs && (oldvolume != value)) prefs.volume = value prefs.save_preferences_sqlite(src, ckey) diff --git a/code/setup.dm b/code/setup.dm index 22d9f3f7287..dd9cedddb5c 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -1339,6 +1339,7 @@ var/proccalls = 1 #define ORE_PROCESSING_ALLOY 2 //SOUND CHANNELS +#define CHANNEL_LOBBY 1022 #define CHANNEL_AMBIENCE 1023 #define CHANNEL_ADMINMUSIC 1024 diff --git a/html/browser/common.css b/html/browser/common.css index 0e4b237017c..fdd9f2bd144 100644 --- a/html/browser/common.css +++ b/html/browser/common.css @@ -345,3 +345,30 @@ div.notice /* Remove antialias to prevent cataracts */ -ms-interpolation-mode: nearest-neighbor; } + +td.column { + width: 60px; + text-align: center; +} +td.clmNever { + background: #ffcccc; +} + +td.clmNo { + background: #ffeeee; +} + +td.clmYes { + background: #eeffee; +} + +td.clmAlways { + background: #ccffcc; +} + +label.fullsize +{ + width: 100%; + height: 100%; + display: inline-block; +} diff --git a/html/browser/config_roles.css b/html/browser/config_roles.css deleted file mode 100644 index 3588a4d6eb2..00000000000 --- a/html/browser/config_roles.css +++ /dev/null @@ -1,19 +0,0 @@ -td.column { - width: 50px; - text-align: center; -} -td.clmNever { - background: #ffcccc; -} - -td.clmNo { - background: #ffeeee; -} - -td.clmYes { - background: #eeffee; -} - -td.clmAlways { - background: #ccffcc; -} \ No newline at end of file diff --git a/interface/skin.dmf b/interface/skin.dmf index 06482f9ad7c..5093b3540eb 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1,522 +1,381 @@ macro "macro" elem "TAB" - name = "TAB" + name = "Tab" command = ".winset \"mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\"" - is-disabled = false elem "CENTER+REP" - name = "CENTER+REP" + name = "Center+REP" command = ".center" - is-disabled = false elem "NORTHEAST" - name = "NORTHEAST" + name = "Northeast" command = ".northeast" - is-disabled = false elem "SOUTHEAST" - name = "SOUTHEAST" + name = "Southeast" command = ".southeast" - is-disabled = false elem "SOUTHWEST" - name = "SOUTHWEST" + name = "Southwest" command = ".southwest" - is-disabled = false elem "NORTHWEST" - name = "NORTHWEST" + name = "Northwest" command = ".northwest" - is-disabled = false elem "CTRL+WEST" - name = "CTRL+WEST" + name = "CTRL+West" command = "westface" - is-disabled = false elem "WEST+REP" - name = "WEST+REP" + name = "West+REP" command = ".west" - is-disabled = false elem "CTRL+NORTH" - name = "CTRL+NORTH" + name = "CTRL+North" command = "northface" - is-disabled = false elem "NORTH+REP" - name = "NORTH+REP" + name = "North+REP" command = ".north" - is-disabled = false elem "CTRL+EAST" - name = "CTRL+EAST" + name = "CTRL+East" command = "eastface" - is-disabled = false elem "EAST+REP" - name = "EAST+REP" + name = "East+REP" command = ".east" - is-disabled = false elem "CTRL+SOUTH" - name = "CTRL+SOUTH" + name = "CTRL+South" command = "southface" - is-disabled = false elem "SOUTH+REP" - name = "SOUTH+REP" + name = "South+REP" command = ".south" - is-disabled = false elem "INSERT" - name = "INSERT" + name = "Insert" command = "a-intent right" - is-disabled = false elem "DELETE" - name = "DELETE" + name = "Delete" command = "delete-key-pressed" - is-disabled = false elem "CTRL+1" name = "CTRL+1" command = "a-intent help" - is-disabled = false elem "CTRL+2" name = "CTRL+2" command = "a-intent disarm" - is-disabled = false elem "CTRL+3" name = "CTRL+3" command = "a-intent grab" - is-disabled = false elem "CTRL+4" name = "CTRL+4" command = "a-intent harm" - is-disabled = false elem "CTRL+5" name = "CTRL+5" command = "a-kick" - is-disabled = false elem "CTRL+6" name = "CTRL+6" command = "a-bite" - is-disabled = false elem "CTRL+A+REP" name = "CTRL+A+REP" command = ".west" - is-disabled = false elem "CTRL+D+REP" name = "CTRL+D+REP" command = ".east" - is-disabled = false elem "CTRL+E" name = "CTRL+E" command = "quick-equip" - is-disabled = false elem "CTRL+F" name = "CTRL+F" command = "a-intent left" - is-disabled = false elem "CTRL+G" name = "CTRL+G" command = "a-intent right" - is-disabled = false elem "CTRL+Q" name = "CTRL+Q" command = ".northwest" - is-disabled = false elem "CTRL+R" name = "CTRL+R" command = ".southwest" - is-disabled = false elem "CTRL+S+REP" name = "CTRL+S+REP" command = ".south" - is-disabled = false elem "CTRL+W+REP" name = "CTRL+W+REP" command = ".north" - is-disabled = false elem "CTRL+X" name = "CTRL+X" command = ".northeast" - is-disabled = false elem "CTRL+Y" name = "CTRL+Y" command = "Activate-Held-Object" - is-disabled = false elem "CTRL+Z" name = "CTRL+Z" command = "Activate-Held-Object" - is-disabled = false elem "F1" name = "F1" command = "adminhelp" - is-disabled = false elem "CTRL+SHIFT+F1+REP" name = "CTRL+SHIFT+F1+REP" command = ".options" - is-disabled = false elem "F2+REP" name = "F2+REP" command = ".screenshot auto" - is-disabled = false elem "SHIFT+F2+REP" name = "SHIFT+F2+REP" command = ".screenshot" - is-disabled = false elem "F3" name = "F3" command = "say" - is-disabled = false elem "F4" name = "F4" command = "me" - is-disabled = false elem "F5" name = "F5" command = "Aghost" - is-disabled = false elem "F6" name = "F6" command = "Player-Panel-New" - is-disabled = false elem "F7" name = "F7" command = "Admin-PM" - is-disabled = false elem "F8" name = "F8" command = "Invisimin" - is-disabled = false elem "F12" name = "F12" command = "F12" - is-disabled = false elem "CTRL+SHIFT" name = "CTRL+SHIFT" command = ".fillmouse_down" - is-disabled = false elem "CTRL+SHIFT+UP" name = "CTRL+SHIFT+UP" command = ".fillmouse_released" - is-disabled = false macro "hotkeymode" elem "TAB" name = "TAB" command = ".winset \"mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true\"" - is-disabled = false elem "CENTER+REP" name = "CENTER+REP" command = ".center" - is-disabled = false elem "NORTHEAST" name = "NORTHEAST" command = ".northeast" - is-disabled = false elem "SOUTHEAST" name = "SOUTHEAST" command = ".southeast" - is-disabled = false elem "SOUTHWEST" name = "SOUTHWEST" command = ".southwest" - is-disabled = false elem "NORTHWEST" name = "NORTHWEST" command = ".northwest" - is-disabled = false elem "CTRL+WEST" name = "CTRL+WEST" command = "westface" - is-disabled = false elem "WEST+REP" name = "WEST+REP" command = ".west" - is-disabled = false elem "CTRL+NORTH" name = "CTRL+NORTH" command = "northface" - is-disabled = false elem "NORTH+REP" name = "NORTH+REP" command = ".north" - is-disabled = false elem "CTRL+EAST" name = "CTRL+EAST" command = "eastface" - is-disabled = false elem "EAST+REP" name = "EAST+REP" command = ".east" - is-disabled = false elem "CTRL+SOUTH" name = "CTRL+SOUTH" command = "southface" - is-disabled = false elem "SOUTH+REP" name = "SOUTH+REP" command = ".south" - is-disabled = false elem "INSERT" name = "INSERT" command = "a-intent right" - is-disabled = false elem "DELETE" name = "DELETE" command = "delete-key-pressed" - is-disabled = false elem "1" name = "1" command = "a-intent help" - is-disabled = false elem "CTRL+1" name = "CTRL+1" command = "a-intent help" - is-disabled = false elem "2" name = "2" command = "a-intent disarm" - is-disabled = false elem "CTRL+2" name = "CTRL+2" command = "a-intent disarm" - is-disabled = false elem "3" name = "3" command = "a-intent grab" - is-disabled = false elem "CTRL+3" name = "CTRL+3" command = "a-intent grab" - is-disabled = false elem "4" name = "4" command = "a-intent hurt" - is-disabled = false elem "CTRL+4" name = "CTRL+4" command = "a-intent hurt" - is-disabled = false elem "5" name = "5" command = "a-kick" - is-disabled = false elem "CTRL+5" name = "CTRL+5" command = "a-kick" - is-disabled = false elem "6" name = "6" command = "a-bite" - is-disabled = false elem "CTRL+6" name = "CTRL+6" command = "a-bite" - is-disabled = false elem "A+REP" name = "A+REP" command = ".west" - is-disabled = false elem "CTRL+A+REP" name = "CTRL+A+REP" command = ".west" - is-disabled = false elem "D+REP" name = "D+REP" command = ".east" - is-disabled = false elem "CTRL+D+REP" name = "CTRL+D+REP" command = ".east" - is-disabled = false elem "E" name = "E" command = "quick-equip" - is-disabled = false elem "CTRL+E" name = "CTRL+E" command = "quick-equip" - is-disabled = false elem "F" name = "F" command = "a-intent left" - is-disabled = false elem "CTRL+F" name = "CTRL+F" command = "a-intent left" - is-disabled = false elem "G" name = "G" command = "a-intent right" - is-disabled = false elem "CTRL+G" name = "CTRL+G" command = "a-intent right" - is-disabled = false elem "M" name = "M" command = "me" - is-disabled = false elem "O" name = "O" command = "ooc" - is-disabled = false elem "Q" name = "Q" command = ".northwest" - is-disabled = false elem "CTRL+Q" name = "CTRL+Q" command = ".northwest" - is-disabled = false elem "R" name = "R" command = ".southwest" - is-disabled = false elem "CTRL+R" name = "CTRL+R" command = ".southwest" - is-disabled = false elem "S+REP" name = "S+REP" command = ".south" - is-disabled = false elem "CTRL+S+REP" name = "CTRL+S+REP" command = ".south" - is-disabled = false elem "T" name = "T" command = "say" - is-disabled = false elem "W+REP" name = "W+REP" command = ".north" - is-disabled = false elem "CTRL+W+REP" name = "CTRL+W+REP" command = ".north" - is-disabled = false elem "X" name = "X" command = ".northeast" - is-disabled = false elem "CTRL+X" name = "CTRL+X" command = ".northeast" - is-disabled = false elem "Y" name = "Y" command = "Activate-Held-Object" - is-disabled = false elem "CTRL+Y" name = "CTRL+Y" command = "Activate-Held-Object" - is-disabled = false elem "Z" name = "Z" command = "Activate-Held-Object" - is-disabled = false elem "CTRL+Z" name = "CTRL+Z" command = "Activate-Held-Object" - is-disabled = false elem "F1" name = "F1" command = "adminhelp" - is-disabled = false elem "CTRL+SHIFT+F1+REP" name = "CTRL+SHIFT+F1+REP" command = ".options" - is-disabled = false elem "F2+REP" name = "F2+REP" command = ".screenshot auto" - is-disabled = false elem "SHIFT+F2+REP" name = "SHIFT+F2+REP" command = ".screenshot" - is-disabled = false elem "F3" name = "F3" command = "say" - is-disabled = false elem "F4" name = "F4" command = "me" - is-disabled = false elem "F5" name = "F5" command = "Aghost" - is-disabled = false elem "F6" name = "F6" command = "Player-Panel-New" - is-disabled = false elem "F7" name = "F7" command = "Admin-PM" - is-disabled = false elem "F8" name = "F8" command = "Invisimin" - is-disabled = false elem "F12" name = "F12" command = "F12" - is-disabled = false elem "CTRL+SHIFT" name = "CTRL+SHIFT" command = ".fillmouse_down" - is-disabled = false elem "CTRL+SHIFT+UP" name = "CTRL+SHIFT+UP" command = ".fillmouse_released" - is-disabled = false menu "menu" - elem + elem name = "&File" command = "" - category = "" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Quick screenshot\tF2" command = ".screenshot auto" category = "&File" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Save screenshot as...\tShift+F2" command = ".screenshot" category = "&File" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "" command = "" category = "&File" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Quit" command = ".quit" category = "&File" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Icons" command = "" - category = "" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" elem "stretch" name = "&Stretch to fit" @@ -525,70 +384,75 @@ menu "menu" is-checked = true can-check = true group = "size" - is-disabled = false saved-params = "is-checked" elem "icon64" name = "&64x64 (2x)" command = ".winset \"mapwindow.map.icon-size=64\"" category = "&Icons" - is-checked = false can-check = true group = "size" - is-disabled = false + saved-params = "is-checked" + elem "icon64" + name = "&48x48 (1.5x)" + command = ".winset \"mapwindow.map.icon-size=48\"" + category = "&Icons" + can-check = true + group = "size" saved-params = "is-checked" elem "icon32" name = "&32x32" command = ".winset \"mapwindow.map.icon-size=32\"" category = "&Icons" - is-checked = false can-check = true group = "size" - is-disabled = false saved-params = "is-checked" - elem + elem name = "" command = "" category = "&Icons" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" elem "textmode" name = "&Text" command = ".winset \"menu.textmode.is-checked=true?mapwindow.map.text-mode=true:mapwindow.map.text-mode=false\"" category = "&Icons" - is-checked = false can-check = true - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Help" command = "" - category = "" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Admin help\tF1" command = "adminhelp" category = "&Help" - is-checked = false - can-check = false - group = "" - is-disabled = false saved-params = "is-checked" - elem + elem name = "&Hotkeys" command = "hotkeys-help" category = "&Help" - is-checked = false - can-check = false - group = "" - is-disabled = false + saved-params = "is-checked" + elem "sweet" + name = "Settings" + command = "" + saved-params = "is-checked" + elem + name = "General Settings" + command = "modifypreferences 1" + category = "Settings" + saved-params = "is-checked" + elem + name = "Special Roles" + command = "modifypreferences 2" + category = "Settings" + saved-params = "is-checked" + elem "skinmenu" + name = "Skin" + command = "" + saved-params = "is-checked" + elem + name = "Swap Sides" + command = "swapsides" + category = "Skin" saved-params = "is-checked" @@ -599,38 +463,11 @@ window "Telecomms IDE" size = 569x582 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #ffffff is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" title = "TCS IDE" - titlebar = true statusbar = false - can-close = true - can-minimize = true - can-resize = true - is-pane = false - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" on-close = "exittcs" elem "button5" type = BUTTON @@ -638,84 +475,27 @@ window "Telecomms IDE" size = 70x20 anchor1 = 37,80 anchor2 = 49,83 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Clear Memory" - image = "" command = "tcsclearmem" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "button4" type = BUTTON pos = 157,464 size = 52x20 anchor1 = 28,80 anchor2 = 37,83 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Revert" - image = "" command = "tcsrevert" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "button3" type = BUTTON pos = 105,464 size = 52x20 anchor1 = 18,80 anchor2 = 28,83 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Execute" - image = "" command = "tcsrun" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "tcserror" type = OUTPUT pos = 0,488 @@ -724,80 +504,26 @@ window "Telecomms IDE" anchor2 = 99,100 font-family = "sans-serif" font-size = 9 - font-style = "" - text-color = #000000 background-color = #ffffff - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "max-lines" - on-size = "" - link-color = #0000ff - visited-color = #ff00ff - style = "" - enable-http-images = false - max-lines = 1000 - image = "" elem "button2" type = BUTTON pos = 53,464 size = 52x20 anchor1 = 9,80 anchor2 = 18,83 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Compile" - image = "" command = "tcscompile" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "button1" type = BUTTON pos = 0,464 size = 53x20 anchor1 = 0,80 anchor2 = 9,83 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Save" - image = "" command = "tcssave" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "tcscode" type = INPUT pos = 0,0 @@ -806,21 +532,10 @@ window "Telecomms IDE" anchor2 = 100,80 font-family = "Courier" font-size = 10 - font-style = "" - text-color = #000000 background-color = #ffffff - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" command = "cancel" multi-line = true - is-password = false no-command = true window "chemdispenser" @@ -830,177 +545,70 @@ window "chemdispenser" size = 625x412 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #414141 is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" title = "Chem Dispenser" - titlebar = true statusbar = false - can-close = true - can-minimize = true can-resize = false - is-pane = false - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "eject" type = BUTTON pos = 328,373 size = 296x39 anchor1 = 10,91 anchor2 = 100,100 - font-family = "" font-size = 13 - font-style = "" text-color = #808080 background-color = #414141 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "[Insert beaker]" - image = "" command = "skincmd \"chemdispenser;eject\"" is-flat = true - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "amountc" type = BUTTON pos = 0,373 size = 280x39 anchor1 = 0,91 anchor2 = 0,100 - font-family = "" font-size = 13 - font-style = "" text-color = #808080 background-color = #414141 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Change Amount" - image = "" command = "skincmd \"chemdispenser;amountc\"" is-flat = true - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "energy" type = LABEL pos = 288,0 size = 264x32 anchor1 = 100,0 anchor2 = none - font-family = "" font-size = 13 - font-style = "" text-color = #808080 background-color = #414141 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" text = "Energy: 25" - image = "" - image-mode = center - keep-aspect = false - align = center - text-wrap = false - allow-html = false - letterbox = true elem "amount" type = LABEL pos = 0,0 size = 288x34 anchor1 = 0,0 anchor2 = 29,7 - font-family = "" font-size = 13 - font-style = "" text-color = #808080 background-color = #414141 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" text = "Amount: 30" - image = "" - image-mode = center - keep-aspect = false - align = center - text-wrap = false - allow-html = false - letterbox = true elem "child1" type = CHILD pos = 0,32 size = 624x333 anchor1 = 0,8 anchor2 = 100,87 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #408080 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "splitter" - on-size = "" left = "chemdispenser_reagents" - right = "" is-vert = false - splitter = 50 - show-splitter = true - lock = none window "chemdispenser_reagents" elem "chemdispenser_reagents" @@ -1009,66 +617,28 @@ window "chemdispenser_reagents" size = 652x309 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #414141 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - title = "" titlebar = false statusbar = false can-close = false can-minimize = false can-resize = false is-pane = true - is-minimized = false - is-maximized = false can-scroll = vertical - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "template_name" type = BUTTON pos = 8,8 size = 144x32 anchor1 = none anchor2 = none - font-family = "" font-size = 13 - font-style = "" - text-color = #000000 background-color = #808080 is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Chloral Hydrate" - image = "" command = "" is-flat = true - stretch = false - is-checked = false - group = "" button-type = pushbox window "mainwindow" @@ -1078,92 +648,29 @@ window "mainwindow" size = 640x440 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false is-default = true - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - /*title = "Space Station 13"*/ - titlebar = true - statusbar = true - can-close = true - can-minimize = true - can-resize = true - is-pane = false - is-minimized = false is-maximized = true - can-scroll = none icon = 'icons\\ss13_64.png' - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 macro = "macro" menu = "menu" - on-close = "" elem "asset_cache_browser" type = BROWSER pos = 424,208 size = 1x1 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" - show-history = false - show-url = false - auto-format = true - use-title = false - on-show = "" - on-hide = "" elem "oocbutton" type = BUTTON pos = 440,420 size = 40x20 anchor1 = 100,100 anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "OOC" - image = "" command = ".winset \"oocbutton.is-checked=true?input.command=\"!ooc \\\"\" macrobutton.is-checked=false:input.command=\"\"oocbutton.is-checked=true?mebutton.is-checked=false\"\"oocbutton.is-checked=true?saybutton.is-checked=false\"" - is-flat = false - stretch = false - is-checked = false - group = "" button-type = pushbox elem "mebutton" type = BUTTON @@ -1171,27 +678,9 @@ window "mainwindow" size = 40x20 anchor1 = 100,100 anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Me" - image = "" command = ".winset \"mebutton.is-checked=true?input.command=\"!me \\\"\" macrobutton.is-checked=false:input.command=\"\"mebutton.is-checked=true?saybutton.is-checked=false\"\"mebutton.is-checked=true?oocbutton.is-checked=false\"" - is-flat = false - stretch = false - is-checked = false - group = "" button-type = pushbox elem "hotkey_toggle" type = BUTTON @@ -1199,27 +688,9 @@ window "mainwindow" size = 80x20 anchor1 = 100,100 anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" text = "Hotkey Toggle" - image = "" command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\"" - is-flat = false - stretch = false - is-checked = false - group = "" button-type = pushbox elem "mainvsplit" type = CHILD @@ -1227,77 +698,29 @@ window "mainwindow" size = 634x416 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "splitter" - on-size = "" - left = "" + left = "mapwindow" right = "rpane" is-vert = true - splitter = 50 - show-splitter = true - lock = none elem "input" type = INPUT pos = 3,420 size = 437x20 anchor1 = 0,100 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #d3b5b5 - is-visible = true - is-disabled = false - is-transparent = false is-default = true border = sunken - drop-zone = false - right-click = false saved-params = "command" - on-size = "" - command = "" - multi-line = false - is-password = false - no-command = false elem "saybutton" type = BUTTON pos = 520,420 size = 40x20 anchor1 = 100,100 anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Chat" - image = "" command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"\"saybutton.is-checked=true?mebutton.is-checked=false\"\"saybutton.is-checked=true?oocbutton.is-checked=false\"" - is-flat = false - stretch = false - is-checked = false - group = "" button-type = pushbox elem "tooltip" type = BROWSER @@ -1305,26 +728,11 @@ window "mainwindow" size = 999x999 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" text-color = #ffffff background-color = #000000 is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" - show-history = false - show-url = false auto-format = false - use-title = false - on-show = "" - on-hide = "" window "mapwindow" elem "mapwindow" @@ -1333,39 +741,13 @@ window "mapwindow" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - title = "" titlebar = false statusbar = false can-close = false can-minimize = false can-resize = false is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "map" type = MAP pos = 0,0 @@ -1374,25 +756,10 @@ window "mapwindow" anchor2 = 100,100 font-family = "Arial" font-size = 7 - font-style = "" text-color = none - background-color = none - is-visible = true - is-disabled = false - is-transparent = false is-default = true - border = none drop-zone = true - right-click = false saved-params = "icon-size" - on-size = "" - icon-size = 0 - text-mode = false - letterbox = true - zoom = 0 - on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\"" - on-hide = ".winset\"mainwindow.mainvsplit.left=\"" - style = "" window "outputwindow" elem "outputwindow" @@ -1401,65 +768,23 @@ window "outputwindow" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - title = "" titlebar = false statusbar = false can-close = false can-minimize = false can-resize = false is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "browseroutput" type = BROWSER pos = 0,0 size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #ffffff - is-visible = true is-disabled = true - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" - show-history = false - show-url = false auto-format = false - use-title = false - on-show = "" - on-hide = "" window "rpane" elem "rpane" @@ -1468,147 +793,53 @@ window "rpane" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - title = "" titlebar = false statusbar = false can-close = false can-minimize = false can-resize = false is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "round_end" type = BUTTON pos = 640,0 size = 224x32 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" text-color = #ffffff background-color = #808080 is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Round End Information" - image = "" command = "RoundEndInformation" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" - button-type = pushbutton elem "rpanewindow" type = CHILD pos = 0,0 size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "splitter" - on-size = "" - left = "" right = "outputwindow" is-vert = false - splitter = 50 - show-splitter = true - lock = none elem "github" type = BUTTON pos = 455,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "BugReport" - image = "" command = "Github-Report" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "special_button" type = BUTTON pos = 518,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Special" - image = "" command = ".winset \"rpanewindow.left=window1\"" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" button-type = pushbox elem "map" @@ -1617,191 +848,66 @@ window "rpane" size = 67x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "MapName" - image = "" command = "MapRender" - is-flat = false - stretch = false - is-checked = false - group = "" - button-type = pushbutton elem "hosttracker" type = BROWSER pos = 392,25 size = 1x1 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" - show-history = false - show-url = false - auto-format = true - use-title = false - on-show = "" - on-hide = "" elem "rulesb" type = BUTTON pos = 253,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Rules" - image = "" command = "rules" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" - button-type = pushbutton elem "changelog" type = BUTTON pos = 316,0 size = 67x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Changelog" - image = "" command = "Changelog" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" - button-type = pushbutton elem "forumb" type = BUTTON pos = 190,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Forum" - image = "" command = "forum" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" - button-type = pushbutton elem "wikib" type = BUTTON pos = 127,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Wiki" - image = "" command = "wiki" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" - button-type = pushbutton elem "textb" type = BUTTON pos = 0,0 size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Text" - image = "" command = ".winset \"rpanewindow.left=;\"" - is-flat = false - stretch = false is-checked = true group = "rpanemode" button-type = pushbox @@ -1811,26 +917,10 @@ window "rpane" size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Browser" - image = "" command = ".winset \"rpanewindow.left=browserwindow\"" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" button-type = pushbox elem "infob" @@ -1839,26 +929,10 @@ window "rpane" size = 60x16 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none is-visible = false - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "is-checked" - on-size = "" text = "Info" - image = "" command = ".winset \"rpanewindow.left=infowindow\"" - is-flat = false - stretch = false - is-checked = false group = "rpanemode" button-type = pushbox @@ -1869,63 +943,18 @@ window "browserwindow" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" title = "Browser" - titlebar = true - statusbar = true - can-close = true - can-minimize = true - can-resize = true is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "browser" type = BROWSER pos = 0,0 size = 640x499 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #ffffff - is-visible = true - is-disabled = false - is-transparent = false is-default = true - border = none - drop-zone = false - right-click = false saved-params = "" - on-size = "" - show-history = false - show-url = false - auto-format = true - use-title = false on-show = ".winset\"rpane.infob.is-visible=true?rpane.infob.pos=130,0;rpane.textb.is-visible=true;rpane.browseb.is-visible=true;rpane.browseb.is-checked=true;rpane.rpanewindow.pos=0,30;rpane.rpanewindow.size=0x0;rpane.rpanewindow.left=browserwindow\"" on-hide = ".winset\"rpane.infob.is-visible=true?rpane.infob.is-checked=true rpane.infob.pos=65,0 rpane.rpanewindow.left=infowindow:rpane.rpanewindow.left=textwindow rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0\"" @@ -1936,72 +965,23 @@ window "infowindow" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none - is-visible = true - is-disabled = false - is-transparent = false - is-default = false - border = none - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" title = "Info" - titlebar = true - statusbar = true - can-close = true - can-minimize = true - can-resize = true is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" - image-mode = stretch - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "info" type = INFO pos = 0,0 size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #ffffff - is-visible = true - is-disabled = false - is-transparent = false is-default = true - border = none drop-zone = true - right-click = false saved-params = "" - on-size = "" highlight-color = #00aa00 - tab-text-color = #000000 - tab-background-color = none - tab-font-family = "" - tab-font-size = 0 - tab-font-style = "" allow-html = false - multi-line = true on-show = ".winset\"rpane.infob.is-visible=true;rpane.browseb.is-visible=true?rpane.infob.pos=130,0:rpane.infob.pos=65,0 rpane.textb.is-visible=true rpane.infob.is-checked=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=infowindow\"" on-hide = ".winset\"rpane.infob.is-visible=false;rpane.browseb.is-visible=true?rpane.browseb.is-checked=true rpane.rpanewindow.left=browserwindow:rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=\"" - on-tab = "" - prefix-color = none - suffix-color = none window "window1" elem "window1" @@ -2010,62 +990,23 @@ window "window1" size = 640x480 anchor1 = none anchor2 = none - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 - background-color = none is-visible = false - is-disabled = false - is-transparent = false - is-default = false border = sunken - drop-zone = false - right-click = false saved-params = "pos;size;is-minimized;is-maximized" - on-size = "" - title = "" titlebar = false statusbar = false can-close = false can-minimize = false can-resize = false is-pane = true - is-minimized = false - is-maximized = false - can-scroll = none - icon = "" - image = "" image-mode = center - keep-aspect = false - transparent-color = none - alpha = 255 - macro = "" - menu = "" - on-close = "" elem "msay_output" type = OUTPUT pos = 0,0 size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - font-family = "" - font-size = 0 - font-style = "" - text-color = #000000 background-color = #fffdd0 - is-visible = true - is-disabled = false - is-transparent = false - is-default = false border = sunken - drop-zone = false - right-click = false saved-params = "max-lines" - on-size = "" - link-color = #0000ff - visited-color = #ff00ff - style = "" - enable-http-images = false - max-lines = 1000 - image = "" + diff --git a/vgstation13.dme b/vgstation13.dme index 5a11eac6db7..8b5a3b396cc 100644 --- a/vgstation13.dme +++ b/vgstation13.dme @@ -1019,7 +1019,6 @@ #include "code\modules\client\global cache.dm" #include "code\modules\client\preferences.dm" #include "code\modules\client\preferences_savefile.dm" -#include "code\modules\client\preferences_toggles.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\accessories\accessory.dm" #include "code\modules\clothing\accessories\armband.dm"