diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index f848c5e4c91..1331e110798 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -67,6 +67,7 @@ #define FLOATING_MESSAGES 0x10 #define HOTKEY_DEFAULT 0x20 #define FULLSCREEN_MODE 0x40 +#define ACCENT_TAG_TEXT 0x80 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|CHAT_GHOSTLOOC) diff --git a/code/modules/background/accent/accent.dm b/code/modules/background/accent/accent.dm index ae30f2b692c..f76a806aa2c 100644 --- a/code/modules/background/accent/accent.dm +++ b/code/modules/background/accent/accent.dm @@ -1,4 +1,5 @@ /datum/accent var/name var/description = "Unga Dunga." - var/tag_icon //those icons should go in accent_tags.dmi \ No newline at end of file + var/tag_icon //those icons should go in accent_tags.dmi + var/text_tag //Each accent should have a text tag. These are used in cases such as 4K monitors where tag icons cannot be displayed properly. \ No newline at end of file diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm index edd8387f0ef..119a75ef96e 100644 --- a/code/modules/background/accent/diona.dm +++ b/code/modules/background/accent/diona.dm @@ -2,8 +2,10 @@ name = ACCENT_ROOTSONG description = "An accent native to the Dionae born within atmospheric conditions, more specifically that of planets. More commonly found in Dionae that were exposed to non-ionising or trace amounts of radiation during their formative years. To non-Dionae, this accent is akin to that of singing - a high pitched voice that has various rises and falls between Soprano and Mezzo-soprano." tag_icon = "dionae_rootsong" + text_tag = "RTS" /datum/accent/voidsong name = ACCENT_VOIDSONG description = "An innate accent spoken by Dionae that were born within the vacuum of space, or near extreme amounts of ionising radiation. The accent is said to be incredibly deep, and some have said that the Dionae that have the accent sound extremely similar to Baritones - a type of voice whose vocals differ between basslike and tenorlike." - tag_icon = "dionae_voidsong" \ No newline at end of file + tag_icon = "dionae_voidsong" + text_tag = "VDS" \ No newline at end of file diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index e94d9e624d7..fbbd4f20e0e 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -2,6 +2,7 @@ name = ACCENT_CETI description = "Often described as the \"true\" way of speaking Tau Ceti Basic, the Biesellite accent is easy to reproduce due to the phonetics of TCB." tag_icon = "biesel" + text_tag = "BSL" /datum/accent/coc name = ACCENT_COC @@ -9,6 +10,7 @@ Xanu Prime. The Frontiersfolk are as diverse as their accents are, but the most common \"frontier accent\" is generally regarded as that of Xanu Prime - the arguable capital of \ the massive Coalition of Colonies." tag_icon = "coalition" + text_tag = "COC" /datum/accent/elyra name = ACCENT_ELYRA @@ -16,6 +18,7 @@ of the Republic of Elyra is Elyran Standard, a constructed language which melds elements of Arabic, Farsi, and Turkish into one standardised tongue. This variation of Elyran Standard \ is the one officially taught in schools, but is rarely able to overpower more significant regional variations in the language." tag_icon = "elyra" + text_tag = "ELY" /datum/accent/eridani name = ACCENT_ERIDANI @@ -23,6 +26,7 @@ Speaking with this accent is a surefire way to get one's foot into the door in the corporate world, and wealthier Suits often devote time and resources to refining their \ accent to be more properly Eridanian." tag_icon = "eridani" + text_tag = "ERI" /datum/accent/eridani_reinstated name = ACCENT_ERIDANIREINSTATED @@ -31,6 +35,7 @@ the standard Eridanian accent almost impossible to fully achieve. The curious middle-ground accent of the so-called \"reinstated\" in Eridani society allows an individual \ to go much further than its more criminally-aligned counterpart, but still falls short of most suits' expectations." tag_icon = "eridani_reinstated" + text_tag = "REI" /datum/accent/eridani_dreg name = ACCENT_ERIDANIDREG @@ -39,18 +44,21 @@ enhanced security surveillance in corporate facilities. Eagle Corp, one of the major employers of dregs in Eridani, devotes a significant amount of its training \ to making its dreg recruits drop this distinctive accent." tag_icon = "eridani_dreg" + text_tag = "DRG" /datum/accent/sol name = ACCENT_SOL description = "The typical Solarian accent has a hundred tiny variants and can be found on a multitude of planets in countless systems, and is often simply regarded \ as the \"accent of humanity\" due to its prevalence. It can be found on planets as prominent as Earth or as obscure as settlements of only a few million in the Sol Alliance's Outer Ring." tag_icon = "sol" + text_tag = "SOL" /datum/accent/scarab name = ACCENT_SCARAB description = "The common accent of the Scarab Fleet has dozens, perhaps hundreds, of small variations due to the Fleet itself being spread throughout a massive number of \ individual ships, most of which have their own unique variations upon the standard Scarab accent." tag_icon = "scarabs" + text_tag = "SCA" /datum/accent/silversun_original name = ACCENT_SILVERSUN_ORIGINAL @@ -58,6 +66,7 @@ Many native residents of Silversun are bitter that their accent - and planet - are seen as nothing more than an enormous vacation retreat by the greater Orion Spur. This accent is commonly used by Idris Incorporated shell positronic \ frames, much to the consternation of Silversun's Originals." tag_icon = "silversun_original" + text_tag = "SIO" /datum/accent/silversun_expatriate name = ACCENT_SILVERSUN_EXPATRIATE @@ -65,6 +74,7 @@ compared to the 'native' accent of the planet. This accent is most commonly associated with Idris Incorporated employees from Silversun, which tend to be overwhelmingly from the Expatriate population. Many Idris Incorporated positronics \ are programmed with this accent, and it is often regarded as the unofficial accent of the megacorporation." tag_icon = "silversun_expatriate" + text_tag = "SIE" /datum/accent/phong name = ACCENT_PHONG @@ -72,6 +82,7 @@ standard Sol Common accent associated with the Solarian core worlds. Due to the hazardous environmental conditions present on New Hai Phong, many residents of New Hai Phong \ carry another distinctive auditory cue: coughing and wheezing due to asthma." tag_icon = "new_hai_phong" + text_tag = "NHP" /datum/accent/mars name = ACCENT_MARTIAN @@ -79,6 +90,7 @@ a \"hick\" dialect on Luna and Venus and regarded as the dialect of quarrelsome and annoying Martians elsewhere. Some Martians go to great lengths to hide their accents due to \ this reputation, which is still alive in the Republic of Biesel despite its separation from the greater Sol Alliance." tag_icon = "mars" + text_tag = "MAR" /datum/accent/luna name = ACCENT_LUNA @@ -86,18 +98,21 @@ to pick up and replicate, and is carefully maintained by Lunarians abroad to keep their accent distinct. Many Idris Incorporated IPCs are programmed with Lunarian accents to make \ them seem high-class in both appearance and in accent." tag_icon = "luna" + text_tag = "LUN" /datum/accent/gibson name = ACCENT_GIBSON description = "The New Gibsoner accent is very close to the accent of Tau Ceti proper, due to the nature of the planet's colonization. However, New Gibsoners are known for talking \ with a faster and more clipped accent than those from Biesel and, at times, sound as if they are tripping over their words due to the rapid pace at which they speak." tag_icon = "gibson" + text_tag = "GIB" /datum/accent/konyang name = ACCENT_KONYAN description = "The Konyanger Common accent is quite similar to standard Sol Common, but has drawn some influence from Freespeak due to Konyang's position near the border between \ the Sol Alliance and the Coalition of Colonies. A significant amount of IPCs possess a Konyanger accent, due to the planet being the origin of IPCs and a major producer of them." tag_icon = "konyang" + text_tag = "KNY" /datum/accent/himeo name = ACCENT_HIMEO @@ -105,6 +120,7 @@ distinctive guttural method of speaking are easily distinguishable from other Sol Common speakers, even when speaking Tau Ceti Basic or Freespeak. Himean Common has the unusual \ reputation of making its speaker always sound angry, no matter the speaker's mood, due to its more guttural nature." tag_icon = "himeo" + text_tag = "HIM" /datum/accent/vysoka name = ACCENT_VYSOKA @@ -112,6 +128,7 @@ noted that the accent sounds similar to Himean Common at times, due to both accents being more guttural than average. However, the Vysokan accent remains distinctive from Himean \ Common due to its roots in Freespeak rather than Sol Common." tag_icon = "vysoka" + text_tag = "VYS" /datum/accent/venus name = ACCENT_VENUS @@ -120,6 +137,7 @@ and Cytherea, and many prospective actors will attempt to adopt it in order to better fit into the industry. Many high-end entertainment \ IPCs used throughout human space come pre-programmed with this accent, due to its association with the Venusian entertainment industry." tag_icon = "venus" + text_tag = "VEN" /datum/accent/venusjin name = ACCENT_VENUSJIN @@ -128,6 +146,7 @@ population of the planet rather than the entertainment industry, and many Cythereans look down upon those with this accent as unrefined. \ Hendrik Strom, one of the Sol Alliance's most notable politicians, is well-known for having a strong Jintarian accent he makes no attempt to hide." tag_icon = "venus_surfacer" + text_tag = "JIN" /datum/accent/dominia_high name = ACCENT_DOMINIA_HIGH @@ -135,6 +154,7 @@ High Morozi is associated with the Imperial nobility. While most typically associated with nobles it is often taught to wealthy commoners in order to more easily brush shoulders with nobility. \ This accent is one of the most readily-recognised markers of Dominian nobility abroad." tag_icon = "dominia_high" + text_tag = "HMR" /datum/accent/dominia_vulgar name = ACCENT_DOMINIA_VULGAR @@ -142,6 +162,8 @@ dialect of Sol Common rather than a distinct Tradeband dialect. Vulgar Morozi has regional variations on the colonies of the Dominian Empire, and in the rebellious Morozian region of Fisanduh. \ The Fisanduhian accent is considered to be a distinctive higher-pitched variation of Vulgar Morozi that is often suppressed by insurgents to better blend in with the greater Imperial population." tag_icon = "dominia_vulgar" + text_tag = "VMR" + /datum/accent/jupiter name = ACCENT_JUPITER @@ -149,6 +171,7 @@ the Jovian accent often takes on traces of Tradeband due to the amount of high-income tourism, while the Castillean Jovian accent is known for the rapid, breathless pace at which it \ is typically spoken. Ganymede is often seen as the \"standard\" Jovian accent, though some on Castillo vehemently believe that the Castillian accent should be the standard." tag_icon = "jupiter" + text_tag = "JUP" /datum/accent/europa name = ACCENT_EUROPA @@ -156,18 +179,21 @@ traced the whisper-like nature of the accent origins to the planet's submarines: crews believed that quieter voices interfered less with sonar, and were less likely to be heard by whatever was \ outside the hull. Europans that have succumbed to \"Deep Crazy\", a psychological phenomenon found on the moon, are known to abandon the typically hushed nature of Europan speech for screaming hysterically." tag_icon = "europa" + text_tag = "EUR" /datum/accent/earth name = ACCENT_EARTH description = "The typical Earth, or Terran, accent of the modern era has its roots in Mandarin Chinese, the dominant language of Earth for much of its modern history. All accents found in human space - \ from Luna to Xanu - are, one way or another, descended from this ancient accent." tag_icon = "earth" + text_tag = "EAR" /datum/accent/ncf name = ACCENT_NCF description = "The non-Coalition frontier 'accent' is not a true accent in of itself, but is instead used as a catch-all term for human accents originating outside of the frontier controlled by the Coalition of Colonies. \ These planets and systems vary wildly, and all sorts of people and places can be found within them." tag_icon = "noncoalitionfrontier" + text_tag = "NCF" /datum/accent/fisanduh name = ACCENT_FISANDUH @@ -175,6 +201,7 @@ The accent is higher pitched than its Dominian counterpart, and has been described as more tonal. Members of the Fisanduh Freedom Front will often go to great lengths to disguise this accent, \ though most will slip back into it when off-world." tag_icon = "fisanduh" + text_tag = "FIS" /datum/accent/gadpathur name = ACCENT_GADPATHUR @@ -182,12 +209,14 @@ isolation of the planet during its period of reunification. Due to the government's tight control over Gadpathur, and push for unity in the face of the Sol Alliance, Gadpathurians have \ been described as sounding relatively similar no matter which area of the planet they hail from." tag_icon = "gadpathur" + text_tag = "GAD" /datum/accent/pluto name = ACCENT_PLUTO description = "The Plutonian accent is one of many Sol Common accents found throughout the Sol System itself, though it is almost undoubtedly the furthest one out from the Sun itself. Rooted in a combination \ of Central Asian and Eastern European dialects, the Plutonian accent is notable for its slow, methodical method of speech. Very few positronics can be found with this accent, due to Pluto's unusual relationship with corporations." tag_icon = "pluto" + text_tag = "PLU" /datum/accent/assunzione name = ACCENT_ASSUNZIONE @@ -195,6 +224,7 @@ most notable for its elegant-sounding and evenly-paced method of speaking compared to rougher-sounding Coalition and frontier dialects. Liturgical Assunzionii is a small subset of this dialect, and is generally only spoken during \ Luceian services and can be distinguished by its use of archaic language." tag_icon = "assunzione" + text_tag = "ASU" /datum/accent/visegrad name = ACCENT_VISEGRAD @@ -202,45 +232,53 @@ and eclectic pronunciation, it can be fairly difficult to parse for those unfamiliar with it. This is only somewhat stymied by the fact that Visegradi people tend to speak very loudly, an adaptation necessitated by the need to \ make oneself heard during the planet's torrential downpours." tag_icon = "visegrad" + text_tag = "VIS" /datum/accent/valkyrie name = ACCENT_VALKYRIE description = "The Valkyrian accent is a difficult accent to replicate, mostly due to the cultural melting pot in which it exists. Influences from across the Orion Spur have impacted the development of the accent, with \ traces of Sol Common, Tau Ceti Basic, Elyran Common and even Vulgar Morozi." tag_icon = "valkyrie" + text_tag = "VAL" /datum/accent/mictlan name = ACCENT_MICTLAN description = "The Mictlanian accent is a variation on Tradeband that is usually recognized as being folksy and warm. This welcoming, soft voice is one of the reasons the planet of Mictlan has seen a boom in tourism. While \ some youth may try to sound rebellious and conceal the softness of their voice, this musicality is still prevalent and universally recognizable." tag_icon = "mictlan" + text_tag = "MIC" /datum/accent/persepolis name = ACCENT_PERSEPOLIS description = "Well-known across Elyra for its rapid-fire, energetic cadence, the Persepolitian accent is characterised by a vibrant and fast-paced nature that represents the New Ankaran Jewel's cosmopolitan nature. \ Speakers of this variant of Elyran Standard tend to be affluent and well-cultured, in keeping with the Elyran capital's general prosperity." tag_icon = "persepolis" + text_tag = "PER" /datum/accent/medina name = ACCENT_MEDINA description = "Medinan Elyran is characterised by its breathy and almost stutter-step characteristics, both of which are thought to result from the elevated altitudes citizens experience living day-to-day in their \ sand-skimming cities. The variation has seen little spread outside Medina itself, owing to the planet's relatively minimal footprint on Elyran cinema and television." tag_icon = "medina" + text_tag = "MED" /datum/accent/aemaq name = ACCENT_AEMAQ description = "Aemaqi Elyran is often described as a more considered and methodical variation on the standard dictionary dialect, and its speakers are frequently stereotyped as speaking slowly and languidly. Elements of Tradeband \ from the planet's Dominian refugee population have helped to reinforce this effect, and the variation is rarely found in those born off Aemaq itself or its innumerable orbital stations." tag_icon = "aemaq" + text_tag = "AEM" /datum/accent/newsuez name = ACCENT_NEWSUEZ description = "Often labelled the most divergent large-scale variation of Elyran Standard, the New Suezi accent has evolved rapidly since the moon's megacorporate opening to mix elements of Freespeak, Basic, and even Solarian Common \ into its vocabulary and grammar. While purists might frown upon these deviations from the accepted linguistic standard, the melodic and almost singsong tones of the New Suezi variation feature increasingly often across many forms of Elyran media." tag_icon = "newsuez" + text_tag = "NSZ" /datum/accent/damascus name = ACCENT_DAMASCUS description = "One of the most venerable of all Elyra's linguistic variations, the Damascene accent is famous across the Serene Republic for its scholarly, almost archaic air. Drawing more heavily from Arabic influence \ than the standard dictionary might, Damascene Elyran retains a refined, cultured, and historically resonant weight to its words, much like the storied planet itself." - tag_icon = "damascus" \ No newline at end of file + tag_icon = "damascus" + text_tag = "DAM" \ No newline at end of file diff --git a/code/modules/background/accent/misc.dm b/code/modules/background/accent/misc.dm index d566a906be5..6c73284335e 100644 --- a/code/modules/background/accent/misc.dm +++ b/code/modules/background/accent/misc.dm @@ -1,4 +1,5 @@ /datum/accent/bluespace name = ACCENT_BLUESPACE description = "A peculiar accent. It seems familiar and unknown at the same time. It provokes the same feeling as having a word at the tip of your tongue." - tag_icon = "bluespace" \ No newline at end of file + tag_icon = "bluespace" + text_tag = "BLS" \ No newline at end of file diff --git a/code/modules/background/accent/silicon.dm b/code/modules/background/accent/silicon.dm index bf16ac95d72..894f7c0d4d2 100644 --- a/code/modules/background/accent/silicon.dm +++ b/code/modules/background/accent/silicon.dm @@ -1,4 +1,5 @@ /datum/accent/silicon name = ACCENT_TTS description = "A barebones text-to-speech accent. This is usually used to de-humanize or to cut speech synthesizer costs in silicon based machines." - tag_icon = "tts" \ No newline at end of file + tag_icon = "tts" + text_tag = "TTS" \ No newline at end of file diff --git a/code/modules/background/accent/skrell.dm b/code/modules/background/accent/skrell.dm index 4222edf6244..0d21e49d494 100644 --- a/code/modules/background/accent/skrell.dm +++ b/code/modules/background/accent/skrell.dm @@ -3,12 +3,14 @@ description = "In the Jargon Federation, the typical skrellian accent has dozens of minute and tiny variations and can be found across a multitude of planets (and their colonies) \ and in a wide range of sectors. Its generality has resulted in the belief that it is the 'standard' accent for all Skrell. " tag_icon = "skrell" + text_tag = "NRA" /datum/accent/skrell/homeworld name = ACCENT_HOMEWORLD description = "The typical accent of the Homeworld (or Qerrbalak), is very much more distinct and enunciated than other variations of Nral'Malic. It puts specific emphasis on a \ melodious manner of speaking, their tones often jumping out of the standard human hearing range." tag_icon = "skrell_homeworld" + text_tag = "QER" /datum/accent/skrell/qerrmalic name = ACCENT_QERRMALIC @@ -16,24 +18,28 @@ form a rather unique mixture that makes specific reference to keeping low tones accessible to non-Skrell, further cementing the overall 'quietness' to other Skrell as their sentences \ sound half-finished." tag_icon = "skrell_qerrmalic" + text_tag = "QRM" /datum/accent/skrell/aliose name = ACCENT_ALIOSE description = "It is often noted that those from Aliose have a distinctive shrill to their voices, emphasizing high notes frequently throughout their speech. The Skrell view this \ as guttural, mostly due to the resonations felt deep within their throats when attempting to replicate the accent." tag_icon = "skrell_aliose" + text_tag = "ALI" /datum/accent/skrell/aweiji name = ACCENT_AWEIJI description = "This type of accent emphasizes on a balance of highs and lows. It uses the nasal canal to further produce a harmonic pattern of speech. Idols are often found replicating \ this accent due to how gentle it is on both Skrell and non-Skrell." tag_icon = "skrell_aweiji" + text_tag = "AWE" /datum/accent/skrell/traverse name = ACCENT_TRAVERSE description = "Traverse accents are similar to those of Standard Nral'Malic accents; there are some differences on colonies in the sector, but the general trend of the accent \ seems to remain within the low ranges, often described as high-pitched and nasal in tone." tag_icon = "skrell_traverse" + text_tag = "TRA" /datum/accent/skrell/genner name = ACCENT_GENNER @@ -41,6 +47,7 @@ As a result of being separated from their planet of origin for generations, these accents don't have much in common with any modern Skrell accent, and are usually \ described as sounding 'older' by other Skrell." tag_icon = "skrell_genner" + text_tag = "GEN" /datum/accent/skrell/ceti name = ACCENT_SKRELLCETI @@ -48,6 +55,7 @@ especially those who are strongly pro-Federation. Biesellite Skrell Standard has many holdovers from Jargon accents while also having some of the more obvious \ characteristics of the Biesellite accent." tag_icon = "skrell_biesel" + text_tag = "BSS" /datum/accent/skrell/sol name = ACCENT_SKRELLSOL @@ -55,6 +63,7 @@ the Sol Alliance. The accent has kept the notable tones from accents found in the Federation, while still heavily influenced by the pacing and pronunciation common in the \ average Solarian accent." tag_icon = "skrell_sol" + text_tag = "SSS" /datum/accent/skrell/coc name = ACCENT_SKRELLCOC @@ -62,3 +71,4 @@ is more guttural, with lower-pitched tones being more prevalent. The Coalition of Colonies has a reputation for being generally anti-Federation in policy, which has \ resulted in this accent being seen by Skrell as anti-Federation by association." tag_icon = "skrell_coalition" + text_tag = "CSS" diff --git a/code/modules/background/accent/tajara.dm b/code/modules/background/accent/tajara.dm index cead5392bf5..0f5b4ea300c 100644 --- a/code/modules/background/accent/tajara.dm +++ b/code/modules/background/accent/tajara.dm @@ -5,6 +5,7 @@ to learn and adopt it, as speaking another accent is frowned upon. It is notable for its unusually rigid grammatical construction as opposed to most other Adhomian dialects. \ Republican Siik'maas is the language of Hadiist loyalists, both in and outside of S'rand'marr." tag_icon = "tajara" + text_tag = "PRA" /datum/accent/nazira_siik name = ACCENT_NAZIRASIIK @@ -12,6 +13,7 @@ its sentences slowly. It is commonly associated with the church of S'rand'marr, due to its proximity to Sana Sahira. Priests are taught to replicate this dialect when conducting \ religious service." tag_icon = "tajara_nazira" + text_tag = "NZR" /datum/accent/crevan name = ACCENT_CREVAN @@ -19,6 +21,7 @@ cultures. Thanks to the importance of the city during its trading age, it can be found in most Tajara ports as well. Crevan Creole is known for its heavy focus on nasal sounds, with many \ Adhomian comedians parodying it." tag_icon = "tajara_crevan" + text_tag = "CRE" /datum/accent/dasnrra_siik name = ACCENT_DASNRRASIIK @@ -26,6 +29,7 @@ to the rural population, it was shaped by the urban workers that emerged after the first revolution. It is associated with Democratic People's Republic citizens and its offworld \ community." tag_icon = "tajara_dasnrra" + text_tag = "DPR" /datum/accent/high_harr_siik name = ACCENT_HIGHHARRSIIK @@ -33,6 +37,7 @@ Tajara. It is the most common dialect among New Kingdom's commoners. The nobility usually attempts to mask this accent due to its relationship with the common people. It is also \ spoken by the New Kingdom population living in Tau Ceti." tag_icon = "tajara_high_harr" + text_tag = "HHA" /datum/accent/low_harr_siik name = ACCENT_LOWHARRSIIK @@ -40,6 +45,7 @@ propaganda, it has gained the fame of being the tongue of criminals and guerrilla fighters. Most speakers are Democratic People's Republic citizens. Its words are spoken in a hushed \ manner." tag_icon = "tajara_low_harr" + text_tag = "LHA" /datum/accent/amohda_siik name = ACCENT_AMOHDASIIK @@ -47,18 +53,21 @@ nationalists. It can also be found in the New Kingdom because of the Amohda Exiles. Due to royalist influence, it has many Ya'ssa loan words. Amohdan Siik'maas has a characteristic \ drawl tone to it." tag_icon = "tajara_amohda" + text_tag = "AMO" /datum/accent/rural_delvahhi name = ACCENT_RURALDELVAHHI description = "The form of Delvahhi spoken by settled zhan communities. It has been heavily influenced by Siik'maas. It is also used as the liturgical language by some Ma'ta'ke \ priests. Rural Delvahhi speakers usually speak siik'maas with a slower and throaty tone." tag_icon = "tajara_rural" + text_tag = "DEL" /datum/accent/nomad_delvahhi name = ACCENT_NOMADDELVAHHI description = "The version of Delvahhi used by the Rhazar'Hrujmagh. It emerged after the breakup in the primordial Zhan-Khazan population. Unlike the rural dialect, it remained \ relatively unchanged over time. It is far more guttural and brief than its sister tongue. " tag_icon = "tajara_nomad" + text_tag = "NOM" /datum/accent/old_yassa name = ACCENT_OLDYASSA @@ -66,18 +75,21 @@ of rules, long-drawn-out sentences and compound words. Old Ya'ssa is a dying tongue; as the version taught by the New Kingdom of Adhomai has mostly replaced it in the post-revolution \ noble generation." tag_icon = "tajara_oldyassa" + text_tag = "YSA" /datum/accent/northrasnrr name = ACCENT_NORTHRASNRR description = "While similar to the Republican Siik'maas, Northern Ras'nrr Siik'maas is relatively free from the Hadiist additions. It is known for its \ short, sharp vowel sounds and clear pronunciation. Most speakers are found in the DPRA controlled area of the region, but some do exist within the PRA borders." tag_icon = "tajara_northrasnrr" + text_tag = "NRN" /datum/accent/dinakk name = ACCENT_DINAKK description = "Found in the isolated valleys of the Din'akk Mountains, little has changed in this accent since the first contact. It still clings to words and grammatical \ structures that have long since fallen out of use by other Siik'maas speakers. It is described as strong and abrupt by other Tajara." tag_icon = "tajara_dinaak" + text_tag = "DIN" /datum/accent/harrnrri name = ACCENT_HARRNRRI @@ -89,4 +101,5 @@ name = ACCENT_ZARRJIRI description = "Zarr'jiri Siik'mas: Located only in the Zarr'jirah mountain range, this accent is rarity outside of the New Kingdom. Speakers of it are often noted for a soft, almost sing-song \ voice and hand gestures which carry over from Nal'rasan." - tag_icon = "tajara_zarrjiri" \ No newline at end of file + tag_icon = "tajara_zarrjiri" + text_tag = "ZAR" \ No newline at end of file diff --git a/code/modules/background/accent/unathi.dm b/code/modules/background/accent/unathi.dm index f05258d99ab..e1557fa1e72 100644 --- a/code/modules/background/accent/unathi.dm +++ b/code/modules/background/accent/unathi.dm @@ -4,6 +4,7 @@ practice to properly convey. The families of Lords, Sk'akh Priests, noble warriors, and some merchants will often share this accent, and will mostly find the Sinta'Azaziba language \ and Traditionalist accent more savage. The Noble Hegemonic accent is primarily found in the Untouched Lands, and originates from the Sinta'Unathi language." tag_icon = "hegemon_noble" + text_tag = "HGN" /datum/accent/hegemon_peasant name = ACCENT_HEGEMON_PEASANT @@ -11,6 +12,7 @@ Unathi, stereotypically. It still holds a slight air of royalty to it compared to the Traditional accents. It is most commonly found in the crowded Untouched Lands and in colonies. \ It originates from the Sinta'Unathi language. " tag_icon = "hegemon_peasant" + text_tag = "HGP" /datum/accent/trad_noble name = ACCENT_TRAD_NOBLE @@ -18,6 +20,7 @@ guttural intonations and physical movement required to communicate in Sinta'Azaziba, this Noble Traditional accent requires clan-training from a family member or shaman - and has \ become either a sign of survival or defeat to most who see this ancient accent fading from existence." tag_icon = "trad_noble" + text_tag = "TRN" /datum/accent/trad_peasant name = ACCENT_TRAD_PEASANT @@ -25,6 +28,7 @@ Although filled with variety due to the multitude of kingdoms composed in the Wasteland, the borders of where these accents used to be set no longer exist and have simply become \ what it is now, struggling to find identity." tag_icon = "trad_peasant" + text_tag = "TRP" /datum/accent/wastelander name = ACCENT_WASTELAND @@ -32,4 +36,5 @@ The Deep Wasteland accent comes from a disconnection to original talking styles, and adds in more aggressive speech patterns. To both Hegemonic and Traditionalist, the Deep \ Wastelander accent is the sign of an individual who has grown up without a home or clan that could have taught them an ancestral dialect. The accent is apparent in both \ Sinta'Unathi and Sinta'Azaziba." - tag_icon = "deep_wastelander" \ No newline at end of file + tag_icon = "deep_wastelander" + text_tag = "WAS" \ No newline at end of file diff --git a/code/modules/background/accent/vaurca.dm b/code/modules/background/accent/vaurca.dm index 68d386b2ad0..aa42099ac7c 100644 --- a/code/modules/background/accent/vaurca.dm +++ b/code/modules/background/accent/vaurca.dm @@ -5,6 +5,7 @@ regal and noble. Their vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead substituting with \ a harsh buzzing in the throat." tag_icon = "zora" + text_tag = "ZOR" /datum/accent/klax name = ACCENT_KLAX @@ -15,6 +16,7 @@ throat - the K'lax experience less of this - no Unathi would be content listening to a Vaura buzz incessantly when trying to hiss a sentence in the \ Hegemonic tongue." tag_icon = "klax" + text_tag = "KLA" /datum/accent/cthur name = ACCENT_CTHUR @@ -24,6 +26,7 @@ infamous of the C'thur's past deeds. Their vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead \ substituting with a harsh buzzing in the throat." tag_icon = "cthur" + text_tag = "CTH" /datum/accent/liidra name = ACCENT_LIIDRA @@ -33,3 +36,4 @@ individual. Since the Lii'dra do not think of themselves as such, these variations were deemed useless. The Connected individuals will often speak in plural, while the Disconnected \ are prone to use the first person when referring to others." tag_icon = "liidra" + text_tag = "LII" diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index de4a1f5c992..d24c41a5283 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -610,6 +610,14 @@ var/list/localhost_addresses = list( prefs.save_preferences() toggle_fullscreen(prefs.toggles_secondary & FULLSCREEN_MODE) +/client/verb/toggle_accent_tag_text() + set name = "Toggle Accent Tag Text" + set category = "Preferences" + set desc = "Toggles whether accents will be shown as text or images.." + + prefs.toggles_secondary ^= ACCENT_TAG_TEXT + prefs.save_preferences() + /client/proc/toggle_fullscreen(new_value) if(new_value) winset(src, "mainwindow", "is-maximized=false;can-resize=false;titlebar=false;menu=menu") diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index e0fd3eed081..14dd0d1b37b 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -1183,9 +1183,13 @@ proc/is_blind(A) if(used_accent && speaking?.allow_accents) var/datum/accent/a = SSrecords.accents[used_accent] if(istype(a)) - var/final_icon = a.tag_icon - var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat) - return S.icon_tag(final_icon) + if(hearer.client && hearer.client.prefs?.toggles_secondary & ACCENT_TAG_TEXT) + return "([a.text_tag])" + else + var/final_icon = a.tag_icon + var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat) + return S.icon_tag(final_icon) + /mob/proc/flash_eyes(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /obj/screen/fullscreen/flash) for(var/mob/M in contents) diff --git a/code/unit_tests/origins_tests.dm b/code/unit_tests/origins_tests.dm index 0145233077f..a622bd506ea 100644 --- a/code/unit_tests/origins_tests.dm +++ b/code/unit_tests/origins_tests.dm @@ -46,4 +46,20 @@ fail("[failures] error(s) found.") else pass("All origins are filled out properly.") + return TRUE + +/datum/unit_test/accent_tags + name = "All accent tags shall have a text tag" + +/datum/unit_test/accent_tags/start_test() + var/failures = 0 + for(var/datum/accent/A in subtypesof(/datum/accent)) + A = new() + if(!istext(A.text_tag)) + log_unit_test("Accent tag [A.name] did not have a text tag or the type was inappropriate!") + failures++ + if(failures) + fail("[failures] errors found.") + else + pass("All accents have a text tag.") return TRUE \ No newline at end of file diff --git a/html/changelogs/mattatlas-accenttext.yml b/html/changelogs/mattatlas-accenttext.yml new file mode 100644 index 00000000000..768c5f9bfb0 --- /dev/null +++ b/html/changelogs/mattatlas-accenttext.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a toggle in the preferences tab to turn accents into text tags if your monitor is too high resolution."