diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 99f3c0077adb..fcf85299a56b 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -94,7 +94,13 @@ return if(32) continue +/* Dripstation edit start - russian cyrillic support if(127 to INFINITY) +*/ + if(127 to 1039) + return + if(1104 to INFINITY) +//Dripstation edit end if(ascii_only) return else @@ -152,7 +158,20 @@ number_of_alphanumeric++ last_char_group = LETTERS_DETECTED +//Dripstation edit start - russian cyrillic support + // А .. Я + if(1040 to 1071) //Uppercase Letters + number_of_alphanumeric++ + last_char_group = LETTERS_DETECTED + + // а .. я + if(1072 to 1103) //Lowercase Letters + if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED || last_char_group == SYMBOLS_DETECTED) //start of a word + char = uppertext(char) + number_of_alphanumeric++ + last_char_group = LETTERS_DETECTED +//Dripstation edit end // 0 .. 9 if(48 to 57) //Numbers if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 31adecb27a05..8f968ba3e216 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -1009,6 +1009,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( movement_keys[key] = WEST if("South") movement_keys[key] = SOUTH +/* Dripstation edit - cyrillic support if(SAY_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=.say") if(ME_CHANNEL) @@ -1017,12 +1018,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( winset(src, "default-[REF(key)]", "parent=default;name=[key];command=ooc") if(LOOC_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=looc") +*/ if(ASAY_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=asay") +/* Dripstation edit - cyrillic support if(MSAY_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=msay") if(DONORSAY_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=.donorsay") +*/ if(DEADSAY_CHANNEL) winset(src, "default-[REF(key)]", "parent=default;name=[key];command=dsay") diff --git a/config/pretty_filter.txt b/config/pretty_filter.txt index 9910e3015a45..31e095f9c666 100644 --- a/config/pretty_filter.txt +++ b/config/pretty_filter.txt @@ -44,4 +44,3 @@ One day while Andy was masturbating=BAN ME ADMINS! XEzwgBD=BAN ME ADMINS! \b(?:https?:\/\/)?(?:www|i)?\.?(?!yogstation\.net|github\.com)\w{4,128}\.\w{2}\.?\w{0,2}\b\S*=[Link Removed] -[^ -ÿ]+=​ diff --git a/interface/skin.dmf b/interface/skin.dmf index fe3e851ac048..763ea44d9fef 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -141,7 +141,7 @@ window "mapwindow" text-color = none is-default = true saved-params = "zoom;letterbox;zoom-mode" - style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }" + style = ".center { text-align: center; } .maptext { font-family: 'MS Serif'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }" window "infowindow" elem "infowindow" diff --git a/modular_dripstation/code/datum/keybinding/communication.dm b/modular_dripstation/code/datum/keybinding/communication.dm new file mode 100644 index 000000000000..8eb9ddf9c940 --- /dev/null +++ b/modular_dripstation/code/datum/keybinding/communication.dm @@ -0,0 +1,36 @@ +/datum/keybinding/client/communication/say/down(client/user) + user.mob.say_wrapper() + return TRUE + +/datum/keybinding/client/communication/emote/down(client/user) + user.mob.me_wrapper() + return TRUE + +/datum/keybinding/client/communication/looc/down(client/user) + user.looc_wrapper() + return TRUE + +/datum/keybinding/client/communication/ooc/down(client/user) + user.ooc_wrapper() + return TRUE + +/datum/keybinding/client/communication/donor_say/down(client/user) + user.get_donator_say() + return TRUE + +/datum/keybinding/client/communication/mentor_say/down(client/user) + user.mentor_wrapper() + return TRUE + +/client/verb/looc_wrapper() + set hidden = TRUE + var/message = input("", "LOOC \"text\"") as null|text + looc(message) + +/client/verb/mentor_wrapper() + set hidden = TRUE + set name = "msay" + + var/message = input(src, null, "Mentor Chat \"text\"") as text|null + if (message) + cmd_mentor_say(message) diff --git a/modular_dripstation/includes.dm b/modular_dripstation/includes.dm index 49bebd4c3af1..6c4e99c1e1e9 100644 --- a/modular_dripstation/includes.dm +++ b/modular_dripstation/includes.dm @@ -5,6 +5,7 @@ #include "code\datum\reagent\chemoverride.dm" #include "code\datum\reagent\leadacetate.dm" #include "code\datum\strong_pull.dm" +#include "code\datum\keybinding\communication.dm" #include "code\game\effects\effects_foam.dm" #include "code\game\mecha\cargo_hauler.dm" #include "code\game\objects\items\bepis_items\boomerang.dm"