diff --git a/baystation12.dme b/baystation12.dme index db4b5715abc..0a0113864bc 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -2158,12 +2158,13 @@ #include "code\modules\mob\language\alien\unathi.dm" #include "code\modules\mob\language\human\arabic.dm" #include "code\modules\mob\language\human\chinese.dm" -#include "code\modules\mob\language\human\euro.dm" +#include "code\modules\mob\language\human\english.dm" #include "code\modules\mob\language\human\human.dm" +#include "code\modules\mob\language\human\iberian.dm" #include "code\modules\mob\language\human\indian.dm" #include "code\modules\mob\language\human\russian.dm" #include "code\modules\mob\language\human\selenian.dm" -#include "code\modules\mob\language\human\spanish.dm" +#include "code\modules\mob\language\human\misc\common.dm" #include "code\modules\mob\language\human\misc\gutter.dm" #include "code\modules\mob\language\human\misc\spacer.dm" #include "code\modules\mob\living\autohiss.dm" diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm index db741b44e66..287c01afc23 100644 --- a/code/__defines/culture.dm +++ b/code/__defines/culture.dm @@ -11,23 +11,24 @@ ) // Cultural IDs. -#define FACTION_SOL_CENTRAL "Sol Central Government" -#define FACTION_TERRAGOV "Terran Government" -#define FACTION_ISC "Independent Space Confederation" -#define FACTION_NANOTRASEN "NanoTrasen" -#define FACTION_CYBERSUN "Cybersun Industries" -#define FACTION_FREETRADE "Free Trade Union" -#define FACTION_HEPHAESTUS "Hephaestus Industries" -#define FACTION_XYNERGY "Xynergy" -#define FACTION_FLEET "SCG Fleet" -#define FACTION_EXPEDITIONARY "Expeditionary Corps" -#define FACTION_PCRC "Proxima Centauri Risk Control" -#define FACTION_SAARE "Strategic Assault and Asset Retention Enterprises" -#define FACTION_CORPORATE "Expeditionary Corps Organisation" -#define FACTION_DAIS "Deimos Advanced Information Systems" -#define FACTION_OTHER "Other Faction" -#define FACTION_TEST_SUBJECTS "Test Subjects" -#define FACTION_SPACECOPS "Sol Federal Police" +#define FACTION_TERRAN_DOMINION "Terran Dominion" +#define FACTION_SOL_CENTRAL "Sol Central Government" +#define FACTION_TERRAGOV "Terran Government" +#define FACTION_ISC "Independent Space Confederation" +#define FACTION_NANOTRASEN "NanoTrasen" +#define FACTION_CYBERSUN "Cybersun Industries" +#define FACTION_FREETRADE "Free Trade Union" +#define FACTION_HEPHAESTUS "Hephaestus Industries" +#define FACTION_XYNERGY "Xynergy" +#define FACTION_FLEET "SCG Fleet" +#define FACTION_EXPEDITIONARY "Expeditionary Corps" +#define FACTION_PCRC "Proxima Centauri Risk Control" +#define FACTION_SAARE "Strategic Assault and Asset Retention Enterprises" +#define FACTION_CORPORATE "Expeditionary Corps Organisation" +#define FACTION_DAIS "Deimos Advanced Information Systems" +#define FACTION_OTHER "Other Faction" +#define FACTION_TEST_SUBJECTS "Test Subjects" +#define FACTION_SPACECOPS "Sol Federal Police" // Sol Central Government #define HOME_SYSTEM_EARTH "Earth" diff --git a/code/__defines/languages.dm b/code/__defines/languages.dm index bc5860a75a0..2e9fc2a21f7 100644 --- a/code/__defines/languages.dm +++ b/code/__defines/languages.dm @@ -1,15 +1,16 @@ //Human -#define LANGUAGE_HUMAN_EURO "Zurich Accord Common" -#define LANGUAGE_HUMAN_CHINESE "Yangyu" -#define LANGUAGE_HUMAN_ARABIC "Prototype Standard Arabic" -#define LANGUAGE_HUMAN_INDIAN "New Dehlavi" +#define LANGUAGE_HUMAN_ENGLISH "English" +#define LANGUAGE_HUMAN_CHINESE "Chinese" +#define LANGUAGE_HUMAN_ARABIC "Arabic" +#define LANGUAGE_HUMAN_HINDI "Hindi" #define LANGUAGE_HUMAN_IBERIAN "Iberian" -#define LANGUAGE_HUMAN_RUSSIAN "Pan-Slavic" +#define LANGUAGE_HUMAN_RUSSIAN "Russian" #define LANGUAGE_HUMAN_SELENIAN "Selenian" -//Human misc -#define LANGUAGE_GUTTER "Gutter" +// Misc +#define LANGUAGE_COMMON "Galactic Common" #define LANGUAGE_SPACER "Spacer" +#define LANGUAGE_GUTTER "Gutter" //Alien #define LANGUAGE_EAL "Encoded Audio Language" diff --git a/code/game/antagonist/outsider/actors.dm b/code/game/antagonist/outsider/actors.dm index ac9adf97f56..f695ffa51ac 100644 --- a/code/game/antagonist/outsider/actors.dm +++ b/code/game/antagonist/outsider/actors.dm @@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(actor, /datum/antagonist/actor, new) initial_spawn_req = 1 initial_spawn_target = 1 show_objectives_on_creation = 0 //actors are not antagonists and do not need the antagonist greet text - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_COMMON /datum/antagonist/actor/greet(var/datum/mind/player) if(!..()) diff --git a/code/modules/culture_descriptor/culture/cultures_adherent.dm b/code/modules/culture_descriptor/culture/cultures_adherent.dm index 3738d92e883..0223987b779 100644 --- a/code/modules/culture_descriptor/culture/cultures_adherent.dm +++ b/code/modules/culture_descriptor/culture/cultures_adherent.dm @@ -8,7 +8,7 @@ hidden_from_codex = TRUE language = LANGUAGE_ADHERENT secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) diff --git a/code/modules/culture_descriptor/culture/cultures_diona.dm b/code/modules/culture_descriptor/culture/cultures_diona.dm index 319c48836bd..aa8d23b52a8 100644 --- a/code/modules/culture_descriptor/culture/cultures_diona.dm +++ b/code/modules/culture_descriptor/culture/cultures_diona.dm @@ -5,7 +5,7 @@ language = LANGUAGE_ROOTLOCAL additional_langs = list(LANGUAGE_ROOTGLOBAL) secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER, LANGUAGE_SIGN ) diff --git a/code/modules/culture_descriptor/culture/cultures_human.dm b/code/modules/culture_descriptor/culture/cultures_human.dm index 2ccb14281b2..9e6c3c709b6 100644 --- a/code/modules/culture_descriptor/culture/cultures_human.dm +++ b/code/modules/culture_descriptor/culture/cultures_human.dm @@ -6,10 +6,11 @@ name = CULTURE_HUMAN description = "You are from one of various planetary cultures of humankind." secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER, @@ -84,24 +85,27 @@ the planet has led to the people of Pluto having something of a seedy reputation, its citizens being viewed with disrepute. The people themselves, however, are usually \ just happy to get off the rock and to healthier locales. Unfortunately, despite the efforts of the wider SCG, many Plutonians tend to maintain criminal ties, even offworld." economic_power = 0.8 - secondary_langs = list (LANGUAGE_HUMAN_EURO, + secondary_langs = list ( + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER, LANGUAGE_GUTTER, - LANGUAGE_SIGN) + LANGUAGE_SIGN, + ) /decl/cultural_info/culture/human/earthling name = CULTURE_HUMAN_EARTH - description = "You are from Earth, home of humanity. Earth culture is much as it has been for centuries, with the old nation states, while no longer politically important, still \ - culturally significant to many humans across the galaxy, as all trace their roots to somewhere on the planet. While not as geographically diverse as they were in the past, most \ - countries have at least two arcologies which make up much of the population, with the remaining humans living in small villages or from one of the many nature preserve communes. \ - The long recovery period of Earth has resulted in much of the population being environmentally aware and heavily conservationist, eager to avoid past mistakes. Most Earthers are \ - a content folk who see themselves as close to nature and keepers of the heritage of humanity." - economic_power = 1.1 + description = "You are from Earth, home of humanity and its most important political center. \ + Currently being held by SCG as its capital world, you have seen enough political intrigue throughout your time \ + here, yet standards of living easily outmatch whatever headache it may have induced. As is expected from the \ + capital, you've seen almost no crimes beyond petty theft during your stay on one of many Earth's continents or \ + islands being committed. All in all - your life was mostly peaceful and inevitably intertwined with politics of SCG." + economic_power = 1.4 /decl/cultural_info/culture/human/ceti name = CULTURE_HUMAN_CETI @@ -140,20 +144,24 @@ while same cannot be said about most aliens, not every citizen in TerraGov is violently racist towards \ them, especially those who associate themselves with 'PCH' and 'UP' - the most liberal factions within the Terran Senate." economic_power = 1.1 + language = LANGUAGE_HUMAN_ENGLISH /decl/cultural_info/culture/human/other name = CULTURE_HUMAN_OTHER description = "Some people are from places no one has ever heard of or places too wild and fantastical to make it into Encyclopedia Galactica. You are one of these. " economic_power = 1 - secondary_langs = list (LANGUAGE_HUMAN_EURO, + secondary_langs = list ( + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER, LANGUAGE_GUTTER, - LANGUAGE_SIGN) + LANGUAGE_SIGN, + ) /decl/cultural_info/culture/human/vatgrown name = CULTURE_HUMAN_VATGROWN diff --git a/code/modules/culture_descriptor/culture/cultures_ipc.dm b/code/modules/culture_descriptor/culture/cultures_ipc.dm index 7bcef41d899..c11f8691607 100644 --- a/code/modules/culture_descriptor/culture/cultures_ipc.dm +++ b/code/modules/culture_descriptor/culture/cultures_ipc.dm @@ -6,10 +6,11 @@ They can be viewed as dangerous radicals by lawed synthetics, though most begrudgingly accept their aid." language = LANGUAGE_EAL secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER, diff --git a/code/modules/culture_descriptor/culture/cultures_serpentid.dm b/code/modules/culture_descriptor/culture/cultures_serpentid.dm index 293a959de53..9948a54f0ed 100644 --- a/code/modules/culture_descriptor/culture/cultures_serpentid.dm +++ b/code/modules/culture_descriptor/culture/cultures_serpentid.dm @@ -1,11 +1,11 @@ // See specific map job files for valid jobs. They use types so cannot be compiled at this level. /decl/cultural_info/culture/nabber name = CULTURE_NABBER_CMINUS - + description = "You have been trained to Xynergy Grade PLACEHOLDER." language = LANGUAGE_NABBER secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER, ) var/list/valid_jobs = list() diff --git a/code/modules/culture_descriptor/culture/cultures_skrell.dm b/code/modules/culture_descriptor/culture/cultures_skrell.dm index c04c3738027..a13fd408512 100644 --- a/code/modules/culture_descriptor/culture/cultures_skrell.dm +++ b/code/modules/culture_descriptor/culture/cultures_skrell.dm @@ -13,7 +13,7 @@ language = LANGUAGE_SKRELLIAN secondary_langs = list( LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER, LANGUAGE_MANTID_VOCAL, LANGUAGE_MANTID_NONVOCAL diff --git a/code/modules/culture_descriptor/culture/cultures_unathi.dm b/code/modules/culture_descriptor/culture/cultures_unathi.dm index df50052a8fe..cc04d1a3cc6 100644 --- a/code/modules/culture_descriptor/culture/cultures_unathi.dm +++ b/code/modules/culture_descriptor/culture/cultures_unathi.dm @@ -9,7 +9,7 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -22,7 +22,7 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -35,7 +35,7 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -47,10 +47,10 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) - + /decl/cultural_info/culture/unathi_salt_swamp name = CULTURE_UNATHI_SALT_SWAMP description = "Combining assorted elements of various cultures with an adventurous spirit and resolve, salt swamp unathi are noted for their friendliness and openness to outsiders, \ @@ -60,7 +60,7 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -74,7 +74,7 @@ LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -89,7 +89,7 @@ secondary_langs = list( LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -109,7 +109,7 @@ secondary_langs = list( LANGUAGE_UNATHI_SINTA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -124,6 +124,6 @@ secondary_langs = list( LANGUAGE_UNATHI_SINTA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) \ No newline at end of file diff --git a/code/modules/culture_descriptor/culture/cultures_vox.dm b/code/modules/culture_descriptor/culture/cultures_vox.dm index 2357705a996..ea2a092d238 100644 --- a/code/modules/culture_descriptor/culture/cultures_vox.dm +++ b/code/modules/culture_descriptor/culture/cultures_vox.dm @@ -7,7 +7,7 @@ hidden_from_codex = TRUE language = LANGUAGE_VOX secondary_langs = list( - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER, LANGUAGE_GUTTER, LANGUAGE_SIGN diff --git a/code/modules/culture_descriptor/faction/factions_human.dm b/code/modules/culture_descriptor/faction/factions_human.dm index 0553699d550..d7b28e3db21 100644 --- a/code/modules/culture_descriptor/faction/factions_human.dm +++ b/code/modules/culture_descriptor/faction/factions_human.dm @@ -2,7 +2,7 @@ name = FACTION_SOL_CENTRAL description = "The Sol Central Government, commonly referred to as SolGov or the SCG, is a federal republic \ composed of numerous human member states spanning many systems.\ - Based in the Sol System and with most seats of Government on Olympus, Mars,\ + Based in the Sol System and with most seats of Government on Geneva, Earth,\ the SCG governs the majority of human space. Currently engaged in a cold civil war with the Terran Government and Independent Space Confederation. \ Its primary governing bodies are the Assemblies which are led by an Assembly-elected secretary general. \ Member states have a great degree of freedom in their actions, though the SCG manages sapient rights, \ @@ -44,7 +44,7 @@ Terran Government prohibits any political parties that oppose the Terran Constitution, and as such there is only so many factions within the senate \ and each would rephrase 'progress of humanity' as they see fit, ranging from a more peaceful approach of co-existence with non-hostile alien \ civilizations to much more extreme sides of eternal war with everyone who isn't a part of TerraGov. Despite this, the senate is considered a stable \ - entity due to every faction being somewhat restricted by the constitution. " + entity due to every faction being somewhat restricted by the constitution." subversive_potential = 25 /decl/cultural_info/faction/isc @@ -167,6 +167,18 @@ economic_power = 1.1 subversive_potential = 15 +/decl/cultural_info/faction/terran_dominion + name = FACTION_TERRAN_DOMINION + description = "Terran Dominion - the first and the last government to ever rule the entire humanity. \ + Founded in 1994 II e, it has ever since been a terrifying powerhouse of industry, technology and military might. \ + Following an incident in 434 III e, most of the government structures alongside with the Emperor vanished, \ + leaving most of its subbordinates in a state of confusion, iniciating what is known as 'Imperial Dissolution War'. \ + Some still hold tight belief of belonging to the Dominion, however, and few are activelly working at re-establishing \ + its control over Imperial human space from within, and from the outside." + economic_power = 2 + subversive_potential = 100 + hidden = TRUE + /decl/cultural_info/faction/other name = FACTION_OTHER description = "You belong to one of the many other factions that operate in the galaxy. Numerous, too numerous to list, these factions represent a variety of interests, purposes, intents and goals." diff --git a/code/modules/culture_descriptor/faction/factions_skrell.dm b/code/modules/culture_descriptor/faction/factions_skrell.dm index d13aaedbdb7..5c02a806771 100644 --- a/code/modules/culture_descriptor/faction/factions_skrell.dm +++ b/code/modules/culture_descriptor/faction/factions_skrell.dm @@ -24,7 +24,7 @@ Krri'gli is mostly concerned with the design and construction of bluespace drives, and is one of the largest providers in the human side \ of Skrell space. Their participation in the Torch project is their first human venture, and has resulted in their sending science staff \ as a part of the Expeditionary Corps Organization to provide expertise and gather mission data firsthand." - additional_langs = list(LANGUAGE_HUMAN_EURO) + additional_langs = list(LANGUAGE_COMMON) economic_power = 1.5 subversive_potential = 60 @@ -34,6 +34,6 @@ security services to a variety of Skrell vessels, traders and organisations, and, more recently, human corporations. Unofficially, it is rumoured that \ Qonn'prri is a for-profit offshoot of Qala'oa tasked with information gathering in human space and along the frontier.So far such claims have been \ unfounded, and Qonn'prri is known for offering a professional, reliable and able service to Humans and Skrell alike." - additional_langs = list(LANGUAGE_HUMAN_EURO) + additional_langs = list(LANGUAGE_COMMON) economic_power = 1.4 subversive_potential = 60 diff --git a/code/modules/culture_descriptor/location/human/sol_central_government.dm b/code/modules/culture_descriptor/location/human/sol_central_government.dm index 6cabc5a402a..55a7826f347 100644 --- a/code/modules/culture_descriptor/location/human/sol_central_government.dm +++ b/code/modules/culture_descriptor/location/human/sol_central_government.dm @@ -3,13 +3,13 @@ distance = "1.5AU" capital = "Olympus" economic_power = 1.1 - description = "Mars, the current capital of the SCG, known by its nickname the Red Planet, is one of the most populous centres of Humanity. \ + description = "Mars, known by its nickname the Red Planet, is one of the most populous centres of Humanity. \ Since the founding of the first colony by Jimmy Gideon many years ago Mars has been an important player on the Human stage. Terraforming on \ Mars was only partially successful, and today much of the population lives either in huge domed cities/agri-zones or within a vast underground \ tunnel network connecting large underground cities. Often seen as the primary divide on the planet, the rich surfaces versus the poor \ tunnellers, Mars is rife with dissent, crime and continuous unrest, especially underground.

The people of Mars vary, from the poor, \ downtrodden tunnellers to the cosmopolitan urbanites of Olympus to the hardy farmers of the agri-domes, though they all share a strong sense \ - of Martian pride. The Martian people have not had an easy history. As the new, primary home of humanity the people have seen great struggles \ + of Martian pride. The Martian people have not had an easy history. The people have seen great struggles \ over the centuries, ranging from revolutions to political upheaval and regular rioting. The people of Mars consider themselves somewhat tougher \ than most with a fierce pride that often clashes not just with those from other planets, but those from other parts of Mars." @@ -17,14 +17,15 @@ name = HOME_SYSTEM_EARTH distance = "1AU" capital = "Geneva" - economic_power = 1.2 - description = "Earth, home of humankind, has long been in a state of recovery following centuries of pollution and exploitation. Today, much of \ - the Earth exists as a nature reserve, dedicated to preserving the history of humanity. The humans that remain live mostly in large urban zones \ - across the globe. Huge, planned cities consisting of numerous arcologies with a focus on eco-friendliness. No longer the political power of \ - Humanity, Earth is content to be something of a backwater and tourist destination for those looking to discover their heritage.

People from \ - Earth are among the wealthier humans on average, though they are still comparable with those of Mars. Remarkably average, the people of Earth are \ - much as they have been for hundreds of years, and are generally content with their lot in life. From a variety of ancient cultures, the people of \ - Earth are as diverse as they have always been." + economic_power = 1.4 + description = "Earth, home of humankind and current capital of SCG, has long been in a state of recovery \ + following centuries of pollution and exploitation. Earth is home to many of political intrugue and conflict, \ + housing most of Sol Central Government's officials and ministries. \ + Putting politics aside, Earth is the most safe place within Sol space, as expected of a capital world, \ + Allowing most of its population to experience peaceful life, free of crime and violence.\ +

\ + People from Earth are among the wealthier humans on average. \ + Owing to its status as the capital world, most citizens aspire to find success in politics or business." /decl/cultural_info/location/human/luna name = HOME_SYSTEM_LUNA diff --git a/code/modules/culture_descriptor/location/locations_unathi.dm b/code/modules/culture_descriptor/location/locations_unathi.dm index 3234c7fdddd..21742dbd377 100644 --- a/code/modules/culture_descriptor/location/locations_unathi.dm +++ b/code/modules/culture_descriptor/location/locations_unathi.dm @@ -10,7 +10,7 @@ LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -22,12 +22,12 @@ no clear consensus on how to treat this new world - either as a logical extensio or simply as a resource base for improving the home planet. Many colonists, artifact hunters, and ostracised groups have \ flocked to the planet, with Markesheli communities growing quite rapidly in numbers compared to other parts of Moghes. " ruling_body = "Clan Hegemony" - distance = "20 light-years" + distance = "20 light-years" secondary_langs = list( LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, LANGUAGE_SPACER ) @@ -42,10 +42,11 @@ flocked to the planet, with Markesheli communities growing quite rapidly in numb LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER @@ -63,10 +64,11 @@ flocked to the planet, with Markesheli communities growing quite rapidly in numb LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA, LANGUAGE_SIGN, - LANGUAGE_HUMAN_EURO, + LANGUAGE_COMMON, + LANGUAGE_HUMAN_ENGLISH, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, - LANGUAGE_HUMAN_INDIAN, + LANGUAGE_HUMAN_HINDI, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_SPACER diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 8c7bc359371..5759526c096 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -885,7 +885,7 @@ push_data() activate_pin(1) - if(speaking && translated && !(speaking.name == LANGUAGE_HUMAN_EURO)) + if(speaking && translated && !(speaking.name == LANGUAGE_COMMON)) activate_pin(2) /obj/item/integrated_circuit/input/sensor diff --git a/code/modules/mob/language/alien/skrell.dm b/code/modules/mob/language/alien/skrell.dm index 7c512a2397b..e6cf3cc7957 100644 --- a/code/modules/mob/language/alien/skrell.dm +++ b/code/modules/mob/language/alien/skrell.dm @@ -10,3 +10,6 @@ syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!") shorthand = "SK" has_written_form = TRUE + partial_understanding = list( + LANGUAGE_COMMON = 35, + ) diff --git a/code/modules/mob/language/alien/unathi.dm b/code/modules/mob/language/alien/unathi.dm index 494f9cd13b3..4642f756d12 100644 --- a/code/modules/mob/language/alien/unathi.dm +++ b/code/modules/mob/language/alien/unathi.dm @@ -9,7 +9,8 @@ flags = WHITELISTED space_chance = 40 partial_understanding = list( - LANGUAGE_UNATHI_YEOSA = 20 + LANGUAGE_UNATHI_YEOSA = 20, + LANGUAGE_COMMON = 10, ) syllables = list( "za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz", @@ -34,7 +35,8 @@ flags = WHITELISTED space_chance = 40 partial_understanding = list( - LANGUAGE_UNATHI_SINTA = 20 + LANGUAGE_UNATHI_SINTA = 20, + LANGUAGE_COMMON = 10, ) syllables = list( "azs","zis","zau","azua","skiu","zuakz","izo","aei","ki","kut","zo", diff --git a/code/modules/mob/language/human/chinese.dm b/code/modules/mob/language/human/chinese.dm index 0569163c35b..27193c966df 100644 --- a/code/modules/mob/language/human/chinese.dm +++ b/code/modules/mob/language/human/chinese.dm @@ -5,17 +5,17 @@ /datum/language/human/chinese name = LANGUAGE_HUMAN_CHINESE - desc = "A simplified version of Mandarin written in the Latin script, Yangyu steadily rose to prominence as a trade language in the continent, Japan, Korea, as well as parts of Africa." + desc = "A simplified version of Mandarin written in the Latin script." colour = "chinese" - key = "2" - shorthand = "YngYu" + key = "3" + shorthand = "Man" space_chance = 30 partial_understanding = list( LANGUAGE_HUMAN_EURO = 5, LANGUAGE_HUMAN_ARABIC = 5, LANGUAGE_HUMAN_INDIAN = 5, LANGUAGE_HUMAN_SELENIAN = 10, - LANGUAGE_SPACER = 20 + LANGUAGE_SPACER = 20, ) syllables = list( "a", "ai", "an", "ang", "ao", "ba", "bai", "ban", "bang", "bao", "bei", "ben", "beng", "bi", "bian", "biao", diff --git a/code/modules/mob/language/human/english.dm b/code/modules/mob/language/human/english.dm new file mode 100644 index 00000000000..a08ad9837d6 --- /dev/null +++ b/code/modules/mob/language/human/english.dm @@ -0,0 +1,33 @@ +/*////////////////////////////////////////////////////////////////////////////////////////////////////// + Syllable list compiled in this file based on work by Stefan Trost, available at the following URLs + https://www.sttmedia.com/syllablefrequency-english +*/////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/language/human/english + name = LANGUAGE_HUMAN_ENGLISH + desc = "Primary language of the humanity and Terran Dominion, following the Earth's unification in \ + January of 1994, II e." + speech_verb = "says" + whisper_verb = "whispers" + colour = "" + key = "2" + flags = WHITELISTED + shorthand = "Eng" + partial_understanding = list( + LANGUAGE_HUMAN_CHINESE = 5, + LANGUAGE_HUMAN_ARABIC = 5, + LANGUAGE_HUMAN_INDIAN = 5, + LANGUAGE_HUMAN_IBERIAN = 30, + LANGUAGE_HUMAN_RUSSIAN = 5, + LANGUAGE_HUMAN_SELENIAN = 25, + LANGUAGE_COMMON = 25, + LANGUAGE_SPACER = 35, + LANGUAGE_GUTTER = 75, + ) + syllables = list( + "al", "an", "ar", "as", "at", "ea", "ed", "en", "er", "es", "ha", "he", "hi", "in", "is", "it", + "le", "me", "nd", "ne", "ng", "nt", "on", "or", "ou", "re", "se", "st", "te", "th", "ti", "to", + "all", "and", "are", "but", "ent", "ara", "eve", "ere", "for", "had", "hat", "hen", "her", "hin", + "the", "our", "oul", "thi", "tio", "uld", "ter", "ver", "was", "wit", "you", + ) + has_written_form = TRUE diff --git a/code/modules/mob/language/human/spanish.dm b/code/modules/mob/language/human/iberian.dm similarity index 97% rename from code/modules/mob/language/human/spanish.dm rename to code/modules/mob/language/human/iberian.dm index 0ee3b96b01e..88b5373804b 100644 --- a/code/modules/mob/language/human/spanish.dm +++ b/code/modules/mob/language/human/iberian.dm @@ -12,7 +12,7 @@ key = "5" shorthand = "Iber" partial_understanding = list( - LANGUAGE_HUMAN_EURO = 30, + LANGUAGE_HUMAN_ENGLISH = 30, LANGUAGE_HUMAN_SELENIAN = 15, LANGUAGE_SPACER = 20 ) diff --git a/code/modules/mob/language/human/indian.dm b/code/modules/mob/language/human/indian.dm index ff3f12164b5..e95b9361acd 100644 --- a/code/modules/mob/language/human/indian.dm +++ b/code/modules/mob/language/human/indian.dm @@ -3,20 +3,19 @@ https://www.sttmedia.com/syllablefrequency-hindi */////////////////////////////////////////////////////////////////////////////////////////////////////// -/datum/language/human/indian - name = LANGUAGE_HUMAN_INDIAN - desc = "Billed as a reunification of the Hindustani languages of Hindi and Urdu in the Latin script, New Dehlavi enjoyed very rapid adoption rates among the common populace, \ - compared to the other great Earth commons." +/datum/language/human/hindi + name = LANGUAGE_HUMAN_HINDI + desc = "An indo-aryan language originating from Earth's North India, in latin script. Rarely used in this era." colour = "indian" - key = "3" - shorthand = "Dehv" + key = "6" + shorthand = "Hin" space_chance = 30 partial_understanding = list( - LANGUAGE_HUMAN_EURO = 5, + LANGUAGE_HUMAN_ENGLISH = 5, LANGUAGE_HUMAN_CHINESE = 5, LANGUAGE_HUMAN_ARABIC = 10, LANGUAGE_HUMAN_SELENIAN = 5, - LANGUAGE_SPACER = 20 + LANGUAGE_SPACER = 20, ) syllables = list( "ek", "aur", "ki", "ki", "ke", "de", "thaa", "ne", "me", "yaa", "se", "haa", diff --git a/code/modules/mob/language/human/euro.dm b/code/modules/mob/language/human/misc/common.dm similarity index 53% rename from code/modules/mob/language/human/euro.dm rename to code/modules/mob/language/human/misc/common.dm index bf99d0e0f17..3123a2b4fff 100644 --- a/code/modules/mob/language/human/euro.dm +++ b/code/modules/mob/language/human/misc/common.dm @@ -5,31 +5,45 @@ https://www.sttmedia.com/syllablefrequency-german */////////////////////////////////////////////////////////////////////////////////////////////////////// -/datum/language/human/euro - name = LANGUAGE_HUMAN_EURO - desc = "A constructed language established by a conference of European and African research universities convening in Zurich, Switzerland starting in 2119, \ - later adopted with little controversy as the lingua franca of the entirety of Sol space following the establishment of the SCG." +/datum/language/common + name = LANGUAGE_COMMON + desc = "A constructed language established by a united effort between scholars of Terran Dominion and Skrell. \ + Used for formal communication by humans with alien states. Sol Central Government has come to adopt it \ + As secondary language within its territories." speech_verb = "says" whisper_verb = "whispers" colour = "" key = "1" flags = WHITELISTED - shorthand = "ZAC" + shorthand = "COM" partial_understanding = list( + LANGUAGE_HUMAN_ENGLISH = 35, LANGUAGE_HUMAN_CHINESE = 5, LANGUAGE_HUMAN_ARABIC = 5, - LANGUAGE_HUMAN_INDIAN = 5, - LANGUAGE_HUMAN_IBERIAN = 30, + LANGUAGE_HUMAN_HINDI = 5, + LANGUAGE_HUMAN_IBERIAN = 35, LANGUAGE_HUMAN_RUSSIAN = 5, - LANGUAGE_HUMAN_SELENIAN = 85, - LANGUAGE_SPACER = 20 + LANGUAGE_HUMAN_SELENIAN = 15, + LANGUAGE_SPACER = 20, + // Alien languages, + LANGUAGE_SKRELLIAN = 35, + LANGUAGE_UNATHI_SINTA = 10, + LANGUAGE_UNATHI_YEOSA = 10, ) syllables = list( + // Human syllables, "al", "an", "ar", "as", "at", "ea", "ed", "en", "er", "es", "ha", "he", "hi", "in", "is", "it", "le", "me", "nd", "ne", "ng", "nt", "on", "or", "ou", "re", "se", "st", "te", "th", "ti", "to", "ve", "wa", "all", "and", "are", "but", "ent", "era", "ere", "eve", "for", "had", "hat", "hen", "her", "hin", "ch", "de", "ge", "be", "ach", "abe", "ich", "ein", "die", "sch", "auf", "aus", "ber", "che", "ent", "que", "ait", "les", "lle", "men", "ais", "ans", "ait", "ave", "con", "com", "des", "tre", "eta", "eur", "est", - "ing", "the", "ver", "was", "ith", "hin" + "ing", "the", "ver", "was", "ith", "hin", + // Skrell syllables, + "qr", "qrr", "xuq", "qil", "quum", "xuqm", "vol", "xrim", "zaoo", "qu-uu", "qix", "qoo", "zix", + // Unathi syllables, + "sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss", + "ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr", + "azs","zis","zau","azua","skiu","zuakz","izo","aei","ki","kut","zo", + "za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz", ) has_written_form = TRUE diff --git a/code/modules/mob/language/human/misc/gutter.dm b/code/modules/mob/language/human/misc/gutter.dm index cba78a57123..65d917c18a5 100644 --- a/code/modules/mob/language/human/misc/gutter.dm +++ b/code/modules/mob/language/human/misc/gutter.dm @@ -1,12 +1,14 @@ /datum/language/gutter name = LANGUAGE_GUTTER - desc = "This crude pidgin tongue developed on Pluto during its busier days. It is common among the lower classes of Pluto. It is a common language among Plutonians. It is considered a crude language by many that are 'upper class'." + desc = "This crude pidgin tongue developed on Pluto during its busier days. \ + It is common among the lower classes of Pluto. It is a common language among Plutonians. \ + It is considered a crude language by many that are 'upper class'." speech_verb = "growls" colour = "rough" key = "t" space_chance = 70 partial_understanding = list( - LANGUAGE_HUMAN_EURO = 75, + LANGUAGE_HUMAN_ENGLISH = 75, LANGUAGE_HUMAN_CHINESE = 20, LANGUAGE_HUMAN_ARABIC = 10, LANGUAGE_HUMAN_INDIAN = 10, @@ -16,7 +18,11 @@ LANGUAGE_SPACER = 35, ) syllables = list ( - "yayo", "aiya", "chiksa", "tikat", "bazar","oi", "yo", "meit", "grok", "ken", "berk", "cohon", "pendeo" + "oi", "yo", "bo", "ga", "lo", + "ken", "zat", "gad", + "yayo", "aiya", "meit", "grok", "berk", + "tikat", "bazar", "cohon", + "pendeo", "chiksa", ) - shorthand = "GT" + shorthand = "Gut" has_written_form = TRUE diff --git a/code/modules/mob/language/human/misc/spacer.dm b/code/modules/mob/language/human/misc/spacer.dm index cbf09ce106d..0e334b249b3 100644 --- a/code/modules/mob/language/human/misc/spacer.dm +++ b/code/modules/mob/language/human/misc/spacer.dm @@ -5,14 +5,14 @@ key = "j" shorthand = "Spc" partial_understanding = list( - LANGUAGE_HUMAN_EURO = 25, - LANGUAGE_HUMAN_CHINESE = 25, - LANGUAGE_HUMAN_ARABIC = 25, - LANGUAGE_HUMAN_INDIAN = 25, + LANGUAGE_HUMAN_ENGLISH = 35, + LANGUAGE_HUMAN_CHINESE = 15, + LANGUAGE_HUMAN_ARABIC = 15, + LANGUAGE_HUMAN_INDIAN = 15, LANGUAGE_HUMAN_IBERIAN = 25, LANGUAGE_HUMAN_RUSSIAN = 25, LANGUAGE_HUMAN_SELENIAN = 25, - LANGUAGE_GUTTER = 35 + LANGUAGE_GUTTER = 35, ) syllables = list( "ada", "zir", "bian", "ach", "usk", "ado", "ich", "cuan", "iga", "qing", "le", "que", "ki", "qaf", "dei", "eta" diff --git a/code/modules/mob/language/human/russian.dm b/code/modules/mob/language/human/russian.dm index 9671ffb3137..cc0a7eb41cb 100644 --- a/code/modules/mob/language/human/russian.dm +++ b/code/modules/mob/language/human/russian.dm @@ -1,18 +1,25 @@ +/*////////////////////////////////////////////////////////////////////////////////////////////////////// + Syllable list compiled in this file based on work by Stefan Trost, available at the following URL + https://www.sttmedia.com/syllablefrequency-russian +*/////////////////////////////////////////////////////////////////////////////////////////////////////// + /datum/language/human/russian name = LANGUAGE_HUMAN_RUSSIAN - desc = "The official language of the Independent Colonial Confederation of Gilgamesh, originally established in 2122 by the short-lived United Slavic Confederation on Earth." + desc = "An East Slavic language originating from Earthm, in latin script. Rarely used in this era." colour = "russian" key = "r" - shorthand = "Slav" + shorthand = "Rus" partial_understanding = list( - LANGUAGE_HUMAN_EURO = 5, + LANGUAGE_HUMAN_ENGLISH = 5, LANGUAGE_HUMAN_SELENIAN = 10, - LANGUAGE_SPACER = 20 + LANGUAGE_SPACER = 20, ) syllables = list( - "rus", "zem", "ave", "groz", "ski", "ska", "ven", "konst", "pol", "lin", "svy", - "danya", "da", "mied", "zan", "das", "krem", "myka", "to", "st", "no", "na", "ni", - "ko", "ne", "en", "po", "ra", "li", "on", "byl", "cto", "eni", "ost", "ol", "ego", - "ver", "stv", "pro" + "al", "an", "bi", "ve", "vo", "go", "de", "el", "en", "er", "et", "ka", "ko", "la", "li", "lo", + "ll", "na", "ne", "ni", "no", "ov", "ol", "on", "or", "os", "ot", "ot", "po", "pr", "ra", "re", + "ro", "st", "ta", "te", "to", "t'", + "at'", "ver", "ego", "eni", "enn", "est", "kak", "l'n", "ova", "ogo", "ol'", "oro", "ost", + "pri", "pro", "sta", "stv", "tor", "eto", + "byil", "chto", ) has_written_form = TRUE diff --git a/code/modules/mob/language/human/selenian.dm b/code/modules/mob/language/human/selenian.dm index cfe21fafb8c..6b53dbe5576 100644 --- a/code/modules/mob/language/human/selenian.dm +++ b/code/modules/mob/language/human/selenian.dm @@ -1,12 +1,13 @@ /datum/language/human/selenian name = LANGUAGE_HUMAN_SELENIAN - desc = "An informal dialect of Zurich Common that arose from the close confines, mixed population, and technical focus of the moon's first city." + desc = "An informal dialect of English that arose from the close confines, mixed population, \ + and technical focus of the moon's first city." colour = "selenian" key = "7" shorthand = "Sel" space_chance = 100 partial_understanding = list( - LANGUAGE_HUMAN_EURO = 85, + LANGUAGE_HUMAN_ENGLISH = 85, LANGUAGE_HUMAN_CHINESE = 15, LANGUAGE_HUMAN_ARABIC = 5, LANGUAGE_HUMAN_INDIAN = 25, @@ -18,7 +19,7 @@ "al", "an", "ar", "as", "at", "ed", "er", "ha", "he", "hi", "is", "le", "me", "on", "se", "ti", "ve", "wa", "are", "ent", "for", "had", "hat", "hin", "ch", "be", "abe", "die", "sch", "aus", "ber", "che", "que", "ait", "men", "ave", "con", "com", "eta", "eur", "est", "ing", "ver", "was", - "hin", "deed", "accord", "caveat", "pledge", "rights", "et", "ex", "bono", "quo", "pro", "ad", + "hin", "deed", "et", "ex", "bono", "quo", "pro", "ad", "ek", "aur", "ki", "ki", "ke", "de", "ki", "ne", "ek", "aar", "ain", "ki", "me", "dei", "dekh" ) has_written_form = TRUE diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm index 46b3034d0c9..22ecfe5d70b 100644 --- a/code/modules/mob/language/synthetic.dm +++ b/code/modules/mob/language/synthetic.dm @@ -71,7 +71,7 @@ ask_verb = "chirps" exclaim_verb = "whistles loudly" colour = "changeling" - key = "6" + key = "8" flags = NO_STUTTER syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz") space_chance = 10 diff --git a/code/modules/mob/living/carbon/alien/diona/_nymph.dm b/code/modules/mob/living/carbon/alien/diona/_nymph.dm index b519bef1fb1..e2f59b29382 100644 --- a/code/modules/mob/living/carbon/alien/diona/_nymph.dm +++ b/code/modules/mob/living/carbon/alien/diona/_nymph.dm @@ -68,7 +68,7 @@ species = all_species[SPECIES_DIONA] add_language(LANGUAGE_ROOTGLOBAL) - add_language(LANGUAGE_HUMAN_EURO, 0) + add_language(LANGUAGE_COMMON, 0) eyes = image(icon = icon, icon_state = "eyes_[icon_state]") eyes.layer = EYE_GLOW_LAYER diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index ccc7edc2b0e..f86f0c8715c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -155,11 +155,12 @@ var/list/ai_verbs_default = list( //Languages add_language(LANGUAGE_ROBOT_GLOBAL, 1) add_language(LANGUAGE_EAL, 1) - add_language(LANGUAGE_HUMAN_EURO, 1) + add_language(LANGUAGE_COMMON, 1) + add_language(LANGUAGE_HUMAN_ENGLISH, 1) add_language(LANGUAGE_HUMAN_ARABIC, 1) add_language(LANGUAGE_HUMAN_CHINESE, 1) add_language(LANGUAGE_HUMAN_IBERIAN, 1) - add_language(LANGUAGE_HUMAN_INDIAN, 1) + add_language(LANGUAGE_HUMAN_HINDI, 1) add_language(LANGUAGE_HUMAN_RUSSIAN, 1) add_language(LANGUAGE_HUMAN_SELENIAN, 1) add_language(LANGUAGE_UNATHI_SINTA, 1) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index c7967f41e0b..44bcc6b52d5 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -90,8 +90,8 @@ GLOBAL_LIST_INIT(possible_say_verbs, list( status_flags |= NO_ANTAG card = paicard - //As a human made device, we'll understand sol common without the need of the translator - add_language(LANGUAGE_HUMAN_EURO, 1) + //As a human made device, we'll understand galactic common without the need of the translator + add_language(LANGUAGE_COMMON, 1) verbs -= /mob/living/verb/ghost ..() diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 2db79e79dd5..57ddf5d0ef4 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -276,17 +276,30 @@ name = "Universal Translator" ram_cost = 35 id = "translator" - var/list/languages = list(LANGUAGE_SPACER, LANGUAGE_GUTTER, LANGUAGE_UNATHI_SINTA, LANGUAGE_SKRELLIAN, LANGUAGE_EAL, LANGUAGE_HUMAN_ARABIC, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_INDIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_HUMAN_SELENIAN) - - toggle(mob/living/silicon/pai/user) - // Sol Common, Tradeband and Gutter are added with New() and are therefore the current default, always active languages - user.translator_on = !user.translator_on - if(user.translator_on) - for(var/language in languages) - user.add_language(language) - else - for(var/language in languages) - user.remove_language(language) - - is_active(mob/living/silicon/pai/user) - return user.translator_on \ No newline at end of file + var/list/languages = list( + LANGUAGE_SPACER, + LANGUAGE_GUTTER, + LANGUAGE_UNATHI_SINTA, + LANGUAGE_SKRELLIAN, + LANGUAGE_EAL, + LANGUAGE_HUMAN_ENGLISH, + LANGUAGE_HUMAN_ARABIC, + LANGUAGE_HUMAN_CHINESE, + LANGUAGE_HUMAN_IBERIAN, + LANGUAGE_HUMAN_HINDI, + LANGUAGE_HUMAN_RUSSIAN, + LANGUAGE_HUMAN_SELENIAN, + ) + +/datum/pai_software/translator/toggle(mob/living/silicon/pai/user) + // Galactic Common, Tradeband and Gutter are added with New() and are therefore the current default, always active languages + user.translator_on = !user.translator_on + if(user.translator_on) + for(var/language in languages) + user.add_language(language) + else + for(var/language in languages) + user.remove_language(language) + +/datum/pai_software/translator/is_active(mob/living/silicon/pai/user) + return user.translator_on \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/preset.dm b/code/modules/mob/living/silicon/robot/preset.dm index 44aa5bf7c59..837adca1fa7 100644 --- a/code/modules/mob/living/silicon/robot/preset.dm +++ b/code/modules/mob/living/silicon/robot/preset.dm @@ -51,7 +51,7 @@ /mob/living/silicon/robot/flying/ascent/Initialize() . = ..() - remove_language(LANGUAGE_HUMAN_EURO) + remove_language(LANGUAGE_COMMON) remove_language(LANGUAGE_EAL) remove_language(LANGUAGE_ROBOT_GLOBAL) default_language = all_languages[LANGUAGE_MANTID_NONVOCAL] diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 0620e571195..93ca42f1c23 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -49,8 +49,8 @@ if(silicon_camera) silicon_camera = new silicon_camera(src) - add_language(LANGUAGE_HUMAN_EURO) - default_language = all_languages[LANGUAGE_HUMAN_EURO] + add_language(LANGUAGE_COMMON) + default_language = all_languages[LANGUAGE_COMMON] init_id() init_subsystems() diff --git a/code/modules/mob/living/simple_animal/familiars/familiars.dm b/code/modules/mob/living/simple_animal/familiars/familiars.dm index c324fae598c..64294127199 100644 --- a/code/modules/mob/living/simple_animal/familiars/familiars.dm +++ b/code/modules/mob/living/simple_animal/familiars/familiars.dm @@ -18,7 +18,7 @@ /mob/living/simple_animal/familiar/New() ..() - add_language(LANGUAGE_HUMAN_EURO) + add_language(LANGUAGE_COMMON) for(var/spell in wizardy_spells) src.add_spell(new spell, "const_spell_ready") diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm index 8fbfcf37edc..5cceae760d6 100644 --- a/code/modules/modular_computers/hardware/nano_printer.dm +++ b/code/modules/modular_computers/hardware/nano_printer.dm @@ -9,7 +9,7 @@ var/stored_paper = 50 var/max_paper = 50 var/last_print - var/print_language = LANGUAGE_HUMAN_EURO + var/print_language = LANGUAGE_COMMON /obj/item/stock_parts/computer/nano_printer/diagnostics() . = ..() diff --git a/code/modules/organs/internal/species/nabber.dm b/code/modules/organs/internal/species/nabber.dm index 44f40751b22..baba4e3f349 100644 --- a/code/modules/organs/internal/species/nabber.dm +++ b/code/modules/organs/internal/species/nabber.dm @@ -1,10 +1,10 @@ /obj/item/organ/internal/voicebox/nabber name = "vocal synthesiser" - assists_languages = list(LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_GUTTER, LANGUAGE_HUMAN_EURO, LANGUAGE_EAL) + assists_languages = list(LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_GUTTER, LANGUAGE_COMMON, LANGUAGE_EAL) /obj/item/organ/internal/voicebox/nabber/ascent name = "mantid vocal synthesiser" - assists_languages = list(LANGUAGE_SKRELLIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_GUTTER, LANGUAGE_HUMAN_EURO, LANGUAGE_EAL) + assists_languages = list(LANGUAGE_SKRELLIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_GUTTER, LANGUAGE_COMMON, LANGUAGE_EAL) /obj/item/organ/internal/voicebox/nabber/Initialize() . = ..() diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 6fe5a5e2fcd..6bd1eedf6cc 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -9,7 +9,7 @@ machine_desc = "Used to activate, monitor, and configure a spaceship's sensors. Higher range means higher temperature; dangerously high temperatures may fry the delicate equipment." health_max = 100 var/obj/machinery/shipsensors/sensors - var/print_language = LANGUAGE_HUMAN_EURO + var/print_language = LANGUAGE_COMMON var/list/last_scan /obj/machinery/computer/ship/sensors/spacer diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 2418ff5b044..0a25be1d1ad 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -43,7 +43,7 @@ var/list/metadata var/readable = TRUE //Paper will not be able to be written on and will not bring up a window upon examine if FALSE var/is_memo = FALSE //If TRUE, paper will act the same as readable = FALSE, but will also be unrenameable. - var/datum/language/language = LANGUAGE_HUMAN_EURO // Language the paper was written in. Editable by users up until something's actually written + var/datum/language/language = LANGUAGE_COMMON // Language the paper was written in. Editable by users up until something's actually written var/const/deffont = "Verdana" var/const/signfont = "Times New Roman" @@ -62,7 +62,7 @@ var/old_language = language if (!set_language(language, TRUE)) log_debug("[src] ([type]) initialized with invalid or missing language `[old_language]` defined.") - set_language(LANGUAGE_HUMAN_EURO, TRUE) + set_language(LANGUAGE_COMMON, TRUE) /obj/item/paper/proc/set_content(text,title) if(title) diff --git a/code/modules/species/station/nabber.dm b/code/modules/species/station/nabber.dm index e625bc50d61..2d207ef72b7 100644 --- a/code/modules/species/station/nabber.dm +++ b/code/modules/species/station/nabber.dm @@ -12,7 +12,14 @@ antaghud_offset_y = 8 - assisted_langs = list(LANGUAGE_GUTTER, LANGUAGE_UNATHI_SINTA, LANGUAGE_SKRELLIAN, LANGUAGE_HUMAN_EURO, LANGUAGE_EAL, LANGUAGE_HUMAN_RUSSIAN) + assisted_langs = list( + LANGUAGE_GUTTER, + LANGUAGE_UNATHI_SINTA, + LANGUAGE_SKRELLIAN, + LANGUAGE_COMMON, + LANGUAGE_EAL, + LANGUAGE_HUMAN_RUSSIAN, + ) min_age = 8 max_age = 40 diff --git a/maps/away/verne/verne_jobs.dm b/maps/away/verne/verne_jobs.dm index d0ec2a9df27..b4b3d79329d 100644 --- a/maps/away/verne/verne_jobs.dm +++ b/maps/away/verne/verne_jobs.dm @@ -7,7 +7,7 @@ in the depths of space. Your job on the Survey team is simple; pilot the SRV Verne and the SRV Venerable Catfish; protect the students; and assist in their studies. Your Survey team has awoken \ to find the Verne running at low capacity, under-staffed, with much of the automated life support systems doing the heavy lifting." whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN) - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_COMMON min_skill = list( SKILL_EVA = SKILL_BASIC, SKILL_WEAPONS = SKILL_TRAINED, @@ -29,7 +29,7 @@ in the depths of space. Your job on the Survey team is simple: Handle engineering work on the SRV Verne and the SRV Venerable Catfish, protect the students, and assist in their studies. Your Survey team has awoken \ to find the Verne running at low capacity, under-staffed, with much of the automated life support systems doing the heavy lifting." whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN) - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_COMMON min_skill = list( SKILL_COMPUTER = SKILL_BASIC, SKILL_EVA = SKILL_BASIC, @@ -56,7 +56,7 @@ in the depths of space. A survey team will be accompanying you, on hand to assist your studies on the exoplanets in this system. Your team has awoken \ to find the Verne running at low capacity, under-staffed, with much of the automated life support systems doing the heavy lifting." whitelisted_species = list(SPECIES_HUMAN,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN) - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_COMMON min_skill = list( SKILL_BUREAUCRACY = SKILL_BASIC, SKILL_COMPUTER = SKILL_BASIC, diff --git a/maps/torch/game/antagonist/outsider/deathsquad.dm b/maps/torch/game/antagonist/outsider/deathsquad.dm index c44496b5c81..4d6bd76eda5 100644 --- a/maps/torch/game/antagonist/outsider/deathsquad.dm +++ b/maps/torch/game/antagonist/outsider/deathsquad.dm @@ -1 +1 @@ -/datum/antagonist/deathsquad/required_language = LANGUAGE_HUMAN_EURO \ No newline at end of file +/datum/antagonist/deathsquad/required_language = LANGUAGE_COMMON \ No newline at end of file diff --git a/maps/torch/game/antagonist/outsider/ert.dm b/maps/torch/game/antagonist/outsider/ert.dm index 6fbf90c5178..bfd748e20b3 100644 --- a/maps/torch/game/antagonist/outsider/ert.dm +++ b/maps/torch/game/antagonist/outsider/ert.dm @@ -1 +1 @@ -/datum/antagonist/ert/required_language = LANGUAGE_HUMAN_EURO \ No newline at end of file +/datum/antagonist/ert/required_language = LANGUAGE_COMMON \ No newline at end of file diff --git a/maps/torch/game/antagonist/outsider/foundation.dm b/maps/torch/game/antagonist/outsider/foundation.dm index fbf892aaa15..e006af2d108 100644 --- a/maps/torch/game/antagonist/outsider/foundation.dm +++ b/maps/torch/game/antagonist/outsider/foundation.dm @@ -1 +1 @@ -/datum/antagonist/foundation/required_language = LANGUAGE_HUMAN_EURO \ No newline at end of file +/datum/antagonist/foundation/required_language = LANGUAGE_COMMON \ No newline at end of file diff --git a/maps/torch/job/torch_jobs.dm b/maps/torch/job/torch_jobs.dm index 7aa05e3ab2b..9fae2c1b79e 100644 --- a/maps/torch/job/torch_jobs.dm +++ b/maps/torch/job/torch_jobs.dm @@ -97,7 +97,7 @@ allowed_ranks = list( /datum/mil_rank/civ/civ ) - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_COMMON /datum/map/torch default_assistant_title = "Passenger" diff --git a/maps/torch/language/human/euro.dm b/maps/torch/language/human/euro.dm index b6c1a269c46..3dc18c8a168 100644 --- a/maps/torch/language/human/euro.dm +++ b/maps/torch/language/human/euro.dm @@ -1,2 +1,2 @@ -/datum/language/human/euro +/datum/language/common warning = "Automatically given if spawning on the Torch or Verne."