Skip to content

Commit

Permalink
Tajaran Fixes / QoL
Browse files Browse the repository at this point in the history
- - -
Bugfixes:
 - Tajarans no longer suffer from lacking autohiss.
- - -
Content:
 - Tajarans now have their own unique language. Syllables ripped from Aurora. Thanks, guys.
 - Tajarans technically have cultures and such, but it's not written because we lack lore.
- - -
  • Loading branch information
ProbablyCarl committed Feb 26, 2022
1 parent d79ca68 commit 074d8c9
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 24 deletions.
4 changes: 4 additions & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1475,9 +1475,12 @@
#include "code\modules\boh\ascent2\turf.dm"
#include "code\modules\boh\ascent2\weapons.dm"
#include "code\modules\boh\culture_descriptor\culture\cultures_sergal.dm"
#include "code\modules\boh\culture_descriptor\culture\cultures_tajaran.dm"
#include "code\modules\boh\culture_descriptor\faction\factions_human_boh.dm"
#include "code\modules\boh\culture_descriptor\faction\factions_sergal.dm"
#include "code\modules\boh\culture_descriptor\faction\factions_tajaran.dm"
#include "code\modules\boh\culture_descriptor\location\locations_sergal.dm"
#include "code\modules\boh\culture_descriptor\location\locations_tajaran.dm"
#include "code\modules\boh\culture_descriptor\religion\religions_sergal.dm"
#include "code\modules\boh\fabrication\weaponsfab.dm"
#include "code\modules\boh\firing_pins\firing_pin.dm"
Expand Down Expand Up @@ -2107,6 +2110,7 @@
#include "code\modules\mob\language\alien\sergal.dm"
#include "code\modules\mob\language\alien\serpentid.dm"
#include "code\modules\mob\language\alien\skrell.dm"
#include "code\modules\mob\language\alien\tajaran.dm"
#include "code\modules\mob\language\alien\unathi.dm"
#include "code\modules\mob\language\human\arabic.dm"
#include "code\modules\mob\language\human\chinese.dm"
Expand Down
5 changes: 5 additions & 0 deletions code/__defines/culture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,8 @@
#define FACTION_SERGAL_REONO "Reono lands"
#define RELIGION_SERGAL_ANIMISM "northern religions"
#define RELIGION_SERGAL_GOLD_RING "religion of Gold ring"

// Tajaran cultures.
#define CULTURE_TAJARAN "The Tajara"
#define HOME_SYSTEM_TAJARAN "Rarkajar"
#define FACTION_TAJARAN "Tajaran Government"
1 change: 1 addition & 0 deletions code/__defines/languages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#define LANGUAGE_ADHERENT "Protocol"
#define LANGUAGE_VOX "Vox Dei"
#define LANGUAGE_NABBER "Serpentid"
#define LANGUAGE_TAJARAN "Siik'Maas"
#define LANGUAGE_SERGAL "Sagaru"

//Antag
Expand Down
16 changes: 16 additions & 0 deletions code/modules/boh/culture_descriptor/culture/cultures_tajaran.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/decl/cultural_info/culture/tajaran
name = CULTURE_TAJARAN
description = "The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. \
While reaching to the stars independently from outside influences, the humans engaged them in peaceful trade contact \
and have accelerated the fledgling culture into the interstellar age. Their history is full of war and highly fractious \
governments, something that permeates even to today's times. They prefer colder, tundra-like climates, much like their \
home worlds and speak a variety of languages, especially Siik and Akhani."
economic_power = 1
language = LANGUAGE_TAJARAN
secondary_langs = list(
LANGUAGE_SIGN,
LANGUAGE_GUTTER,
LANGUAGE_SPACER,
LANGUAGE_HUMAN_EURO
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/decl/cultural_info/faction/tajaran
name = FACTION_TAJARAN
description = "The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. \
While reaching to the stars independently from outside influences, the humans engaged them in peaceful trade contact \
and have accelerated the fledgling culture into the interstellar age. Their history is full of war and highly fractious \
governments, something that permeates even to today's times. They prefer colder, tundra-like climates, much like their \
home worlds and speak a variety of languages, especially Siik and Akhani."
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/decl/cultural_info/location/tajaran
name = HOME_SYSTEM_TAJARAN
description = "The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. \
While reaching to the stars independently from outside influences, the humans engaged them in peaceful trade contact \
and have accelerated the fledgling culture into the interstellar age. Their history is full of war and highly fractious \
governments, something that permeates even to today's times. They prefer colder, tundra-like climates, much like their \
home worlds and speak a variety of languages, especially Siik and Akhani."
ruling_body = "N/A"
distance = "N/A"
22 changes: 22 additions & 0 deletions code/modules/mob/language/alien/tajaran.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/datum/language/tajaran
name = LANGUAGE_TAJARAN
desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
speech_verb = "mrowls"
ask_verb = "mrowls"
exclaim_verb = "yowls"
colour = "tajaran"
key = "l"
flags = WHITELISTED
space_chance = 40
syllables = list(
"mrr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr",
"mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r",
"ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah",
"hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra"
)
shorthand = "TJ"
max_partial_understanding = 2
partial_understanding = list(
LANGUAGE_HUMAN_EURO = 2,
LANGUAGE_SPACER = 2,
)
8 changes: 8 additions & 0 deletions code/modules/mob/living/autohiss.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
LANGUAGE_UNATHI_YEOSA
)

/datum/species/tajaran
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
)
autohiss_exempt = list(
LANGUAGE_TAJARAN
)

/datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
if(!autohiss_basic_map)
return message
Expand Down
1 change: 1 addition & 0 deletions code/stylesheet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ h1.alert, h2.alert {color: #000000;}
.skrell {color: #00ced1;}
.soghun {color: #228b22;}
.yeosa {color: #218b89;}
.tajaran {color: #a900ac;}
.nabber_lang {color: #525252;}
.changeling {color: #800080;}
.vox {color: #aa00aa;}
Expand Down
36 changes: 12 additions & 24 deletions modular_mithra/code/modules/species/station/tajaran.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,18 @@
sexybits_location = BP_GROIN


available_cultural_info = list( //I can do ANYTHING! Placeholder until the loreboys come and figure out what Tajara do
available_cultural_info = list(
TAG_CULTURE = list(
CULTURE_HUMAN,
CULTURE_HUMAN_VATGROWN,
CULTURE_HUMAN_MARTIAN,
CULTURE_HUMAN_MARSTUN,
CULTURE_HUMAN_LUNAPOOR,
CULTURE_HUMAN_LUNARICH,
CULTURE_HUMAN_VENUSIAN,
CULTURE_HUMAN_VENUSLOW,
CULTURE_HUMAN_BELTER,
CULTURE_HUMAN_PLUTO,
CULTURE_HUMAN_EARTH,
CULTURE_HUMAN_CETI,
CULTURE_HUMAN_SPACER,
CULTURE_HUMAN_SPAFRO,
CULTURE_HUMAN_CONFED,
CULTURE_HUMAN_OTHER,
CULTURE_SKRELL_QERR,
CULTURE_SKRELL_MALISH,
CULTURE_SKRELL_KANIN,
CULTURE_SKRELL_TALUM,
CULTURE_SKRELL_RASKINTA,
CULTURE_SYMBIOTIC
CULTURE_TAJARAN
),
TAG_HOMEWORLD = list(
HOME_SYSTEM_TAJARAN
),
TAG_FACTION = list(
FACTION_TAJARAN
),
TAG_RELIGION = list(
RELIGION_OTHER
)
)

Expand All @@ -63,4 +51,4 @@
if(effective_dose > 15 && prob(7))
M.emote(pick("twitch", "drool"))
if(effective_dose > 20 && prob(10))
M.SelfMove(pick(GLOB.cardinal))
M.SelfMove(pick(GLOB.cardinal))

0 comments on commit 074d8c9

Please sign in to comment.