Skip to content

Commit

Permalink
removes config.rus_language (TauCetiStation#6229)
Browse files Browse the repository at this point in the history
  • Loading branch information
T6751 authored Oct 16, 2020
1 parent e8efb05 commit 7269001
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 1,166 deletions.
29 changes: 7 additions & 22 deletions code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,18 +191,12 @@ var/global/regex/code_response_highlight_rule
*/

/proc/set_languge_lists()
if(config.rus_language)
global.rus_nouns = file2list("config/names/rus_nouns.txt")
global.rus_adjectives = file2list("config/names/rus_adjectives.txt")
global.rus_verbs = file2list("config/names/rus_verbs.txt")
global.rus_occupations = file2list("config/names/rus_occupations.txt")
global.rus_bays = file2list("config/names/rus_bays.txt")
global.rus_local_terms = file2list("config/names/rus_local_terms.txt")
else
global.eng_adjectives = file2list("config/names/eng_adjectives.txt")
global.eng_verbs = file2list("config/names/eng_verbs.txt")
global.eng_drinks = file2list("config/names/eng_drinks.txt")
global.eng_nouns = file2list("config/names/eng_nouns.txt")
global.rus_nouns = file2list("config/names/rus_nouns.txt")
global.rus_adjectives = file2list("config/names/rus_adjectives.txt")
global.rus_verbs = file2list("config/names/rus_verbs.txt")
global.rus_occupations = file2list("config/names/rus_occupations.txt")
global.rus_bays = file2list("config/names/rus_bays.txt")
global.rus_local_terms = file2list("config/names/rus_local_terms.txt")

//Proc is used for phrase and response in subsystem init.
/proc/generate_code_phrase()
Expand All @@ -216,23 +210,14 @@ var/global/regex/code_response_highlight_rule
)
var/code_phrase[words_count]
for(var/i in 1 to code_phrase.len)
var/word
if(config.rus_language)
word = pick(
var/word = pick(
80; pick(global.rus_occupations),
70; pick(global.rus_bays),
65; pick(global.rus_local_terms),
65; pick(global.rus_adjectives),
55; pick(global.rus_nouns),
40; pick(global.rus_verbs)
)
else
word = pick(
70; pick(global.eng_drinks),
65; pick(global.eng_adjectives),
55; pick(global.eng_nouns),
40; pick(global.eng_verbs)
)

if(!word || code_phrase.Find(word, 1, i)) // Reroll duplicates and errors
i--
Expand Down
5 changes: 0 additions & 5 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ var/global/list/rus_occupations
var/global/list/rus_bays
var/global/list/rus_local_terms

var/global/list/eng_adjectives
var/global/list/eng_verbs
var/global/list/eng_drinks
var/global/list/eng_nouns

//loaded on startup because of "
//would include in rsc if ' was used

Expand Down
5 changes: 0 additions & 5 deletions code/controllers/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ var/list/net_announcer_secret = list()
var/disable_player_mice = 0
var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech

var/rus_language = 0

var/deathtime_required = 18000 //30 minutes

var/usealienwhitelist = 0
Expand Down Expand Up @@ -584,9 +582,6 @@ var/list/net_announcer_secret = list()
if("deathtime_required")
config.deathtime_required = text2num(value)

if("rus_language")
config.rus_language = 1

if("allow_drone_spawn")
config.allow_drone_spawn = text2num(value)

Expand Down
8 changes: 2 additions & 6 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,8 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/Initialize(timeofday)
global.syndicate_code_phrase = generate_code_phrase()
global.syndicate_code_response = generate_code_phrase()
if(config.rus_language)
global.code_phrase_highlight_rule = generate_code_regex(global.syndicate_code_phrase, @"\u0430-\u0451") // Russian chars only
global.code_response_highlight_rule = generate_code_regex(global.syndicate_code_response, @"\u0430-\u0451") // Russian chars only
else
global.code_phrase_highlight_rule = generate_code_regex(global.syndicate_code_phrase, @"\u0061-\u007A") // English chars only
global.code_response_highlight_rule = generate_code_regex(global.syndicate_code_response, @"\u0061-\u007A") // English chars only
global.code_phrase_highlight_rule = generate_code_regex(global.syndicate_code_phrase, @"\u0430-\u0451") // Russian chars only
global.code_response_highlight_rule = generate_code_regex(global.syndicate_code_response, @"\u0430-\u0451") // Russian chars only

setupFactions()
..()
Expand Down
5 changes: 1 addition & 4 deletions code/modules/admin/verbs/adminpm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,7 @@

to_chat(recipient, "<font color='red' size='4'><b>-- Administrator private message --</b></font>")
to_chat(recipient, "<font color='red'>Admin PM from-<b>[key_name(src, recipient, 0)]</b>: <span class='emojify linkify'>[msg]</span></font>")
if(config.rus_language)
to_chat(recipient, "<font color='red'><i>Нажмите на имя администратора для ответа.</i></font>")
else
to_chat(recipient, "<font color='red'><i>Click on the administrator's name to reply.</i></font>")
to_chat(recipient, "<font color='red'><i>Нажмите на имя администратора для ответа.</i></font>")
to_chat(src, "<font color='blue'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: <span class='emojify linkify'>[msg]</span></font>")

admin_ticket_log(recipient, "<font color='blue'>PM From [key_name_admin(src)]: [msg]</font>")
Expand Down
5 changes: 1 addition & 4 deletions code/modules/mentor/mentorpm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@
var/recieve_message = ""

if(((src in mentors) || holder) && !C.holder)
if(config.rus_language)
recieve_message = "<font color='[recieve_color]' size='3'><b>-- Нажмите на имя [recieve_pm_type]'а для ответа --</b></font>\n"
else
recieve_message = "<font color='[recieve_color]' size='3'><b>-- Click the [recieve_pm_type]'s name to reply --</b></font>\n"
recieve_message = "<font color='[recieve_color]' size='3'><b>-- Нажмите на имя [recieve_pm_type]'а для ответа --</b></font>\n"
if(C.mentorhelped)
to_chat(C, recieve_message)
C.mentorhelped = FALSE
Expand Down
28 changes: 8 additions & 20 deletions code/modules/mob/living/carbon/human/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,7 @@
if(1)
emote("twitch")
if(2 to 3)
if(config.rus_language)
say(pick("ГОВНО", "ЖОПА", "ЕБАЛ", "ПИДАРА-АС", "ХУЕСОС", "СУКА", "МАТЬ ТВОЮ","А НУ ИДИ СЮДА","УРОД"))
else
say(pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS"))
say(pick("ГОВНО", "ЖОПА", "ЕБАЛ", "ПИДАРА-АС", "ХУЕСОС", "СУКА", "МАТЬ ТВОЮ","А НУ ИДИ СЮДА","УРОД"))
var/old_x = pixel_x
var/old_y = pixel_y
pixel_x += rand(-2,2)
Expand Down Expand Up @@ -246,22 +243,13 @@

if(13 to 18)
if(getBrainLoss() >= 60 && !HAS_TRAIT(src, TRAIT_STRONGMIND))
if(config.rus_language)//TODO:CYRILLIC dictionary?
switch(rand(1, 3))
if(1)
say(pick("азазаа!", "Я не смалгей!", "ХОС ХУЕСОС!", "[pick("", "ебучий трейтор")] [pick("морган", "моргун", "морген", "мрогун")] [pick("джемес", "джамес", "джаемес")] грефонет миня шпасит;е!!!", "ти можыш дать мне [pick("тилипатию","халку","эпиллепсию")]?", "ХАчу стать боргом!", "ПОЗОвите детектива!", "Хочу стать мартышкой!", "ХВАТЕТ ГРИФОНЕТЬ МИНЯ!!!!", "ШАТОЛ!"))
if(2)
say(pick("Как минять руки?","ебучие фурри!", "Подебил", "Проклятые трапы!", "лолка!", "вжжжжжжжжж!!!", "джеф скваааад!", "БРАНДЕНБУРГ!", "БУДАПЕШТ!", "ПАУУУУУК!!!!", "ПУКАН БОМБАНУЛ!", "ПУШКА", "РЕВА ПОЦОНЫ", "Пати на хопа!"))
if(3)
emote("drool")
else
switch(rand(1, 3))
if(1)
say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#"))
if(2)
say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!"))
if(3)
emote("drool")
switch(rand(1, 3))
if(1)
say(pick("азазаа!", "Я не смалгей!", "ХОС ХУЕСОС!", "[pick("", "ебучий трейтор")] [pick("морган", "моргун", "морген", "мрогун")] [pick("джемес", "джамес", "джаемес")] грефонет миня шпасит;е!!!", "ти можыш дать мне [pick("тилипатию","халку","эпиллепсию")]?", "ХАчу стать боргом!", "ПОЗОвите детектива!", "Хочу стать мартышкой!", "ХВАТЕТ ГРИФОНЕТЬ МИНЯ!!!!", "ШАТОЛ!"))
if(2)
say(pick("Как минять руки?","ебучие фурри!", "Подебил", "Проклятые трапы!", "лолка!", "вжжжжжжжжж!!!", "джеф скваааад!", "БРАНДЕНБУРГ!", "БУДАПЕШТ!", "ПАУУУУУК!!!!", "ПУКАН БОМБАНУЛ!", "ПУШКА", "РЕВА ПОЦОНЫ", "Пати на хопа!"))
if(3)
emote("drool")

/mob/living/carbon/human/proc/handle_mutations_and_radiation()

Expand Down
5 changes: 2 additions & 3 deletions code/modules/mob/living/carbon/human/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,9 @@
if((message_mode != "changeling") && prob(40))
if(prob(80))
message = pick("A-HA-HA-HA!", "U-HU-HU-HU!", "I'm a GN-NOME!", "I'm a GnOme!", "Don't GnoMe me!", "I'm gnot a gnoblin!", "You've been GNOMED!")
else if(config.rus_language)
message = "[message]... Но я ГНОМ!"
else
message = "[message]... But i'm A GNOME!"
message = "[message]... Но я ГНОМ!"

verb = pick("yells like an idiot", "says rather loudly")
speech_sound = 'sound/magic/GNOMED.ogg'

Expand Down
3 changes: 0 additions & 3 deletions config/example/config.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
# SERVERNAME spacestation13

## Unhash this if you want see the russian text in some places, like disease and other
#RUS_LANGUAGE

## Whitelist for new players
#SERVERWHITELIST

Expand Down
Loading

0 comments on commit 7269001

Please sign in to comment.