Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Scandinavian as a language option in the traits menu #7247

Merged
merged 6 commits into from
Oct 5, 2024
Merged

Adds Scandinavian as a language option in the traits menu #7247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aba12bd
Adds Scandinavian language
LachlanSyn Sep 30, 2024
b2e7496
Merge branch 'cmss13-devs:master' into traits
WazLach Sep 30, 2024
dce30a5
Updated styling to add Scandinavian, also redid syllables to make bet…
LachlanSyn Sep 30, 2024
a7c6e4a
Merge branch 'traits' of https://github.com/WazLach/cmss13 into traits
LachlanSyn Sep 30, 2024
bb97caa
Merge branch 'master' into traits
WazLach Sep 30, 2024
ab5f636
Merge branch 'master' into traits
WazLach Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/__DEFINES/language.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define LANGUAGE_CHINESE "Chinese"
#define LANGUAGE_RUSSIAN "Russian"
#define LANGUAGE_GERMAN "German"
#define LANGUAGE_SCANDINAVIAN "Scandinavian"
#define LANGUAGE_SPANISH "Spanish"
#define LANGUAGE_TSL "Tactical Sign Language"
#define LANGUAGE_YAUTJA "Sainja"
Expand All @@ -16,11 +17,11 @@

#define LANGUAGE_TELEPATH "Telepath Implant"

#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH)
#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH)

#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)

#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)

//Chinese language sound bitflags

Expand Down
5 changes: 5 additions & 0 deletions code/modules/character_traits/languages.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
applyable = TRUE
cost = 1

/datum/character_trait/language/scandinavian
language_name = LANGUAGE_SCANDINAVIAN
applyable = TRUE
cost = 1

/datum/character_trait/language/spanish
language_name = LANGUAGE_SPANISH
applyable = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/synths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@
assignment = JOB_WORKING_JOE
rank = JOB_WORKING_JOE
skills = /datum/skills/working_joe
languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE)
languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE)
/// Used to set species when loading race
var/joe_type = SYNTH_WORKING_JOE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/whiteout.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
assignment = "Whiteout Team Operative"
role_comm_title = "WO"
rank = FACTION_WY_DEATHSQUAD
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all.
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all.
skills = /datum/skills/everything //They are Synths, programmed for Everything.
idtype = /obj/item/card/id/pmc/ds
paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0)
Expand Down
11 changes: 11 additions & 0 deletions code/modules/mob/language/languages.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@

syllables = list("die", "das", "wein", "mir", "und", "wir", "ein", "nein", "gen", "en", "sauen", "bin", "nein", "rhein", "deut", "der", "lieb", "en", "stein", "nein", "ja", "wolle", "sil", "bei", "der", "sie", "sch", "kein", "nur", "ach", "kann", "volk", "vau", "gelb", "grun", "macht", "zwei", "vier", "nacht", "tag")

/datum/language/scandinavian
name = LANGUAGE_SCANDINAVIAN
desc = "While not technically one language, Scandinavian languages have grown similar and are nearly indistinguishable from one another unless you actually know the languages."
speech_verb = "blubbers"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uh oh

ask_verb = "queries"
exclaim_verb = "yelps"
color = "scandinavian"
key = "0"

syllables = list("de", "vin", "meg", "og", "vi", "en", "nei", "ing", "gen", "et", "pur", "ke", "er", "nei", "hjort", "tysk", "de", "kjae", "en", "stein", "ja", "ull", "sil", "pa", "hun", "kjo", "erg", "ba", "re", "ol", "kyll", "menn", "esk", "gul", "gronn", "natt", "makt", "to", "fi", "re", "dag", "god", "jul", "ild", "fem", "jeg", "deg", "bjor", "en", "russ", "land", "sve", "rig", "nor", "ge", "dan", "is")

/datum/language/spanish
name = LANGUAGE_SPANISH
desc = "The second most common language spoken in the UA, brought from marines from the Latin American territories and in the former southern USA."
Expand Down
4 changes: 4 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,10 @@ em {
font-family: 'Times New Roman', Times, serif;
}

.scandinavian {
color: #1e8f8c;
}

.spanish {
color: #cf982b;
}
Expand Down
4 changes: 4 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,10 @@ h2.alert {
font-family: 'Times New Roman', Times, serif;
}

.scandinavian {
color: #1e8f8c;
}

.spanish {
color: #cf982b;
}
Expand Down
Loading