")
- t = replacetext(t, "\[ntlogo\]", "
")
-
- t = replacetext(t, "\[mapname\]", "[SSmapping.configs[GROUND_MAP].map_name]")
- t = replacetext(t, "\[shipname\]", "[SSmapping.configs[SHIP_MAP].map_name]")
- t = replacetext(t, "\[date\]", "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")]")
- t = replacetext(t, "\[time\]", "[worldtime2text()]")
+ t = replacetext_char(t, "\[[i]\]", "")
+
+ t = replacetext_char(t, "\n", "") // Lets just always do this one + + t = replacetext_char(t, "\[br\]", "
") + t = replacetext_char(t, "\[hr\]", "
") + t = replacetext_char(t, "\[center\]", "
") + t = replacetext_char(t, "\[/h1\]", "
") + t = replacetext_char(t, "\[h2\]", "") + t = replacetext_char(t, "\[/h2\]", "
") + t = replacetext_char(t, "\[h3\]", "") + t = replacetext_char(t, "\[/h3\]", "
") + + t = replacetext_char(t, "\[list\]", "- ")
+ t = replacetext_char(t, "\[/list\]", "
")
+ t = replacetext_char(t, "\[ntlogo\]", "")
+
+ t = replacetext_char(t, "\[mapname\]", "[SSmapping.configs[GROUND_MAP].map_name]")
+ t = replacetext_char(t, "\[shipname\]", "[SSmapping.configs[SHIP_MAP].map_name]")
+ t = replacetext_char(t, "\[date\]", "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")]")
+ t = replacetext_char(t, "\[time\]", "[worldtime2text()]")
t = "[t]"
diff --git a/code/__HELPERS/shell.dm b/code/__HELPERS/shell.dm
index 3ba526b2e9924..e626a464d27d8 100644
--- a/code/__HELPERS/shell.dm
+++ b/code/__HELPERS/shell.dm
@@ -25,7 +25,7 @@
out_file = "[SHELLEO_NAME][shelleo_id][SHELLEO_OUT]"
err_file = "[SHELLEO_NAME][shelleo_id][SHELLEO_ERR]"
if(world.system_type == UNIX)
- errorcode = shell("[interpreter] \"[replacetext(command, "\"", "\\\"")]\" > [out_file] 2> [err_file]")
+ errorcode = shell("[interpreter] \"[replacetext_char(command, "\"", "\\\"")]\" > [out_file] 2> [err_file]")
else
errorcode = shell("[interpreter] \"[command]\" > [out_file] 2> [err_file]")
if(fexists(out_file))
@@ -50,8 +50,8 @@
var/last_good = 1
var/bad_chars = 1
do
- bad_chars = bad_chars_regex.Find(url)
- scrubbed_url += copytext(url, last_good, bad_chars)
+ bad_chars = bad_chars_regex.Find_char(url)
+ scrubbed_url += copytext_char(url, last_good, bad_chars)
if(bad_chars)
bad_match = url_encode(bad_chars_regex.match)
scrubbed_url += bad_match
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index d7301cc65ded1..a7c42806231f6 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -1,4 +1,4 @@
-#define strip_improper(input_text) replacetext(replacetext(input_text, "\proper", ""), "\improper", "")
+#define strip_improper(input_text) replacetext_char(replacetext_char(input_text, "\proper", ""), "\improper", "")
@@ -9,17 +9,21 @@
/proc/readd_quotes(t)
var/list/repl_chars = list(""" = "\"", "'" = "\"")
for(var/char in repl_chars)
- var/index = findtext(t, char)
+ var/index = findtext_char(t, char)
while(index)
- t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index + 5)
- index = findtext(t, char)
+ t = copytext_char(t, 1, index) + repl_chars[char] + copytext_char(t, index + 5)
+ index = findtext_char(t, char)
return t
/// Runs byond's html encoding sanitization proc, after replacing new-lines and tabs for the # character.
/proc/sanitize(text)
+ if(CONFIG_GET(flag/censor_enabled))
+ for(var/word in config?.words_to_filter)
+ text = replacetext(text, word, config.words_to_filter[word])
+
var/static/regex/regex = regex(@"[\n\t]", "g")
- return html_encode(regex.Replace(text, "#"))
+ return html_encode(regex.Replace_char(text, "#"))
/// Runs STRIP_HTML_SIMPLE and sanitize.
@@ -42,20 +46,20 @@
* * Presence of the <, >, \ and / characters.
* * Presence of ASCII special control characters (horizontal tab and new line not included).
* */
-/proc/reject_bad_text(text, max_length = 512, ascii_only = TRUE)
- if(ascii_only)
- if(length(text) > max_length)
+/proc/reject_bad_text(text, max_length = 512, ascii_cyrillic_only = TRUE)
+ if(ascii_cyrillic_only)
+ if(length_char(text) > max_length)
return null
- var/static/regex/non_ascii = regex(@"[^\x20-\x7E\t\n]")
- if(non_ascii.Find(text))
+ var/static/regex/non_ascii = regex(@"[^\x20-\x7E\u0410-\u044F\u0401\u0451\t\n]")
+ if(non_ascii.Find_char(text))
return null
else if(length_char(text) > max_length)
return null
var/static/regex/non_whitespace = regex(@"\S")
- if(!non_whitespace.Find(text))
+ if(!non_whitespace.Find_char(text))
return null
var/static/regex/bad_chars = regex(@"[\\<>/\x00-\x08\x11-\x1F]")
- if(bad_chars.Find(text))
+ if(bad_chars.Find_char(text))
return null
return text
@@ -65,7 +69,7 @@
/proc/stripped_input(mob/user, message = "", title = "", default = "", max_length = MAX_MESSAGE_LEN, no_trim = FALSE)
var/name = input(user, message, title, default) as text|null
if(no_trim)
- return copytext(html_encode(name), 1, max_length)
+ return copytext_char(html_encode(name), 1, max_length)
else
return trim(html_encode(name), max_length) //trim is "outside" because html_encode can expand single symbols into multiple symbols (such as turning < into <)
@@ -73,7 +77,7 @@
/proc/stripped_multiline_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN, no_trim=FALSE)
var/name = input(user, message, title, default) as message|null
if(no_trim)
- return copytext(html_encode(name), 1, max_length)
+ return copytext_char(html_encode(name), 1, max_length)
else
return trim(html_encode(name), max_length)
@@ -85,66 +89,82 @@
#define LETTERS_DETECTED 4
//Filters out undesirable characters from names
-/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE)
+/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE, accept_cyrillic = FALSE)
if(!t_in)
return //Rejects the input if it is null
var/number_of_alphanumeric = 0
var/last_char_group = NO_CHARS_DETECTED
var/t_out = ""
- var/t_len = length(t_in)
+ var/t_len = length_char(t_in)
var/charcount = 0
var/char = ""
- for(var/i = 1, i <= t_len, i += length(char))
- char = t_in[i]
+ for(var/i = 1, i <= t_len, i += length_char(char))
+ char = copytext_char(t_in, i, i+1)
- switch(text2ascii(char))
- // A .. Z
+ switch(text2ascii_char(char))
+ // A .. Z,
if(65 to 90) //Uppercase Letters
number_of_alphanumeric++
last_char_group = LETTERS_DETECTED
- // a .. z
+ // А .. Я, Ё
+ if(1040 to 1071, 1025) //Uppercase Cyrillic Letters
+ if(!accept_cyrillic)
+ return
+ number_of_alphanumeric++
+ last_char_group = LETTERS_DETECTED
+
+ // a .. z,
if(97 to 122) //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
+ // а .. я, ё
+ if(1072 to 1103, 1105) //Lowercase Cyrillic Letters
+ if(!accept_cyrillic)
+ return
+ 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
+
// 0 .. 9
if(48 to 57) //Numbers
if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string
- continue
+ return
number_of_alphanumeric++
last_char_group = NUMBERS_DETECTED
// ' - .
if(39,45,46) //Common name punctuation
if(last_char_group == NO_CHARS_DETECTED)
- continue
+ return
last_char_group = SYMBOLS_DETECTED
// ~ | @ : # $ % & * +
if(126,124,64,58,35,36,37,38,42,43) //Other symbols that we'll allow (mainly for AI)
if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string
- continue
+ return
last_char_group = SYMBOLS_DETECTED
//Space
if(32)
if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED) //suppress double-spaces and spaces at start of string
- continue
+ return
last_char_group = SPACES_DETECTED
- if(127 to INFINITY)
+ if(127 to 1024, 1026 to 1039, 1104, 1106 to INFINITY)
if(ascii_only)
- continue
+ return
last_char_group = SYMBOLS_DETECTED //for now, we'll treat all non-ascii characters like symbols even though most are letters
else
- continue
+ return
t_out += char
charcount++
@@ -184,18 +204,18 @@
//Returns a string with reserved characters and spaces before the first letter removed
/proc/trim_left(text)
- for(var/i in 1 to length(text))
- if(text2ascii(text, i) <= 32)
+ for(var/i in 1 to length_char(text))
+ if(text2ascii_char(text, i) <= 32)
continue
- return copytext(text, i)
+ return copytext_char(text, i)
return ""
//Returns a string with reserved characters and spaces after the last letter removed
/proc/trim_right(text)
- for(var/i = length(text), i > 0, i--)
- if(text2ascii(text, i) > 32)
- return copytext(text, 1, i + 1)
+ for(var/i = length_char(text), i > 0, i--)
+ if(text2ascii_char(text, i) > 32)
+ return copytext_char(text, 1, i + 1)
return ""
@@ -210,8 +230,8 @@
/proc/capitalize(t)
. = t
if(t)
- . = t[1]
- return uppertext(.) + copytext(t, 1 + length(.))
+ . = copytext_char(t, 1, 2)
+ return uppertext(.) + copytext_char(t, 1 + length_char(.))
/proc/stringmerge(text,compare,replace = "*")
@@ -222,23 +242,23 @@
var/text_it = 1 //iterators
var/comp_it = 1
var/newtext_it = 1
- var/text_length = length(text)
- var/comp_length = length(compare)
+ var/text_length = length_char(text)
+ var/comp_length = length_char(compare)
while(comp_it <= comp_length && text_it <= text_length)
- var/a = text[text_it]
- var/b = compare[comp_it]
+ var/a = copytext_char(text, text_it, text_it+1)
+ var/b = copytext_char(compare, comp_it, comp_it+1)
//if it isn't both the same letter, or if they are both the replacement character
//(no way to know what it was supposed to be)
if(a != b)
if(a == replace) //if A is the replacement char
- newtext = copytext(newtext, 1, newtext_it) + b + copytext(newtext, newtext_it + length(newtext[newtext_it]))
+ newtext = copytext_char(newtext, 1, newtext_it) + b + copytext_char(newtext, newtext_it + length_char(copytext_char(newtext, newtext_it, newtext_it+1)))
else if(b == replace) //if B is the replacement char
- newtext = copytext(newtext, 1, newtext_it) + a + copytext(newtext, newtext_it + length(newtext[newtext_it]))
+ newtext = copytext_char(newtext, 1, newtext_it) + a + copytext_char(newtext, newtext_it + length_char(copytext_char(newtext, newtext_it, newtext_it+1)))
else //The lists disagree, Uh-oh!
return 0
- text_it += length(a)
- comp_it += length(b)
- newtext_it += length(newtext[newtext_it])
+ text_it += length_char(a)
+ comp_it += length_char(b)
+ newtext_it += length_char(copytext_char(newtext, newtext_it, newtext_it+1))
return newtext
@@ -249,10 +269,10 @@
if(!text || !character)
return 0
var/count = 0
- var/lentext = length(text)
+ var/lentext = length_char(text)
var/a = ""
- for(var/i = 1, i <= lentext, i += length(a))
- a = text[i]
+ for(var/i = 1, i <= lentext, i += length_char(a))
+ a = copytext_char(text, i, i+1)
if(a == character)
count++
return count
@@ -270,34 +290,34 @@
if(length_char(string) > length(string))
if(length_char(string) > length)
return "[copytext_char(string, 1, 37)]..."
- if(!length(string))
+ if(!length_char(string))
return "\[...\]"
return string
- if(!length(string))
+ if(!length_char(string))
return "\[...\]"
- if(length(string) > length)
- return "[copytext(string, 1, 37)]..."
+ if(length_char(string) > length)
+ return "[copytext_char(string, 1, 37)]..."
return string
//Used for applying byonds text macros to strings that are loaded at runtime
/proc/apply_text_macros(string)
- var/next_backslash = findtext(string, "\\")
+ var/next_backslash = findtext_char(string, "\\")
if(!next_backslash)
return string
- var/leng = length(string)
+ var/leng = length_char(string)
- var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash]))
+ var/next_space = findtext_char(string, " ", next_backslash + length_char(copytext_char(string, next_backslash, next_backslash+1)))
if(!next_space)
next_space = leng - next_backslash
if(!next_space) //trailing bs
return string
- var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash)
- var/macro = lowertext(copytext(string, next_backslash + length(string[next_backslash]), next_space))
- var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space]))
+ var/base = next_backslash == 1 ? "" : copytext_char(string, 1, next_backslash)
+ var/macro = lowertext(copytext_char(string, next_backslash + length_char(copytext_char(string, next_backslash, next_backslash+1)), next_space))
+ var/rest = next_backslash > leng ? "" : copytext_char(string, next_space + length_char(copytext_char(string, next_space, next_space+1)))
//See https://secure.byond.com/docs/ref/info.html#/DM/text/macros
switch(macro)
@@ -349,15 +369,15 @@ GLOBAL_PROTECT(sanitize)
/proc/noscript(text)
for(var/i in GLOB.sanitize)
- text = replacetext(text, i, "")
+ text = replacetext_char(text, i, "")
return text
/proc/sanitizediscord(text)
- text = replacetext(text, "\improper", "")
- text = replacetext(text, "\proper", "")
- text = replacetext(text, "<@", "")
- text = replacetext(text, "@here", "")
- text = replacetext(text, "@everyone", "")
+ text = replacetext_char(text, "\improper", "")
+ text = replacetext_char(text, "\proper", "")
+ text = replacetext_char(text, "<@", "")
+ text = replacetext_char(text, "@here", "")
+ text = replacetext_char(text, "@everyone", "")
return text
@@ -411,3 +431,32 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
var/prefix = prefixes[prefix_index]
return "[coefficient] [prefix][unit]"
+
+GLOBAL_LIST_INIT(ru_key_to_en_key, list("й" = "q", "ц" = "w", "у" = "e", "к" = "r", "е" = "t", "н" = "y", "г" = "u", "ш" = "i", "щ" = "o", "з" = "p", "х" = "\[", "ъ" = "]",
+ "ф" = "a", "ы" = "s", "в" = "d", "а" = "f", "п" = "g", "р" = "h", "о" = "j", "л" = "k", "д" = "l", "ж" = ";", "э" = "'",
+ "я" = "z", "ч" = "x", "с" = "c", "м" = "v", "и" = "b", "т" = "n", "ь" = "m", "б" = ",", "ю" = "."))
+
+GLOBAL_LIST_INIT(en_key_to_ru_key, list(
+ "q" = "й", "w" = "ц", "e" = "у", "r" = "к", "t" = "е", "y" = "н",
+ "u" = "г", "i" = "ш", "o" = "щ", "p" = "з",
+ "a" = "ф", "s" = "ы", "d" = "в", "f" = "а", "g" = "п", "h" = "р",
+ "j" = "о", "k" = "л", "l" = "д", ";" = "ж", "'" = "э", "z" = "я",
+ "x" = "ч", "c" = "с", "v" = "м", "b" = "и", "n" = "т", "m" = "ь",
+ "," = "б", "." = "ю",
+))
+
+/proc/convert_ru_key_to_en_key(var/_key)
+ var/new_key = lowertext(_key)
+ new_key = GLOB.ru_key_to_en_key[new_key]
+ if(!new_key)
+ return _key
+ return new_key
+
+/proc/sanitize_en_key_to_ru_key(char)
+ var/new_char = GLOB.en_key_to_ru_key[lowertext(char)]
+ return (new_char != null) ? new_char : char
+
+/proc/sanitize_en_string_to_ru_string(text)
+ . = ""
+ for(var/i in 1 to length_char(text))
+ . += sanitize_en_key_to_ru_key(copytext_char(text, i, i+1))
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 21814427d71be..6892866585c28 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -78,7 +78,7 @@
//TODO replace thise usage with the byond proc
//Converts a string into a list by splitting the string at each delimiter found. (discarding the seperator)
/proc/text2list(text, delimiter = "\n")
- var/delim_len = length(delimiter)
+ var/delim_len = length_char(delimiter)
if(delim_len < 1)
return list(text)
@@ -86,8 +86,8 @@
var/last_found = 1
var/found
do
- found = findtext(text, delimiter, last_found, 0)
- . += copytext(text, last_found, found)
+ found = findtext_char(text, delimiter, last_found, 0)
+ . += copytext_char(text, last_found, found)
last_found = found + delim_len
while(found)
@@ -290,8 +290,8 @@
//returns an empty list if the file doesn't exist
/proc/file2list(filename, seperator = "\n", trim = TRUE)
if(trim)
- return splittext(trim(file2text(filename)),seperator)
- return splittext(file2text(filename),seperator)
+ return splittext_char(trim(file2text(filename)),seperator)
+ return splittext_char(file2text(filename),seperator)
//returns a string the last bit of a type, without the preceeding '/'
@@ -313,12 +313,12 @@
if(/turf)
return "turf"
else //regex everything else (works for /proc too)
- return lowertext(replacetext("[the_type]", "[type2parent(the_type)]/", ""))
+ return lowertext(replacetext_char("[the_type]", "[type2parent(the_type)]/", ""))
/proc/type2parent(child)
var/string_type = "[child]"
- var/last_slash = findlasttext(string_type, "/")
+ var/last_slash = findlasttext_char(string_type, "/")
if(last_slash == 1)
switch(child)
if(/datum)
@@ -329,7 +329,7 @@
return /atom
else
return /datum
- return text2path(copytext(string_type, 1, last_slash))
+ return text2path(copytext_char(string_type, 1, last_slash))
/proc/string2listofvars(t_string, datum/var_source)
@@ -338,25 +338,25 @@
. = list()
- var/var_found = findtext(t_string, "\[") //Not the actual variables, just a generic "should we even bother" check
+ var/var_found = findtext_char(t_string, "\[") //Not the actual variables, just a generic "should we even bother" check
if(var_found)
//Find var names
// "A dog said hi [name]!"
- // splittext() --> list("A dog said hi ","name]!"
+ // splittext_char() --> list("A dog said hi ","name]!"
// jointext() --> "A dog said hi name]!"
- // splittext() --> list("A","dog","said","hi","name]!")
+ // splittext_char() --> list("A","dog","said","hi","name]!")
- t_string = replacetext(t_string,"\[","\[ ")//Necessary to resolve "word[var_name]" scenarios
- var/list/list_value = splittext(t_string,"\[")
+ t_string = replacetext_char(t_string,"\[","\[ ")//Necessary to resolve "word[var_name]" scenarios
+ var/list/list_value = splittext_char(t_string,"\[")
var/intermediate_stage = jointext(list_value, null)
- list_value = splittext(intermediate_stage," ")
+ list_value = splittext_char(intermediate_stage," ")
for(var/value in list_value)
- if(!findtext(value, "]"))
+ if(!findtext_char(value, "]"))
continue
- value = splittext(value, "]") //"name]!" --> list("name","!")
+ value = splittext_char(value, "]") //"name]!" --> list("name","!")
for(var/A in value)
if(!var_source.vars.Find(A))
continue
@@ -381,4 +381,4 @@
/// Return html to load a url.
/// for use inside of browse() calls to html assets that might be loaded on a cdn.
/proc/url2htmlloader(url)
- return {""}
+ return {""}
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index e7ee8efe5e450..8355b28a3c7f4 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -684,11 +684,11 @@ GLOBAL_LIST_INIT(common_tools, typecacheof(list(
/proc/params2turf(scr_loc, turf/origin, client/C)
if(!scr_loc || !origin)
return
- var/tX = splittext(scr_loc, ",")
- var/tY = splittext(tX[2], ":")
+ var/tX = splittext_char(scr_loc, ",")
+ var/tY = splittext_char(tX[2], ":")
var/tZ = origin.z
tY = tY[1]
- tX = splittext(tX[1], ":")
+ tX = splittext_char(tX[1], ":")
tX = tX[1]
var/list/actual_view = getviewsize(C ? C.view : WORLD_VIEW)
tX = clamp(origin.x + text2num(tX) - round(actual_view[1] * 0.5) + (round(C?.pixel_x / 32)) - 1, 1, world.maxx)
@@ -779,7 +779,7 @@ GLOBAL_LIST_INIT(wallitems, typecacheof(list(
return FALSE
/proc/format_text(text)
- return replacetext(replacetext(text,"\proper ",""),"\improper ","")
+ return replacetext_char(replacetext_char(text,"\proper ",""),"\improper ","")
///Returns a string based on the weight class define used as argument
/proc/weight_class_to_text(w_class)
diff --git a/code/__HELPERS/view.dm b/code/__HELPERS/view.dm
index b57aec16f81a9..85608ec5d94e2 100644
--- a/code/__HELPERS/view.dm
+++ b/code/__HELPERS/view.dm
@@ -3,7 +3,7 @@
var/totalviewrange = (view < 0 ? -1 : 1) + 2 * view
return list(totalviewrange, totalviewrange)
else
- var/list/viewrangelist = splittext(view,"x")
+ var/list/viewrangelist = splittext_char(view,"x")
return list(text2num(viewrangelist[1]), text2num(viewrangelist[2]))
/// Returns TRUE if the atom is in the user view range.
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 2ca970056713e..abcb515720dfd 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -17,7 +17,7 @@
//#define UNIT_TESTS //Enables unit tests via TEST_RUN_PARAMETER
#ifndef PRELOAD_RSC //set to:
-#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour;
+#define PRELOAD_RSC 0 // 0 to allow using external resources or on-demand behaviour;
#endif // 1 to use the default behaviour;
// 2 for preloading absolutely everything;
diff --git a/code/_globalvars/admin.dm b/code/_globalvars/admin.dm
index 9a01b4c28ec5c..7bf73ad98d915 100644
--- a/code/_globalvars/admin.dm
+++ b/code/_globalvars/admin.dm
@@ -16,7 +16,14 @@ GLOBAL_VAR_INIT(non_ascii_regex, regex("\[^\\x00-\\x7F]", "g"))
GLOBAL_PROTECT(non_ascii_regex)
///Returns true if this contains text that is not ASCII
-#define NON_ASCII_CHECK(text) (findtext(text, GLOB.non_ascii_regex))
+#define NON_ASCII_CHECK(text) (findtext_char(text, GLOB.non_ascii_regex))
+
+///Regex for detecting non-ASCII or cyrillic symbols
+GLOBAL_VAR_INIT(non_ascii_cyrillic_regex, regex(@"[^\x00-\x7F\u0410-\u044F\u0401\u0451]", "g"))
+GLOBAL_PROTECT(non_ascii_cyrillic_regex)
+
+///Returns true if this contains text that is not ASCII or cyrillic
+#define NON_ASCII_CYRILLIC_CHECK(text) (findtext_char(text, GLOB.non_ascii_cyrillic_regex))
GLOBAL_LIST_EMPTY(custom_loadouts)
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 27fbd9ed7e68a..515f14c48ef41 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -24,13 +24,13 @@
return
//Split screen-loc up into X+Pixel_X and Y+Pixel_Y
- var/list/screen_loc_params = splittext(PM["screen-loc"], ",")
+ var/list/screen_loc_params = splittext_char(PM["screen-loc"], ",")
//Split X+Pixel_X up into list(X, Pixel_X)
- var/list/screen_loc_X = splittext(screen_loc_params[1],":")
+ var/list/screen_loc_X = splittext_char(screen_loc_params[1],":")
//Split Y+Pixel_Y up into list(Y, Pixel_Y)
- var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
+ var/list/screen_loc_Y = splittext_char(screen_loc_params[2],":")
if(snap2grid) //Discard Pixel Values
screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
diff --git a/code/_onclick/hud/screen_objects/menu_text_objects.dm b/code/_onclick/hud/screen_objects/menu_text_objects.dm
index ebaca6ca49690..ed57a590cd7a6 100644
--- a/code/_onclick/hud/screen_objects/menu_text_objects.dm
+++ b/code/_onclick/hud/screen_objects/menu_text_objects.dm
@@ -33,21 +33,21 @@
/obj/screen/text/lobby/title/Initialize()
. = ..()
- maptext = ""
+ maptext = ""
INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/year
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/year/Initialize()
. = ..()
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/owners_char
screen_loc = "CENTER-7,CENTER-7"
- maptext = ""
+ maptext = ""
///Bool, whether we registered to listen for charachter updates already
var/registered = FALSE
@@ -59,7 +59,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
set_text()
/obj/screen/text/lobby/owners_char/set_text()
- maptext = ""
+ maptext = ""
if(!registered)
RegisterSignal(hud.mymob.client, COMSIG_CLIENT_PREFERENCES_UIACTED, .proc/set_text)
registered = TRUE
@@ -90,7 +90,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/setup_character
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/setup_character/Click()
. = ..()
@@ -98,7 +98,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/join_game
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/join_game/Click()
. = ..()
@@ -108,7 +108,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/observe
screen_loc = "CENTER"
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/observe/Click()
. = ..()
@@ -116,7 +116,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
player.try_to_observe()
/obj/screen/text/lobby/clickable/ready
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/ready/Initialize(mapload)
. = ..()
@@ -127,7 +127,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/ready/set_text()
var/mob/new_player/player = hud.mymob
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/ready/Click()
. = ..()
@@ -136,7 +136,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
set_text()
/obj/screen/text/lobby/clickable/manifest
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/manifest/Click()
. = ..()
@@ -144,7 +144,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
player.view_manifest()
/obj/screen/text/lobby/clickable/background
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/background/Click()
. = ..()
@@ -153,7 +153,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/changelog
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/changelog/Click()
. = ..()
@@ -161,7 +161,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
/obj/screen/text/lobby/clickable/polls
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/polls/Initialize(mapload, atom/one, atom/two)
. = ..()
@@ -177,7 +177,7 @@ INITIALIZE_IMMEDIATE(/obj/screen/text/lobby/year)
if(isnull(hasnewpolls))
maptext = ""
return
- maptext = ""
+ maptext = ""
/obj/screen/text/lobby/clickable/polls/Click()
. = ..()
diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
index 410075fa55d77..619bef4a1be69 100644
--- a/code/controllers/configuration/config_entry.dm
+++ b/code/controllers/configuration/config_entry.dm
@@ -127,7 +127,7 @@
return FALSE
str_val = trim(str_val)
var/list/new_list = list()
- var/list/values = splittext(str_val," ")
+ var/list/values = splittext_char(str_val," ")
for(var/I in values)
var/temp = text2num(I)
if(isnull(temp))
@@ -157,14 +157,14 @@
return FALSE
str_val = trim(str_val)
- var/key_pos = findtext(str_val, splitter)
+ var/key_pos = findtext_char(str_val, splitter)
var/key_name = null
var/key_value = null
if(key_pos || value_mode == VALUE_MODE_FLAG)
- key_name = lowertext(copytext(str_val, 1, key_pos))
+ key_name = lowertext(copytext_char(str_val, 1, key_pos))
if(key_pos)
- key_value = copytext(str_val, key_pos + length(str_val[key_pos]))
+ key_value = copytext_char(str_val, key_pos + length_char(str_val[key_pos]))
var/new_key
var/new_value
var/continue_check_value
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 69cf97d04bb2f..b891aade93c26 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -17,6 +17,8 @@
var/list/votable_modes
var/list/mode_names
+ var/list/words_to_filter = list()
+
var/motd
var/policy
@@ -53,6 +55,7 @@
LoadMOTD()
LoadPolicy()
LoadChatFilter()
+ LoadCensor()
if(Master)
Master.OnConfigLoad()
@@ -128,15 +131,15 @@
var/lockthis = firstchar == "@"
if(lockthis)
- L = copytext(L, length(firstchar) + 1)
+ L = copytext_char(L, length_char(firstchar) + 1)
- var/pos = findtext(L, " ")
+ var/pos = findtext_char(L, " ")
var/entry = null
var/value = null
if(pos)
- entry = lowertext(copytext(L, 1, pos))
- value = copytext(L, pos + length(L[pos]))
+ entry = lowertext(copytext_char(L, 1, pos))
+ value = copytext_char(L, pos + length_char(L[pos]))
else
entry = lowertext(L)
@@ -254,16 +257,16 @@
t = trim(t)
if(length(t) == 0)
continue
- else if(copytext(t, 1, 2) == "#")
+ else if(copytext_char(t, 1, 2) == "#")
continue
- var/pos = findtext(t, " ")
+ var/pos = findtext_char(t, " ")
var/command = null
var/data = null
if(pos)
- command = lowertext(copytext(t, 1, pos))
- data = copytext(t, pos + 1)
+ command = lowertext(copytext_char(t, 1, pos))
+ data = copytext_char(t, pos + 1)
else
command = lowertext(t)
@@ -347,16 +350,16 @@ Example config:
t = trim(t)
if(length(t) == 0)
continue
- else if(copytext(t, 1, 2) == "#")
+ else if(copytext_char(t, 1, 2) == "#")
continue
- var/pos = findtext(t, " ")
+ var/pos = findtext_char(t, " ")
var/command = null
var/data = null
if(pos)
- command = lowertext(copytext(t, 1, pos))
- data = copytext(t, pos + 1)
+ command = lowertext(copytext_char(t, 1, pos))
+ data = copytext_char(t, pos + 1)
else
command = lowertext(t)
@@ -412,12 +415,40 @@ Example config:
for(var/line in file2list("[directory]/in_character_filter.txt"))
if(!line)
continue
- if(findtextEx(line,"#",1,2))
+ if(findtextEx_char(line,"#",1,2))
continue
in_character_filter += REGEX_QUOTE(line)
ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
+/datum/controller/configuration/proc/LoadCensor()
+ if(!fexists("[directory]/censor.txt"))
+ return
+
+ log_config("Loading config file censor.txt...")
+
+ for(var/line in file2list("[directory]/censor.txt"))
+ if(!line)
+ continue
+ if(findtextEx_char(line,"#",1,2))
+ continue
+
+ var/pos = findtext_char(line, " ")
+ var/key = null
+ var/value = null
+
+ if(!pos)
+ continue
+
+ key = copytext_char(line, 1, pos)
+ value = copytext_char(line, pos + 1)
+
+ if(!key || !value)
+ continue
+
+ words_to_filter[key] = value
+
+
//Message admins when you can.
/datum/controller/configuration/proc/DelayedMessageAdmins(text)
diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm
index ac4f23b3e10b3..49d853b2cb0fe 100644
--- a/code/controllers/configuration/entries/comms.dm
+++ b/code/controllers/configuration/entries/comms.dm
@@ -2,7 +2,7 @@
protection = CONFIG_ENTRY_HIDDEN
/datum/config_entry/string/comms_key/ValidateAndSet(str_val)
- return str_val != "default_pwd" && length(str_val) > 6 && ..()
+ return str_val != "default_pwd" && length_char(str_val) > 6 && ..()
/datum/config_entry/keyed_list/cross_server
key_mode = KEY_MODE_TEXT
@@ -14,7 +14,7 @@
if(.)
var/list/newv = list()
for(var/I in config_entry_value)
- newv[replacetext(I, "+", " ")] = config_entry_value[I]
+ newv[replacetext_char(I, "+", " ")] = config_entry_value[I]
config_entry_value = newv
/datum/config_entry/keyed_list/cross_server/ValidateListEntry(key_name, key_value)
diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm
index 0086a88eefa1e..00b21b7cd5c92 100644
--- a/code/controllers/configuration/entries/dbconfig.dm
+++ b/code/controllers/configuration/entries/dbconfig.dm
@@ -25,6 +25,10 @@
/datum/config_entry/string/feedback_tableprefix
protection = CONFIG_ENTRY_LOCKED|CONFIG_ENTRY_HIDDEN
+/datum/config_entry/string/utility_database
+ config_entry_value = "test"
+ protection = CONFIG_ENTRY_LOCKED|CONFIG_ENTRY_HIDDEN
+
/datum/config_entry/number/query_debug_log_timeout
config_entry_value = 70
min_val = 1
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index dcbdea4c4323c..e8fc19ef9f303 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -118,18 +118,9 @@ Administrative related.
/datum/config_entry/flag/use_exp_tracking
-/datum/config_entry/flag/use_exp_restrictions_admin_bypass
-
-/datum/config_entry/flag/use_exp_restrictions_command
+/datum/config_entry/flag/use_exp_restrictions
-/datum/config_entry/number/use_exp_restrictions_command_hours
- config_entry_value = 0
- integer = FALSE
- min_val = 0
-
-/datum/config_entry/flag/use_exp_restrictions_command_department
-
-/datum/config_entry/flag/use_exp_restrictions_other
+/datum/config_entry/flag/use_exp_restrictions_admin_bypass
/datum/config_entry/flag/prevent_dupe_names
@@ -253,40 +244,14 @@ Master controller and performance related.
if(.)
Master.UpdateTickRate()
-/datum/config_entry/number/fps
- config_entry_value = 20
- integer = FALSE
- min_val = 1
- max_val = 100 //byond will start crapping out at 50, so this is just ridic
- var/sync_validate = FALSE
-
-/datum/config_entry/number/fps/ValidateAndSet(str_val)
- . = ..()
- if(.)
- sync_validate = TRUE
- var/datum/config_entry/number/ticklag/TL = config.entries_by_type[/datum/config_entry/number/ticklag]
- if(!TL.sync_validate)
- TL.ValidateAndSet(10 / config_entry_value)
- sync_validate = FALSE
-
/datum/config_entry/number/ticklag
config_entry_value = 0.5
integer = FALSE
var/sync_validate = FALSE
-/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps
- var/datum/config_entry/CE = /datum/config_entry/number/fps
- config_entry_value = 10 / initial(CE.config_entry_value)
- return ..()
/datum/config_entry/number/ticklag/ValidateAndSet(str_val)
. = text2num(str_val) > 0 && ..()
- if(.)
- sync_validate = TRUE
- var/datum/config_entry/number/fps/FPS = config.entries_by_type[/datum/config_entry/number/fps]
- if(!FPS.sync_validate)
- FPS.ValidateAndSet(10 / config_entry_value)
- sync_validate = FALSE
/datum/config_entry/number/tick_limit_mc_init //SSinitialization throttling
config_entry_value = TICK_LIMIT_MC_INIT_DEFAULT
@@ -426,3 +391,5 @@ This maintains a list of ip addresses that are able to bypass topic filtering.
/datum/config_entry/number/ai_advanced_pathfinding_lag_time_dilation_threshold
config_entry_value = 10
min_val = 0
+
+/datum/config_entry/flag/censor_enabled
diff --git a/code/controllers/configuration/entries/resources.dm b/code/controllers/configuration/entries/resources.dm
index c839ccc078d4d..460f2ab24013e 100644
--- a/code/controllers/configuration/entries/resources.dm
+++ b/code/controllers/configuration/entries/resources.dm
@@ -14,7 +14,7 @@
/datum/config_entry/string/asset_cdn_webroot/ValidateAndSet(str_var)
if (!str_var || trim(str_var) == "")
return FALSE
- if (str_var && str_var[length(str_var)] != "/")
+ if (str_var && str_var[length_char(str_var)] != "/")
str_var += "/"
return ..(str_var)
@@ -25,6 +25,6 @@
/datum/config_entry/string/asset_cdn_url/ValidateAndSet(str_var)
if (!str_var || trim(str_var) == "")
return FALSE
- if (str_var && str_var[length(str_var)] != "/")
+ if (str_var && str_var[length_char(str_var)] != "/")
str_var += "/"
return ..(str_var)
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index 24028362171ca..8b4b8c981cc30 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -46,11 +46,11 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
if(global_procs.len)
var/list/expected_global_procs = vars - gvars_datum_in_built_vars
for(var/I in global_procs)
- expected_global_procs -= replacetext("[I]", "InitGlobal", "")
+ expected_global_procs -= replacetext_char("[I]", "InitGlobal", "")
log_world("Missing procs: [expected_global_procs.Join(", ")]")
for(var/I in global_procs)
var/start_tick = world.time
call(src, I)()
var/end_tick = world.time
if(end_tick - start_tick)
- warning("Global [replacetext("[I]", "InitGlobal", "")] slept during initialization!")
+ warning("Global [replacetext_char("[I]", "InitGlobal", "")] slept during initialization!")
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index e61bde846e594..5026eb0a4d3c3 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -214,7 +214,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
// Sort subsystems by display setting for easy access.
sortTim(subsystems, /proc/cmp_subsystem_display)
// Set world options.
- world.change_fps( CONFIG_GET(number/fps) )
var/initialized_tod = REALTIMEOFDAY
if(sleep_offline_after_initializations)
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 325cc21f70c3b..af9038c8a4ecd 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -206,7 +206,7 @@ SUBSYSTEM_DEF(blackbox)
"oxy" = L.getOxyLoss(),
"tox" = L.getToxLoss(),
"clone" = L.getCloneLoss(),
- "stamina" = L.getStaminaLoss(),
+ "stamina" = max(L.getStaminaLoss(), 0),
"x_coord" = L.x,
"y_coord" = L.y,
"z_coord" = L.z,
diff --git a/code/controllers/subsystem/codex.dm b/code/controllers/subsystem/codex.dm
index 1214153038694..40b3a66391cac 100644
--- a/code/controllers/subsystem/codex.dm
+++ b/code/controllers/subsystem/codex.dm
@@ -91,10 +91,10 @@ SUBSYSTEM_DEF(codex)
results = list()
for(var/entry_title in entries_by_string)
var/datum/codex_entry/entry = entries_by_string[entry_title]
- if(findtext(entry.display_name, searching) || \
- findtext(entry.lore_text, searching) || \
- findtext(entry.mechanics_text, searching) || \
- findtext(entry.antag_text, searching))
+ if(findtext_char(entry.display_name, searching) || \
+ findtext_char(entry.lore_text, searching) || \
+ findtext_char(entry.mechanics_text, searching) || \
+ findtext_char(entry.antag_text, searching))
results |= entry
search_cache[searching] = dd_sortedObjectList(results)
return search_cache[searching]
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 48acf8962004c..cf461ea06ddbd 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -227,7 +227,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
has_question_mark[column] = TRUE
for (var/column in special_columns)
columns[column] = special_columns[column]
- has_question_mark[column] = findtext(special_columns[column], "?")
+ has_question_mark[column] = findtext_char(special_columns[column], "?")
// Prepare SQL query full of placeholders
var/list/query_parts = list("INSERT")
@@ -251,7 +251,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
query_parts += ", "
if (has_question_mark[column])
var/name = "p[arguments.len]"
- query_parts += replacetext(columns[column], "?", ":[name]")
+ query_parts += replacetext_char(columns[column], "?", ":[name]")
arguments[name] = row[column]
else
query_parts += columns[column]
@@ -335,7 +335,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
start_time = REALTIMEOFDAY
Close()
. = run_query(async)
- var/timed_out = !. && findtext(last_error, "Operation timed out")
+ var/timed_out = !. && findtext_char(last_error, "Operation timed out")
if(!. && log_error)
log_sql("[last_error] | Query used: [sql] | Arguments: [json_encode(arguments)]")
if(!async && timed_out)
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 9889506c4d1e9..87f462380c3c4 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -220,7 +220,7 @@ SUBSYSTEM_DEF(garbage)
#endif
continue
if (GC_QUEUE_HARDDELETE)
- HardDelete(D)
+ HardDelete(D, TRUE)
if (MC_TICK_CHECK)
return
continue
@@ -242,7 +242,7 @@ SUBSYSTEM_DEF(garbage)
if (isnull(D))
return
if (level > GC_QUEUE_COUNT)
- HardDelete(D)
+ HardDelete(D, TRUE)
return
var/gctime = world.time
var/refid = "\ref[D]"
@@ -253,14 +253,18 @@ SUBSYSTEM_DEF(garbage)
queue[++queue.len] = list(gctime, refid) // not += for byond reasons
//this is mainly to separate things profile wise.
-/datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
+/datum/controller/subsystem/garbage/proc/HardDelete(datum/D, from_queue = FALSE)
++delslasttick
++totaldels
var/type = D.type
var/refID = "\ref[D]"
var/tick_usage = TICK_USAGE
- del(D)
+ //if something came from the GC queue we won't harddel it because it takes too much time
+ //but we will log it and fix its destructor in the future (lol do you really belive in it?)
+ //also you may notice that this crutch covers only QDEL_HINT_HARDDEL_NOW hint, but there are no uses of QDEL_HINT_HARDDEL, so let it be like that
+ if(!from_queue)
+ del(D)
tick_usage = TICK_USAGE_TO_MS(tick_usage)
var/datum/qdel_item/I = items[type]
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index cfa8dcddd02ed..3423486b1a0b2 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -99,6 +99,9 @@ SUBSYSTEM_DEF(job)
if(!job.player_old_enough(player.client))
JobDebug("AR player not old enough, Player: [player], Job:[job.title]")
return FALSE
+ if(job.required_playtime_remaining(player.client))
+ JobDebug("AR player does not have enough job exp, Player: [player], Job:[job.title]")
+ return FALSE
if(ismarinejob(job) || issommarinejob(job))
if(!handle_initial_squad(player, job, latejoin, job.faction))
JobDebug("Failed to assign marine role to a squad. Player: [player.key] Job: [job.title]")
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 5cf1cb1340fa3..d96a0c816c889 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -255,11 +255,11 @@ SUBSYSTEM_DEF(mapping)
else if (t[1] == "#")
continue
- var/pos = findtext(t, " ")
+ var/pos = findtext_char(t, " ")
var/name = null
if (pos)
- name = lowertext(copytext(t, 1, pos))
+ name = lowertext(copytext_char(t, 1, pos))
else
name = lowertext(t)
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 89b3f0613bbec..4d74af2a565bc 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -119,9 +119,9 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/seasons_info_message()
var/message = ""
for(var/season_entry in season_progress)
- var/season_name = jointext(splittext("[season_entry]", "_"), " ")
- var/season_name_first_letter = uppertext(copytext(season_name, 1, 2))
- var/season_name_remainder = copytext(season_name, 2, length(season_name) + 1)
+ var/season_name = jointext(splittext_char("[season_entry]", "_"), " ")
+ var/season_name_first_letter = uppertext(copytext_char(season_name, 1, 2))
+ var/season_name_remainder = copytext_char(season_name, 2, length_char(season_name) + 1)
season_name = season_name_first_letter + season_name_remainder
message += span_seasons_announce("[season_name] - season [season_progress[season_entry][CURRENT_SEASON_NUMBER]]") message += span_season_additional_info("Title: [season_progress[season_entry][CURRENT_SEASON_NAME]]
") diff --git a/code/controllers/subsystem/points.dm b/code/controllers/subsystem/points.dm index 29162cc7baaad..fca0bd161c1d7 100644 --- a/code/controllers/subsystem/points.dm +++ b/code/controllers/subsystem/points.dm @@ -177,10 +177,10 @@ SUBSYSTEM_DEF(points) return if(length(ckey_shopping_cart) > 20) return - if(NON_ASCII_CHECK(reason)) + if(NON_ASCII_CYRILLIC_CHECK(reason)) return if(length(reason) > MAX_LENGTH_REQ_REASON) - reason = copytext(reason, 1, MAX_LENGTH_REQ_REASON) + reason = copytext_char(reason, 1, MAX_LENGTH_REQ_REASON) var/list/datum/supply_order/orders = process_cart(user, ckey_shopping_cart) for(var/i in 1 to length(orders)) orders[i].reason = reason diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 5aa6d32591db4..8599d79de9649 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -1,14 +1,15 @@ SUBSYSTEM_DEF(radio) name = "Radio" - flags = SS_NO_FIRE|SS_NO_INIT + flags = SS_NO_FIRE var/list/datum/radio_frequency/frequencies = list() var/list/saymodes = list() -/datum/controller/subsystem/radio/PreInit(timeofday) +/datum/controller/subsystem/radio/Initialize(timeofday) for(var/_SM in subtypesof(/datum/saymode)) var/datum/saymode/SM = new _SM() saymodes[SM.key] = SM + saymodes[sanitize_en_string_to_ru_string(SM.key)] = SM return ..() diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm index afce95d874356..694968bf927c7 100644 --- a/code/controllers/subsystem/stickyban.dm +++ b/code/controllers/subsystem/stickyban.dm @@ -171,7 +171,7 @@ SUBSYSTEM_DEF(stickyban) var/list/sqlips = list() if (ban["keys"]) - var/list/keys = splittext(ban["keys"], ",") + var/list/keys = splittext_char(ban["keys"], ",") for (var/key in keys) var/list/sqlckey = list() sqlckey["stickyban"] = ckey @@ -180,7 +180,7 @@ SUBSYSTEM_DEF(stickyban) sqlckeys[++sqlckeys.len] = sqlckey if (ban["whitelist"]) - var/list/keys = splittext(ban["whitelist"], ",") + var/list/keys = splittext_char(ban["whitelist"], ",") for (var/key in keys) var/list/sqlckey = list() sqlckey["stickyban"] = ckey @@ -189,7 +189,7 @@ SUBSYSTEM_DEF(stickyban) sqlckeys[++sqlckeys.len] = sqlckey if (ban["computer_id"]) - var/list/cids = splittext(ban["computer_id"], ",") + var/list/cids = splittext_char(ban["computer_id"], ",") for (var/cid in cids) var/list/sqlcid = list() sqlcid["stickyban"] = ckey @@ -197,7 +197,7 @@ SUBSYSTEM_DEF(stickyban) sqlcids[++sqlcids.len] = sqlcid if (ban["IP"]) - var/list/ips = splittext(ban["IP"], ",") + var/list/ips = splittext_char(ban["IP"], ",") for (var/ip in ips) var/list/sqlip = list() sqlip["stickyban"] = ckey diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index c64e743fc0306..256f6757b2bf5 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(tgui) * return datum/tgui */ /datum/controller/subsystem/tgui/proc/request_pooled_window(mob/user) - if(!user.client) + if(!user?.client) return null var/list/windows = user.client.tgui_windows var/window_id diff --git a/code/datums/actions/order_action.dm b/code/datums/actions/order_action.dm index 37f06acfecf52..7588bf0a8883d 100644 --- a/code/datums/actions/order_action.dm +++ b/code/datums/actions/order_action.dm @@ -161,5 +161,5 @@ /datum/action/innate/order/rally_order/action_activate() var/mob/living/carbon/human/human = owner if(send_order(human, human.assigned_squad, human.faction)) - var/message = pick(";TO ME MY MEN!", ";REGROUP TO ME!", ";FOLLOW MY LEAD!", ";RALLY ON ME!", ";FORWARD!") + var/message = pick("ВСЕ КО МНЕ!", "ПЕРЕГРУППИРОВАТЬСЯ!", "ВСЕМ ЗА МНОЙ!", "СОБРАТЬСЯ ВОЗЛЕ МЕНЯ!") owner.say(message) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 6168be1309e3c..a3688c4ac6d39 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -79,7 +79,7 @@ return {" - + [head_content] @@ -481,7 +481,7 @@ // Otherwise, the user mob's machine var will be reset directly. // /proc/onclose(mob/user, windowid, atom/ref) - if(!user.client) + if(!user?.client) return var/param = "null" if(ref) diff --git a/code/datums/changelog/changelog.dm b/code/datums/changelog/changelog.dm index 3ce51c60344cf..6a3c6a4838b44 100644 --- a/code/datums/changelog/changelog.dm +++ b/code/datums/changelog/changelog.dm @@ -26,7 +26,7 @@ var/regex/ymlRegex = regex(@"\.yml", "g") for(var/archive_file in flist("[global.config.directory]/../html/changelogs/archive/")) - var/archive_date = ymlRegex.Replace(archive_file, "") + var/archive_date = ymlRegex.Replace_char(archive_file, "") data["dates"] = list(archive_date) + data["dates"] return data diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 3bc49632110ed..16353db4d68cf 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -110,11 +110,11 @@ // Get rid of any URL schemes that might cause BYOND to automatically wrap something in an anchor tag var/static/regex/url_scheme = new(@"[A-Za-z][A-Za-z0-9+-\.]*:\/\/", "g") - text = replacetext(text, url_scheme, "") + text = replacetext_char(text, url_scheme, "") // Reject whitespace var/static/regex/whitespace = new(@"^\s*$") - if (whitespace.Find(text)) + if (whitespace.Find_char(text)) qdel(src) return diff --git a/code/datums/components/harvester.dm b/code/datums/components/harvester.dm index b7464ff7e6f77..c327acf0b016d 100644 --- a/code/datums/components/harvester.dm +++ b/code/datums/components/harvester.dm @@ -170,7 +170,7 @@ switch(loaded_reagent) if(/datum/reagent/medicine/tramadol) - target.apply_damage(weapon.force*0.6, BRUTE, user.zone_selected) + target.apply_damage(20 + weapon.force*0.2, BRUTE, user.zone_selected) target.apply_status_effect(/datum/status_effect/incapacitating/harvester_slowdown, 1 SECONDS) if(/datum/reagent/medicine/kelotane) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 9519d238f56c5..f02393de684da 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -112,8 +112,8 @@ GLOBAL_DATUM_INIT(datacore, /datum/datacore, new) even = !even dat += "" - dat = replacetext(dat, "\n", "") // so it can be placed on paper correctly - dat = replacetext(dat, "\t", "") + dat = replacetext_char(dat, "\n", "") // so it can be placed on paper correctly + dat = replacetext_char(dat, "\t", "") return dat diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index cd56939af9f91..a8ca035ee8ab1 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -53,7 +53,7 @@ if(!msg) return - var/end = copytext(msg, length(message)) + var/end = copytext_char(msg, length_char(message)) if(!(end in list("!", ".", "?", ":", "\"", "-"))) msg += "." @@ -94,12 +94,12 @@ /datum/emote/proc/replace_pronoun(mob/user, message) - if(findtext(message, "their")) - message = replacetext(message, "their", user.p_their()) - if(findtext(message, "them")) - message = replacetext(message, "them", user.p_them()) - if(findtext(message, "%s")) - message = replacetext(message, "%s", user.p_s()) + if(findtext_char(message, "their")) + message = replacetext_char(message, "their", user.p_their()) + if(findtext_char(message, "them")) + message = replacetext_char(message, "them", user.p_them()) + if(findtext_char(message, "%s")) + message = replacetext_char(message, "%s", user.p_s()) return message @@ -120,7 +120,7 @@ /datum/emote/proc/select_param(mob/user, params) - return replacetext(message_param, "%t", params) + return replacetext_char(message_param, "%t", params) /datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index d3b5e02878e1c..056e13c3a814d 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -11,7 +11,7 @@ /datum/fluff_email/mainship/iwantout title = "RE: I want out.." - entry_text = {" + entry_text = {" Okay, yep, I know what you're saying. Stilettos aren't safe, you want out of my sharp stick business, and sooner or later we're going to get hung upside down from our ankles by the MPs, stuffed in a freezer in the lower decks, and tossed to the nearest military tribunal in a sack in six to eight weeks. @@ -32,7 +32,7 @@ /datum/fluff_email/mainship/thermalcloak title = "M68 Thermal Cloak.." - entry_text = {" + entry_text = {" Are you sure these things are safe, man? I just tried one on during a training exercise back at Bernice 378, took a wrong turn, and wound up on an outdoor firing range being used by another Battalion (5th "Hammerheads" I think?). Now typically, somebody would have spotted me, the range officer would have called for a ceasefire, the captain gives me a slap on the wrist, and I claim 'emotional trauma' and get served warm cookies @@ -47,7 +47,7 @@ /datum/fluff_email/mainship/snow title = "Snow? Where the hell is all the snow?" - entry_text = {" + entry_text = {" Why were we issued these damn snow uniforms in the first place? We've been around the sector almost three dozen times and we've yet to put them to use. They even issued us bulky kits to repaint our rifles, pistols and shotguns to match the cold weather gear, and masks to keep us warm. But what's the point? They're just taking up a fourth of the cargo hold, half infested with moths we picked @@ -61,7 +61,7 @@ /datum/fluff_email/mainship/hawaianpizza title = "Hawaiian Pizza in the MREs?" - entry_text = {" + entry_text = {" I swear this must have been a joke, but the other day I opened up my MRE packet to come face to face with a 'Hawaiian Pizza" packet. Of course, I had already cut the seal open (otherwise I'd have fenced it to the Damien twins from Bravo Squad and have retired by now), but the smell was horrendous! I guess pineapple just doesn't stow well. I neglected to check the date, but it must have been an old issue, @@ -79,7 +79,7 @@ /datum/fluff_email/mainship/themajor title = "The Major?" - entry_text = {" + entry_text = {" I keep forgetting what the new Major's name is. I got quizzed by one of the jackass staff officers last week about the captain's name, and I absolutely spilled my marbles. PCF Mable was watching too, and she probably thinks I've got rocks in my head. I know it's been weeks since the new captain took over, but for some reason the name keeps escaping me when it matters. Either the cryo-sleepers are juicing my diff --git a/code/datums/gamemodes/distress.dm b/code/datums/gamemodes/distress.dm index a8e83b1ebc60a..6bd539344dde3 100644 --- a/code/datums/gamemodes/distress.dm +++ b/code/datums/gamemodes/distress.dm @@ -1,6 +1,10 @@ /datum/game_mode/infestation/distress name = "Distress Signal" config_tag = "Distress Signal" + + //More larvas in RUTGMC + silo_scaling = 1.2 + flags_round_type = MODE_INFESTATION|MODE_LZ_SHUTTERS|MODE_XENO_RULER|MODE_PSY_POINTS|MODE_PSY_POINTS_ADVANCED|MODE_DEAD_GRAB_FORBIDDEN|MODE_HIJACK_POSSIBLE|MODE_SILO_RESPAWN|MODE_SPAWNING_MINIONS flags_landmarks = MODE_LANDMARK_SPAWN_XENO_TURRETS flags_xeno_abilities = ABILITY_DISTRESS @@ -24,7 +28,8 @@ /datum/job/terragov/squad/leader = 1, /datum/job/terragov/squad/standard = -1, /datum/job/xenomorph = FREE_XENO_AT_START, - /datum/job/xenomorph/queen = 1 + /datum/job/xenomorph/queen = 1, + /datum/job/survivor/rambo = 1, ) var/siloless_hive_timer diff --git a/code/datums/gamemodes/game_mode.dm b/code/datums/gamemodes/game_mode.dm index 1d20ce800838a..9da683e1a61b0 100644 --- a/code/datums/gamemodes/game_mode.dm +++ b/code/datums/gamemodes/game_mode.dm @@ -137,7 +137,7 @@ /datum/game_mode/proc/create_characters() for(var/i in GLOB.new_player_list) var/mob/new_player/player = i - if(player.ready) + if(player.client && player.ready) player.create_character() CHECK_TICK diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index 742cb4204fdd1..8f309b909363d 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -157,6 +157,6 @@ /datum/greyscale_config/proc/ParseColorString(color_string) . = list() - var/list/split_colors = splittext(color_string, "#") + var/list/split_colors = splittext_char(color_string, "#") for(var/color in 2 to length(split_colors)) . += "#[split_colors[color]]" diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index e73766f42441f..8aed76665634b 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -1,7 +1,7 @@ /datum/getrev var/commit // git rev-parse HEAD var/date - var/originmastercommit // git rev-parse origin/master + var/originmastercommit // git rev-parse origin/master220 var/list/testmerge = list() /datum/getrev/New() @@ -14,7 +14,7 @@ commit = rustg_git_revparse("HEAD") if(commit) date = rustg_git_commit_date(commit) - originmastercommit = rustg_git_revparse("origin/master") + originmastercommit = rustg_git_revparse("origin/master220") // goes to DD log and config_error.txt log_world(get_log_message()) @@ -23,7 +23,7 @@ var/list/msg = list() msg += "Running /tg/ revision: [date]" if(originmastercommit) - msg += "origin/master: [originmastercommit]" + msg += "origin/master220: [originmastercommit]" for(var/line in testmerge) var/datum/tgs_revision_information/test_merge/tm = line @@ -45,7 +45,7 @@ var/datum/tgs_revision_information/test_merge/tm = line var/cm = tm.head_commit var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext_char(cm, 1, 11)) - if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder)) + if(details && findtext_char(details, "\[s\]") && (!usr || !usr.client.holder)) continue . += "#[tm.number][details]
" diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm index df390de1bd8d9..443892a1a4590 100644 --- a/code/datums/jobs/job/job.dm +++ b/code/datums/jobs/job/job.dm @@ -1,15 +1,17 @@ GLOBAL_LIST_INIT(exp_jobsmap, list( + EXP_TYPE_ALL = list("titles" = GLOB.jobs_all), EXP_TYPE_REGULAR_ALL = list("titles" = GLOB.jobs_regular_all), - EXP_TYPE_COMMAND = list("titles" = GLOB.jobs_command), + EXP_TYPE_MARINES = list("titles" = GLOB.jobs_marines), EXP_TYPE_ENGINEERING = list("titles" = GLOB.jobs_engineering), EXP_TYPE_MEDICAL = list("titles" = GLOB.jobs_medical), - EXP_TYPE_MARINES = list("titles" = GLOB.jobs_marines), EXP_TYPE_REQUISITIONS = list("titles" = GLOB.jobs_requisitions), + EXP_TYPE_COMMAND = list("titles" = GLOB.jobs_command), + EXP_TYPE_XENO = list("titles" = GLOB.jobs_xeno), )) GLOBAL_LIST_INIT(exp_specialmap, list( EXP_TYPE_LIVING = list(), - EXP_TYPE_SPECIAL = list(ROLE_XENOMORPH, ROLE_XENO_QUEEN), + EXP_TYPE_SPECIAL = list(), EXP_TYPE_GHOST = list(), EXP_TYPE_ADMIN = list() )) diff --git a/code/datums/jobs/job/job_exp.dm b/code/datums/jobs/job/job_exp.dm index f5c0b8004be9f..5d424d82088f8 100644 --- a/code/datums/jobs/job/job_exp.dm +++ b/code/datums/jobs/job/job_exp.dm @@ -3,53 +3,34 @@ GLOBAL_PROTECT(exp_to_update) /datum/job/proc/required_playtime_remaining(client/C) + // Checks for nulls and config if(!C) return FALSE if(!CONFIG_GET(flag/use_exp_tracking)) return FALSE + if(!CONFIG_GET(flag/use_exp_restrictions)) + return FALSE if(!SSdbcore.Connect()) return FALSE if(!exp_requirements || !exp_type) return FALSE - if(!job_is_xp_locked(src)) - return FALSE if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_other_rights(C, R_ADMIN, FALSE)) return FALSE - var/my_exp = C.calc_exp_type(get_exp_req_type()) - var/job_requirement = get_exp_req_amount() + + // Calc client exp and how much do we need + var/my_exp = C.calc_exp_type(exp_type) + var/job_requirement = exp_requirements if(my_exp >= job_requirement) return FALSE else return (job_requirement - my_exp) -/datum/job/proc/get_exp_req_amount() - if(job_flags & JOB_FLAG_ISCOMMAND) - var/uerhh = CONFIG_GET(number/use_exp_restrictions_command_hours) - if(uerhh) - return uerhh * 60 - return exp_requirements - - -/datum/job/proc/get_exp_req_type() - if(job_flags & JOB_FLAG_ISCOMMAND) - if(CONFIG_GET(flag/use_exp_restrictions_command_department) && exp_type_department) - return exp_type_department - return exp_type - - -/proc/job_is_xp_locked(datum/job/job) - if(!CONFIG_GET(flag/use_exp_restrictions_command) && job.job_flags & JOB_FLAG_ISCOMMAND) - return FALSE - if(!CONFIG_GET(flag/use_exp_restrictions_other) && !(job.job_flags & JOB_FLAG_ISCOMMAND)) - return FALSE - return TRUE - - +/// Calculates client exp for exptype. Note - exptype for unlock might not be same as one which you get for role /client/proc/calc_exp_type(exptype) - var/list/explist = prefs.exp.Copy() + var/list/explist = prefs.exp.Copy() // Client EXP var/amount = 0 - var/list/typelist = GLOB.exp_jobsmap[exptype] + var/list/typelist = GLOB.exp_jobsmap[exptype] // Get names of roles with relevant EXP if(!typelist) return 0 for(var/job in typelist["titles"]) @@ -71,7 +52,7 @@ GLOBAL_PROTECT(exp_to_update) return_text += "
- "
var/list/exp_data = list()
for(var/category in SSjob.name_occupations)
- if(!(category in GLOB.jobs_regular_all))
+ if(!((category in GLOB.jobs_regular_all) || (category in GLOB.jobs_xeno)))
continue
if(play_records[category])
exp_data[category] = text2num(play_records[category])
@@ -110,13 +91,11 @@ GLOBAL_PROTECT(exp_to_update)
for(var/j in SSjob.joinable_occupations)
var/datum/job/job = j
if(job.exp_requirements && job.exp_type)
- if(!job_is_xp_locked(job))
- continue
- else if(!job.required_playtime_remaining(mob.client))
+ if(!job.required_playtime_remaining(mob.client))
jobs_unlocked += job.title
else
- var/xp_req = job.get_exp_req_amount()
- jobs_locked += "[job.title] [get_exp_format(text2num(calc_exp_type(job.get_exp_req_type())))] / [get_exp_format(xp_req)] as [job.get_exp_req_type()])"
+ var/xp_req = job.exp_requirements
+ jobs_locked += "[job.title] [get_exp_format(text2num(calc_exp_type(job.exp_type)))] / [get_exp_format(xp_req)] as [job.exp_type])"
if(length(jobs_unlocked))
return_text += "
- " return_text += jobs_unlocked.Join("
- ")
diff --git a/code/datums/jobs/job/marines.dm b/code/datums/jobs/job/marines.dm
index 63b53641bda62..159f3b54d6728 100644
--- a/code/datums/jobs/job/marines.dm
+++ b/code/datums/jobs/job/marines.dm
@@ -121,13 +121,21 @@ What you lack alone, you gain standing shoulder to shoulder with the men and wom
paygrade = "E3"
comm_title = "Eng"
total_positions = 12
+
+ exp_requirements = XP_REQ_UNSEASONED
+ exp_type = EXP_TYPE_MARINES
+
access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_REMOTEBUILD, ACCESS_MARINE_ENGINEERING)
minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_REMOTEBUILD, ACCESS_MARINE_ENGINEERING)
skills_type = /datum/skills/combat_engineer
display_order = JOB_DISPLAY_ORDER_SUQAD_ENGINEER
outfit = /datum/outfit/job/marine/engineer
job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS
- jobworth = list(/datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_MEDIUM, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR)
+ jobworth = list(
+ /datum/job/xenomorph = LARVA_POINTS_REGULAR,
+ /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_MEDIUM,
+ /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR,
+ )
html_description = {"
Difficulty: Medium
You answer to the acting Squad Leader
@@ -145,7 +153,11 @@ What you lack alone, you gain standing shoulder to shoulder with the men and wom outfit = /datum/outfit/job/marine/engineer/rebel access = list(ACCESS_MARINE_PREP_REBEL, ACCESS_MARINE_ENGPREP_REBEL, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_REMOTEBUILD_REBEL, ACCESS_MARINE_ENGINEERING_REBEL) minimal_access = list(ACCESS_MARINE_PREP_REBEL, ACCESS_MARINE_ENGPREP_REBEL, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_DROPSHIP_REBEL, ACCESS_MARINE_REMOTEBUILD_REBEL, ACCESS_MARINE_ENGINEERING_REBEL) - jobworth = list(/datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner/rebel = SMARTIE_POINTS_MEDIUM, /datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/squad/smartgunner/rebel = SMARTIE_POINTS_MEDIUM, + /datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR, + ) /datum/job/terragov/squad/engineer/radio_help_message(mob/M) . = ..() @@ -211,13 +223,21 @@ Your squaddies will look to you when it comes to construction in the field of ba paygrade = "E3" comm_title = "Med" total_positions = 16 + + exp_requirements = XP_REQ_NOVICE + exp_type = EXP_TYPE_MEDICAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY) minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_DROPSHIP) skills_type = /datum/skills/combat_medic display_order = JOB_DISPLAY_ORDER_SQUAD_CORPSMAN outfit = /datum/outfit/job/marine/corpsman job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS - jobworth = list(/datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_MEDIUM) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_MEDIUM, + /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, + ) html_description = {" Difficulty: Hard
You answer to the acting Squad Leader
@@ -235,7 +255,11 @@ Your squaddies will look to you when it comes to construction in the field of ba outfit = /datum/outfit/job/marine/corpsman/rebel access = list(ACCESS_MARINE_PREP_REBEL, ACCESS_MARINE_MEDPREP_REBEL, ACCESS_MARINE_MEDBAY_REBEL) minimal_access = list(ACCESS_MARINE_PREP_REBEL, ACCESS_MARINE_MEDPREP_REBEL, ACCESS_MARINE_MEDBAY_REBEL, ACCESS_MARINE_DROPSHIP_REBEL) - jobworth = list(/datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR, /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner/rebel = SMARTIE_POINTS_MEDIUM) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR, + /datum/job/terragov/squad/smartgunner/rebel = SMARTIE_POINTS_MEDIUM, + ) /datum/job/terragov/squad/corpsman/radio_help_message(mob/M) . = ..() @@ -308,13 +332,19 @@ You may not be a fully-fledged doctor, but you stand between life and death when paygrade = "E3" comm_title = "SGnr" total_positions = 4 + + exp_requirements = XP_REQ_UNSEASONED + exp_type = EXP_TYPE_MARINES + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_DROPSHIP) skills_type = /datum/skills/smartgunner display_order = JOB_DISPLAY_ORDER_SQUAD_SMARTGUNNER outfit = /datum/outfit/job/marine/smartgunner job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS - jobworth = list(/datum/job/xenomorph = LARVA_POINTS_REGULAR) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + ) job_points_needed = 10 //Redefined via config. html_description = {" Difficulty: Medium
@@ -403,14 +433,18 @@ You may not be a fully-fledged doctor, but you stand between life and death when comm_title = "Spec" total_positions = 0 max_positions = 0 + + exp_requirements = 0 + exp_type = EXP_TYPE_MARINES + access = list(ACCESS_MARINE_PREP) minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_DROPSHIP) skills_type = /datum/skills/specialist outfit = /datum/outfit/job/marine/specialist - exp_requirements = XP_REQ_UNSEASONED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS - jobworth = list(/datum/job/xenomorph = LARVA_POINTS_STRONG) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_STRONG, + ) job_points_needed = 10 //Redefined via config. @@ -435,14 +469,16 @@ You can serve a variety of roles, so choose carefully."}) paygrade = "E5" comm_title = JOB_COMM_TITLE_SQUAD_LEADER total_positions = 4 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_MARINES + supervisors = "the acting field commander" access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) skills_type = /datum/skills/sl display_order = JOB_DISPLAY_ORDER_SQUAD_LEADER outfit = /datum/outfit/job/marine/leader - exp_requirements = XP_REQ_INTERMEDIATE - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS jobworth = list( /datum/job/xenomorph = LARVA_POINTS_REGULAR, @@ -555,7 +591,11 @@ You are also in charge of communicating with command and letting them know about outfit = /datum/outfit/job/marine/vatgrown total_positions = 0 job_flags = JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS - jobworth = list(/datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, + /datum/job/survivor/rambo = SURVIVOR_POINTS_REGULAR, + ) minimap_icon = "private" /datum/job/terragov/squad/vatgrown/rebel @@ -563,7 +603,10 @@ You are also in charge of communicating with command and letting them know about outfit = /datum/outfit/job/marine/vatgrown/rebel access = list(ACCESS_MARINE_PREP_REBEL) minimal_access = list(ACCESS_MARINE_PREP_REBEL, ACCESS_MARINE_DROPSHIP_REBEL) - jobworth = list(/datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR) + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/silicon/synthetic/rebel = SYNTH_POINTS_REGULAR, + ) /datum/job/terragov/squad/vatgrown/return_spawn_type(datum/preferences/prefs) return /mob/living/carbon/human/species/vatgrown diff --git a/code/datums/jobs/job/shipside.dm b/code/datums/jobs/job/shipside.dm index d36c264cd3329..ec87424f31192 100644 --- a/code/datums/jobs/job/shipside.dm +++ b/code/datums/jobs/job/shipside.dm @@ -14,13 +14,15 @@ supervisors = "TGMC high command" selection_color = "#ccccff" total_positions = 1 + + exp_requirements = XP_REQ_EXPERT + exp_type = EXP_TYPE_REGULAR_ALL + skills_type = /datum/skills/captain access = ALL_MARINE_ACCESS minimal_access = ALL_MARINE_ACCESS display_order = JOB_DISPLAY_ORDER_CAPTAIN outfit = /datum/outfit/job/command/captain - exp_requirements = XP_REQ_EXPERT - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -102,13 +104,15 @@ Godspeed, captain! And remember, you are not above the law."}) paygrade = "O3" comm_title = "FCDR" total_positions = 1 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_COMMAND + skills_type = /datum/skills/fo access = ALL_MARINE_ACCESS minimal_access = ALL_MARINE_ACCESS display_order = JOB_DISPLAY_ORDER_EXECUTIVE_OFFICER outfit = /datum/outfit/job/command/fieldcommander - exp_requirements = XP_REQ_EXPERIENCED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -193,13 +197,15 @@ Make the TGMC proud!"}) paygrade = "O3" comm_title = "SO" total_positions = 4 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_REGULAR_ALL + access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_BRIG, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) minimal_access = ALL_MARINE_ACCESS skills_type = /datum/skills/so display_order = JOB_DISPLAY_ORDER_STAFF_OFFICER outfit = /datum/outfit/job/command/staffofficer - exp_requirements = XP_REQ_INTERMEDIATE - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -273,12 +279,15 @@ You are in charge of logistics and the overwatch system. You are also in line to paygrade = "WO" comm_title = "PO" total_positions = 2 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_REGULAR_ALL + access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) minimal_access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY) skills_type = /datum/skills/pilot display_order = JOB_DISPLAY_ORDER_PILOT_OFFICER outfit = /datum/outfit/job/command/pilot - exp_requirements = XP_REQ_INTERMEDIATE job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE_STRONG, @@ -368,13 +377,15 @@ Though you are a warrant officer, your authority is limited to the dropship and comm_title = "CSE" selection_color = "#ffeeaa" total_positions = 1 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_ENGINEERING + access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PREP) minimal_access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_PREP, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY) skills_type = /datum/skills/ce display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER outfit = /datum/outfit/job/engineering/chief - exp_requirements = XP_REQ_EXPERIENCED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -458,6 +469,10 @@ You are also next in the chain of command, should the bridge crew fall in the li comm_title = "ST" paygrade = "PO3" total_positions = 5 + + exp_requirements = XP_REQ_UNSEASONED + exp_type = EXP_TYPE_MARINES + supervisors = "the chief ship engineer and the requisitions officer" access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING) minimal_access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING) @@ -477,6 +492,7 @@ You are also next in the chain of command, should the bridge crew fall in the li Gamemode Availability: Distress
Duty: Maintain the ship, be in charge of the engines. Be the secondary engineer to a forward operating base, prepare the shipside defenses if needed. Help the Pilot Officer in preparing the dropship. "} + minimap_icon = "eng" /datum/job/terragov/engineering/tech/rebel title = REBEL_SHIP_TECH @@ -549,13 +565,15 @@ requisitions line and later on to be ready to send supplies for marines who are comm_title = "RO" selection_color = "#9990B2" total_positions = 1 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_REGULAR_ALL + access = list(ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_PREP, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) minimal_access = list(ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_PREP, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS) skills_type = /datum/skills/ro display_order = JOB_DISPLAY_ORDER_REQUISITIONS_OFFICER outfit = /datum/outfit/job/requisitions/officer - exp_requirements = XP_REQ_UNSEASONED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -640,6 +658,10 @@ A happy ship is a well-functioning ship."}) comm_title = "CMO" paygrade = "CHO" total_positions = 1 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_MEDICAL + supervisors = "the acting captain" selection_color = "#99FF99" access = list(ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_CHEMISTRY) @@ -647,8 +669,6 @@ A happy ship is a well-functioning ship."}) skills_type = /datum/skills/cmo display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER outfit = /datum/outfit/job/medical/professor - exp_requirements = XP_REQ_EXPERIENCED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD jobworth = list( /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, @@ -662,6 +682,7 @@ A happy ship is a well-functioning ship."}) Gamemode Availability: Crash, Distress
Duty: Communicate and lead your fellow medical staff (if available), supervise the medical department. Coordinate and teach fellow medical staff and corpsmen what they’re doing for treating an injury. Be the sole doctor in the Canterbury. "} + minimap_icon = "CMO" /datum/job/terragov/medical/professor/rebel title = REBEL_CHIEF_MEDICAL_OFFICER @@ -729,6 +750,10 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin comm_title = "MD" paygrade = "RES" total_positions = 6 + + exp_requirements = XP_REQ_UNSEASONED + exp_type = EXP_TYPE_MARINES + supervisors = "the chief medical officer" access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY) minimal_access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP) @@ -748,6 +773,7 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin Gamemode Availability: Distress
Duty: Tend severely wounded patients to your aid in the form of surgery, repair broken bones and damaged organs, fix internal bleeding and prevent the birth of a xenomorph larva. Develop superior healing medicines. "} + minimap_icon = "med" /datum/job/terragov/medical/medicalofficer/rebel title = REBEL_MEDICAL_DOCTOR @@ -814,6 +840,10 @@ You are also an expert when it comes to medication and treatment. If you do not comm_title = "Rsr" paygrade = "CD" total_positions = 2 + + exp_requirements = XP_REQ_UNSEASONED + exp_type = EXP_TYPE_MEDICAL + supervisors = "the NT corporate office" access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_ENGINEERING, ACCESS_CIVILIAN_ENGINEERING) minimal_access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP) @@ -906,6 +936,10 @@ It is also recommended that you gear up like a regular marine, or your 'internsh comm_title = "CL" supervisors = "the NT corporate office" total_positions = 1 + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_REGULAR_ALL + access = list(ACCESS_NT_CORPORATE, ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_LOGISTICS) minimal_access = list(ACCESS_NT_CORPORATE, ACCESS_ILLEGAL_PIRATE, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO, ACCESS_MARINE_MEDBAY) skills_type = /datum/skills/civilian @@ -924,6 +958,7 @@ It is also recommended that you gear up like a regular marine, or your 'internsh Gamemode Availability: Distress
Duty: Manage relations between Nanotrasen and TerraGov Marine Corps. Report your findings via faxes. Reply if you’re called. "} + minimap_icon = "NT" /datum/job/terragov/civilian/liaison/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) . = ..() @@ -977,13 +1012,15 @@ Use your office fax machine to communicate with corporate headquarters or to acq paygrade = "Mk.I" supervisors = "the acting captain" total_positions = 1 + + exp_requirements = XP_REQ_EXPERT + exp_type = EXP_TYPE_REGULAR_ALL + skills_type = /datum/skills/synthetic access = ALL_ACCESS minimal_access = ALL_ACCESS display_order = JOB_DISPLAY_ORDER_SYNTHETIC outfit = /datum/outfit/job/civilian/synthetic - exp_requirements = XP_REQ_EXPERIENCED - exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_SPECIALNAME|JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP job_points_needed = 40 jobworth = list( @@ -1069,11 +1106,12 @@ In addition, being a Synthetic gives you knowledge in every field and specializa req_admin_notify = TRUE comm_title = "AI" total_positions = 1 - selection_color = "#92c255" - supervisors = "your laws and the human crew" + exp_requirements = XP_REQ_INTERMEDIATE exp_type = EXP_TYPE_REGULAR_ALL - exp_type_department = EXP_TYPE_SILICON + + selection_color = "#92c255" + supervisors = "your laws and the human crew" display_order = JOB_DISPLAY_ORDER_AI skills_type = /datum/skills/ai job_flags = JOB_FLAG_SPECIALNAME|JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index 4930102af90e4..3697144262525 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -280,7 +280,25 @@ Good luck, but do not expect to survive."}) title = "Survivor" skills_type = /datum/skills/civilian/survivor/master outfit = /datum/outfit/job/survivor/rambo - job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN + job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_LATEJOINABLE + + exp_requirements = XP_REQ_SURVIVOR + exp_type = EXP_TYPE_ALL + job_points_needed = 5 + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR/2, + ) + + html_description = {" + Difficulty: Hard
+ You answer to: Yourself
+ Unlock Requirement: 300h Living
+ Gamemode Availability: Nuclear War, Distress
+ You are one of lucky people to survive the initial xeno infestation. You're one of unlucky people who have not escaped yet. Do not fear, or you will die even faster. +
+ Duty: SURVIVE + "} + /datum/outfit/job/survivor/rambo name = "Survivor" diff --git a/code/datums/jobs/job/xenomorph.dm b/code/datums/jobs/job/xenomorph.dm index 0d4f7ea8e39dc..34666d2c9d039 100644 --- a/code/datums/jobs/job/xenomorph.dm +++ b/code/datums/jobs/job/xenomorph.dm @@ -5,7 +5,9 @@ selection_color = "#B2A3CC" display_order = JOB_DISPLAY_ORDER_XENOMORPH job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_SHOW_OPEN_POSITIONS - jobworth = list(/datum/job/survivor/rambo = SURVIVOR_POINTS_REGULAR) + jobworth = list( + /datum/job/survivor/rambo = SURVIVOR_POINTS_REGULAR + ) job_points_needed = 10 //Redefined via config. faction = FACTION_XENO html_description = {" @@ -57,10 +59,16 @@ req_admin_notify = TRUE supervisors = "Queen mother" selection_color = "#8972AA" + + exp_requirements = XP_REQ_INTERMEDIATE + exp_type = EXP_TYPE_XENO + + display_order = JOB_DISPLAY_ORDER_XENO_QUEEN - exp_requirements = XP_REQ_EXPERIENCED job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_HIDE_CURRENT_POSITIONS - jobworth = list(/datum/job/survivor/rambo = SURVIVOR_POINTS_REGULAR) + jobworth = list( + /datum/job/survivor/rambo = SURVIVOR_POINTS_REGULAR*3 + ) html_description = {" Difficulty: Soul crushing
You answer to the Queen Mother
diff --git a/code/datums/loadout/loadout_manager.dm b/code/datums/loadout/loadout_manager.dm index 33d65187757f9..0e7d5ce5fce24 100644 --- a/code/datums/loadout/loadout_manager.dm +++ b/code/datums/loadout/loadout_manager.dm @@ -87,7 +87,7 @@ var/loadout_id = params["loadout_id"] if(isnull(loadout_id)) return - var/list/items = splittext(loadout_id, "//") + var/list/items = splittext_char(loadout_id, "//") if(length(items) != 3) to_chat(ui.user, span_warning("Wrong format!")) return diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index bee8fa8aa5183..861ea32d91577 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -41,7 +41,7 @@ var/key var/list/models = cached_map.grid_models for(key in models) - if(findtext(models[key], "[/obj/docking_port/mobile]")) // Yay compile time checks + if(findtext_char(models[key], "[/obj/docking_port/mobile]")) // Yay compile time checks break // This works by assuming there will ever only be one mobile dock in a template at most for(var/i in cached_map.gridSets) @@ -50,7 +50,7 @@ for(var/line in gset.gridLines) var/xcrd = gset.xcrd for(var/j in 1 to length(line) step cached_map.key_len) - if(key == copytext(line, j, j + cached_map.key_len)) + if(key == copytext_char(line, j, j + cached_map.key_len)) port_x_offset = xcrd port_y_offset = ycrd return diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm index da52e900f5b3f..9503c56055345 100644 --- a/code/datums/verbs.dm +++ b/code/datums/verbs.dm @@ -83,7 +83,7 @@ if(childlist) var/childname = "[child]" if(childname == "[child.type]") - var/list/tree = splittext(childname, "/") + var/list/tree = splittext_char(childname, "/") childname = tree[length(tree)] .[child.type] = "parent=[url_encode(type)];name=[childname]" . += childlist @@ -96,9 +96,9 @@ entry["parent"] = "[type]" entry["name"] = verbpath.desc if(verbpath.name[1] == "@") - entry["command"] = copytext(verbpath.name, length(verbpath.name[1]) + 1) + entry["command"] = copytext_char(verbpath.name, length_char(verbpath.name[1]) + 1) else - entry["command"] = replacetext(verbpath.name, " ", "-") + entry["command"] = replacetext_char(verbpath.name, " ", "-") .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args)) diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 85311637f446b..3ad57311b851d 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -115,7 +115,7 @@ /datum/wires/proc/is_dud(wire) - return findtext(wire, WIRE_DUD_PREFIX, 1, length(WIRE_DUD_PREFIX) + 1) + return findtext_char(wire, WIRE_DUD_PREFIX, 1, length(WIRE_DUD_PREFIX) + 1) /datum/wires/proc/is_dud_color(color) diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index c8d73dcb14fd7..28b597b5e5f5c 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -20,12 +20,20 @@ // DATUM /datum/world_topic var/keyword - var/log = FALSE + var/log = TRUE + var/key_valid + var/require_comms_key = FALSE /datum/world_topic/proc/TryRun(list/input) + key_valid = config && (CONFIG_GET(string/comms_key) == input["key"]) input -= "key" - . = Run(input) + if(require_comms_key && !key_valid) + . = "Bad Key" + if (input["format"] == "json") + . = list("error" = .) + else + . = Run(input) if (input["format"] == "json") . = json_encode(.) else if(islist(.)) @@ -76,3 +84,54 @@ .["hard_popcap"] = CONFIG_GET(number/hard_popcap) || 0 .["extreme_popcap"] = CONFIG_GET(number/extreme_popcap) || 0 .["popcap"] = max(CONFIG_GET(number/soft_popcap), CONFIG_GET(number/hard_popcap), CONFIG_GET(number/extreme_popcap)) //generalized field for this concept for use across ss13 codebases + + +/datum/world_topic/status2 + keyword = "status2" + + +/datum/world_topic/status2/Run(list/input) + . = list() + .["mode"] = GLOB.master_mode + .["respawn"] = GLOB.respawn_allowed + .["enter"] = GLOB.enter_allowed + .["roundtime"] = gameTimestamp() + .["listed"] = GLOB.hub_visibility + .["players"] = length(GLOB.clients) + .["ticker_state"] = SSticker.current_state + .["mapname"] = length(SSmapping.configs) ? "[SSmapping.configs[GROUND_MAP].map_name] ([SSmapping.configs[SHIP_MAP].map_name])" : "Loading..." + .["security_level"] = GLOB.marine_main_ship?.get_security_level() + .["round_duration"] = SSticker ? round((world.time - SSticker.round_start_time) / 10) : 0 + +/datum/world_topic/playerlist_ext + keyword = "playerlist_ext" + require_comms_key = TRUE + +/datum/world_topic/playerlist_ext/Run(list/input) + . = list() + var/list/players = list() + var/list/disconnected_observers = list() + + for(var/mob/M in GLOB.dead_mob_list) + if(!M.ckey) + continue + if (M.client) + continue + var/ckey = ckey(M.ckey) + disconnected_observers[ckey] = ckey + + for(var/client/C as anything in GLOB.clients) + var/ckey = C.ckey + players[ckey] = ckey + . += ckey + + for(var/mob/M in GLOB.alive_living_list) + if(!M.ckey) + continue + var/ckey = ckey(M.ckey) + if(players[ckey]) + continue + if(disconnected_observers[ckey]) + continue + players[ckey] = ckey + . += ckey diff --git a/code/game/area/barrenquilla_mining.dm b/code/game/area/barrenquilla_mining.dm new file mode 100644 index 0000000000000..549e8a636450e --- /dev/null +++ b/code/game/area/barrenquilla_mining.dm @@ -0,0 +1,213 @@ +// Barrenquilla "Barren" Mining Facility + +//Base Area + +/area/barren + name = "Lava" + icon_state = "lava" + +//Caves +/area/lavaland/cave + minimap_color = MINIMAP_AREA_CAVES + +/area/barren/cave + name = "Caves" + ambience = list('sound/ambience/ambicave.ogg', 'sound/ambience/ambilava1.ogg', 'sound/ambience/ambilava2.ogg', 'sound/ambience/ambilava3.ogg') + ceiling = CEILING_NONE + minimap_color = MINIMAP_AREA_CAVES + +/area/barren/cave/central + name = "Central Caves" + icon_state = "lava_cave_c" + +/area/barren/cave/north + name = "North Caves" + icon_state = "lava_cave_n" + +/area/barren/cave/northeast + name = "North East Caves" + icon_state = "lava_cave_ne" + +/area/barren/cave/northwest + name = "North West Caves" + icon_state = "lava_cave_nw" + +/area/barren/cave/south + name = "South Caves" + icon_state = "lava_cave_s" + +/area/barren/cave/southeast + name = "South East Caves" + icon_state = "lava_cave_se" + +/area/barren/cave/southwest + name = "South West Caves" + icon_state = "lava_cave_sw" + +/area/barren/cave/east + name = "East Caves" + icon_state = "lava_cave_e" + +/area/barren/cave/west + name = "West Caves" + icon_state = "lava_cave_w" + +/area/barren/cave/lz1 + name = "Landing Zone 1" + icon_state = "lava_lz1" + +/area/barren/cave/lz2 + name = "Landing Zone 2" + icon_state = "lava_lz2" + +//Medical + +/area/barren/medical + name = "Medical Clinic" + icon_state = "lava_med" + outside = FALSE + minimap_color = MINIMAP_AREA_MEDBAY + +/area/barren/medical/chemistry + name = "Medical Clinic Chemistry" + icon_state = "lava_chem" + +/area/barren/medical/cmo + name = "Chief Medical Office" + icon_state = "lava_cmo" + +/area/barren/medical/research + name = "Research Outpost" + icon_state = "lava_research" + +//"Engineer" +/area/barren/engie + outside = FALSE + icon_state = "lava_engine" + minimap_color = MINIMAP_AREA_ENGI + +/area/barren/engie/one + name = "Generator One" + icon_state = "lava_eng1" + +/area/barren/engie/two + name = "Generator Two" + icon_state = "lava_eng2" + +/area/barren/engie/three + name = "Generator Three" + icon_state = "lava_eng3" + +/area/barren/engie/engine + name = "Engineering Facility" + icon_state = "lava_eng4" + +//Security + +/area/barren/security + name = "Prison Facility" + icon_state = "lava_sec_prison" + outside = FALSE + minimap_color = MINIMAP_AREA_SEC + +/area/barren/security/storage + name = "Prison Facility Storage" + icon_state = "lava_sec_secure" + +/area/barren/security/infocenter + name = "Prison Facility Information Center" + icon_state = "lava_sec" + +/area/barren/security/nuke + name = "Emergency Nuclear Fission Facility" + icon_state = "lava_sec_nuke" + +//Civilian + +/area/barren/civilian + name = "Civilian Housing" + icon_state = "lava_civ" + outside = FALSE + +/area/barren/civilian/cook + name = "Civilian Kitchen" + icon_state = "lava_civ_cook" + +/area/barren/civilian/botany + name = "Civilian Botany" + icon_state = "lava_civ_bot" + +/area/barren/civilian/garden + name = "Civilian Garden" + icon_state = "lava_civ_garden" + +/area/barren/civilian/cargo + name = "Civilian Cargo" + icon_state = "lava_civ_cargo" + +/area/barren/civilian/workdorm + name = "Worker Dormitory" + icon_state = "lava_work_dorm" + outside = FALSE + +//Misc Locations +/area/lavaland/misc + minimap_color = MINIMAP_AREA_COLONY + +/area/barren/misc + minimap_color = MINIMAP_AREA_COLONY + +/area/barren/misc/stationed + name = "Stationed Ship" + icon_state = "lava_misc_stationed" + outside = FALSE + +/area/barren/misc/outpost + name = "Abandoned Outpost" + icon_state = "lava_misc_outpost" + outside = FALSE + +/area/barren/misc/alienstorage + name = "Alien Storage" + icon_state = "lava_misc_alienstorage" + outside = FALSE + +/area/barren/misc/shack + name = "Shack" + icon_state = "lava_misc_shack" + outside = FALSE + +/area/barren/misc/genstorage + name = "General Storage" + icon_state = "lava_misc_genstorage" + outside = FALSE + +/area/barren/misc/eastarmory + name = "Eastern Armory" + icon_state = "lava_misc_armory1" + outside = FALSE + +/area/barren/misc/westarmory + name = "Western Armory" + icon_state = "lava_misc_armory2" + outside = FALSE + +/area/barren/misc/refinery + name = "Ore Processing Facility" + icon_state = "lava_misc_refinery" + minimap_color = MINIMAP_AREA_ENGI + +/area/barren/misc/crashed + name = "Crashed Ship" + icon_state = "lava_misc_crashed" + +/area/barren/misc/clocknuke //This'll come into play later + name = "The Brass Gavel" + icon_state = "lava_clock_nuke" + outside = FALSE + requires_power = 0 + +/area/barren/misc/ashshelter + name = "Ash Shelter" + icon_state = "lava_ash_shelter" + outside = FALSE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 5285b3645782d..6696440c69924 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -865,9 +865,9 @@ Proc for attack log creation, because really why not if(!LAZYACCESS(fingerprints, M.key)) LAZYSET(fingerprints, M.key, "First: [M.real_name] | [current_time] | [type] [special ? "| [special]" : ""]") else - var/laststamppos = findtext(LAZYACCESS(fingerprints, M.key), " Last: ") + var/laststamppos = findtext_char(LAZYACCESS(fingerprints, M.key), " Last: ") if(laststamppos) - LAZYSET(fingerprints, M.key, copytext(fingerprints[M.key], 1, laststamppos)) + LAZYSET(fingerprints, M.key, copytext_char(fingerprints[M.key], 1, laststamppos)) fingerprints[M.key] += " Last: [M.real_name] | [current_time] | [type] [special ? " | [special]" : ""]" return TRUE diff --git a/code/game/objects/items/books/manuals.dm b/code/game/objects/items/books/manuals.dm index 4523a6217dac7..95bb8838de0b7 100644 --- a/code/game/objects/items/books/manuals.dm +++ b/code/game/objects/items/books/manuals.dm @@ -15,7 +15,7 @@ dat = {" - + @@ -33,7 +33,7 @@ author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" - dat = {" + dat = {"
Jobs Unlocked: