Merge pull request #2314 from Anewbe/taj_cleanup

Taj cleanup

code/__defines/species_languages.dm

@@ -24,8 +24,7 @@
 // Languages.
 #define LANGUAGE_SOL_COMMON "Sol Common"
 #define LANGUAGE_UNATHI "Sinta'unathi"
-#define LANGUAGE_SIIK_MAAS "Siik'maas"
-#define LANGUAGE_SIIK_TAJR "Siik'tajr"
+#define LANGUAGE_SIIK "Siik"
 #define LANGUAGE_SKRELLIAN "Skrellian"
 #define LANGUAGE_ROOTSPEAK "Rootspeak"
 #define LANGUAGE_TRADEBAND "Tradeband"

code/datums/locations/s_randarr.dm

@@ -1,3 +1,5 @@
+//TODO: Make this match current lore
+
 //S'randarr
 
 /datum/locations/s_randarr

code/game/gamemodes/events/holidays/Holidays.dm

@@ -34,9 +34,6 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 			switch(DD)
 				if(1)
 					Holiday["New Years's Day"] = "The day of the new solar year on Sol."
-				if(10)
-					Holiday["Messa's Day"] = "A Tajaran holiday.  It takes place on the shortest day of the year on \
-					Ahdomai, and is named after Messa, the Tajaran deity of Change."
 				if(12)
 					Holiday["Vertalliq-Qerr"] = "Vertalliq-Qerr, translated to mean 'Festival of the Royals', is a \
 					Skrell holiday that celebrates the Qerr-Katish and all they have provided for the rest of Skrell society, \
@@ -79,9 +76,6 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 					Holiday["April Fool's Day"] = "An old holiday that endevours one to pull pranks and spread hoaxes on their friends."
 					if(YY == 18)
 						Holiday["Easter"] = ""
-				if(7)
-					Holiday["Tajaran Independence Day"] = "A Tajaran holiday celebrating their independence by winning the \
-					war against the Slavemasters, the former ruling elite that went known as 'The Overseers'."
 				if(8)
 					if(YY == 15)
 						Holiday["Easter"] = ""
@@ -123,9 +117,11 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 
 		if(8)	//Aug
 			switch(DD)
-				if(10)
-					Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, \
-					on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common."
+//				if(10)
+//					Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, \
+//					on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common."
+				if(27)
+					Holiday["Forgiveness Day"] = "A time to forgive and be forgiven."
 
 		if(9)	//Sep
 			switch(DD)

code/game/objects/items/weapons/storage/boxes.dm

@@ -387,7 +387,7 @@
 
 /obj/item/weapon/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
-	desc = "Drymate brand farwa cubes, shipped from Ahdomai. Just add water!"
+	desc = "Drymate brand farwa cubes, shipped from Meralar. Just add water!"
 
 /obj/item/weapon/storage/box/monkeycubes/farwacubes/New()
 	..()

code/modules/client/preferences_factions.dm

@@ -17,7 +17,7 @@ var/global/list/citizenship_choices = list(
 	"Earth",
 	"Mars",
 	"Moghes",
-	"Ahdomai",
+	"Meralar",
 	"Qerrbalak"
 	)
 
@@ -28,7 +28,7 @@ var/global/list/home_system_choices = list(
 	"Tau Ceti",
 	"Qerr'Vallis",
 	"Epsilon Ursae Minoris",
-	"S'randarr"
+	"Rarkajar"
 	)
 
 var/global/list/faction_choices = list(

code/modules/economy/Events_Mundane.dm

@@ -84,7 +84,7 @@
 				[pick("playwright","author","director","actor","TV star")] [random_name(pick(MALE,FEMALE))] comes the latest sensation: '\
 				[pick("Deadly","The last","Lost","Dead")] [pick("Starships","Warriors","outcasts","Tajarans","Unathi","Skrell")] \
 				[pick("of","from","raid","go hunting on","visit","ravage","pillage","destroy")] \
-				[pick("Moghes","Earth","Biesel","Ahdomai","S'randarr","the Void","the Edge of Space")]'.\
+				[pick("Moghes","Earth","Biesel","Meralar","Rarkajar","the Void","the Edge of Space")]'.\
 				. Own it on webcast today, or visit the galactic premier on [affected_dest.name]!"
 
 			if(BIG_GAME_HUNTERS)

code/modules/games/spaceball_cards.dm

@@ -16,7 +16,7 @@
 		else
 			var/language_type = pick(/datum/language/human,/datum/language/diona,/datum/language/tajaran,/datum/language/unathi)
 			var/datum/language/L = new language_type()
-			var/team = pick("Brickburn Galaxy Trekers","Mars Rovers", "Qerrbalak Saints", "Moghes Rockets", "Ahdomai Lightening", starsys_name+" Vixens", "Euphoric-Earth Alligators")
+			var/team = pick("Brickburn Galaxy Trekers","Mars Rovers", "Qerrbalak Saints", "Moghes Rockets", "Meralar Lightning", starsys_name+" Vixens", "Euphoric-Earth Alligators")
 			P.name = "[L.get_random_name(pick(MALE,FEMALE))], [year - rand(0,50)] [team]"
 			P.card_icon = "spaceball_standard"
 		P.back_icon = "card_back_spaceball"

code/modules/hydroponics/seed_datums.dm

@@ -1028,8 +1028,8 @@
 
 /datum/seed/shand
 	name = "shand"
-	seed_name = "S'randar's hand"
-	display_name = "S'randar's hand leaves"
+	seed_name = "Selem's hand"
+	display_name = "Selem's hand leaves"
 	chems = list("bicaridine" = list(0,10))
 	kitchen_tag = "shand"
 
@@ -1048,8 +1048,8 @@
 
 /datum/seed/mtear
 	name = "mtear"
-	seed_name = "Messa's tear"
-	display_name = "Messa's tear leaves"
+	seed_name = "Malani's tear"
+	display_name = "Malani's tear leaves"
 	chems = list("honey" = list(1,10), "kelotane" = list(3,5))
 	kitchen_tag = "mtear"
 

code/modules/mob/language/station.dm

@@ -42,8 +42,8 @@
 	return capitalize(new_name)
 
 /datum/language/tajaran
-	name = "Siik'tajr"
-	desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
+	name = "Siik"
+	desc = "The most prevalant language of Meralar, composed of expressive yowls and chirps. Native to the Tajaran."
 	speech_verb = "mrowls"
 	ask_verb = "mrowls"
 	exclaim_verb = "yowls"

code/modules/mob/living/autohiss.dm

@@ -53,7 +53,7 @@
 	autohiss_basic_map = list(
 			"r" = list("rr", "rrr", "rrrr")
 		)
-	autohiss_exempt = list("Siik'tajr")
+	autohiss_exempt = list("Siik")
 
 
 /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -96,8 +96,8 @@
 	burn_mod =  1.15
 	gluttonous = 1
 	num_alternate_languages = 2
-	secondary_langs = list("Siik'tajr")
-	name_language = "Siik'tajr"
+	secondary_langs = list("Siik")
+	name_language = "Siik"
 	health_hud_intensity = 2.5
 
 	min_age = 17

code/modules/mob/living/silicon/ai/ai.dm

@@ -151,8 +151,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
 	add_language("Galactic Common", 1)
 	add_language("Sol Common", 0)
 	add_language("Sinta'unathi", 0)
-	add_language("Siik'maas", 0)
-	add_language("Siik'tajr", 0)
+	add_language("Siik", 0)
 	add_language("Skrellian", 0)
 	add_language("Tradeband", 1)
 	add_language("Gutter", 0)

code/modules/mob/living/silicon/pai/software_modules.dm

@@ -469,11 +469,11 @@
 		user.translator_on = !user.translator_on
 		if(user.translator_on)
 			user.add_language("Sinta'unathi")
-			user.add_language("Siik'tajr")
+			user.add_language("Siik")
 			user.add_language("Skrellian")
 		else
 			user.remove_language("Sinta'unathi")
-			user.remove_language("Siik'tajr")
+			user.remove_language("Siik")
 			user.remove_language("Skrellian")
 
 	is_active(mob/living/silicon/pai/user)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -23,7 +23,7 @@ var/global/list/robot_modules = list(
 	var/hide_on_manifest = 0
 	var/channels = list()
 	var/networks = list()
-	var/languages = list(LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, LANGUAGE_UNATHI = 0, LANGUAGE_SIIK_TAJR = 0, LANGUAGE_SKRELLIAN = 0, LANGUAGE_GUTTER = 0, LANGUAGE_SCHECHI = 0)
+	var/languages = list(LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, LANGUAGE_UNATHI = 0, LANGUAGE_SIIK = 0, LANGUAGE_SKRELLIAN = 0, LANGUAGE_GUTTER = 0, LANGUAGE_SCHECHI = 0)
 	var/sprites = list()
 	var/can_be_pushed = 1
 	var/no_slip = 0
@@ -488,8 +488,7 @@ var/global/list/robot_modules = list(
 	languages = list(
 					LANGUAGE_SOL_COMMON	= 1,
 					LANGUAGE_UNATHI		= 1,
-					LANGUAGE_SIIK_MAAS	= 1,
-					LANGUAGE_SIIK_TAJR	= 1,
+					LANGUAGE_SIIK		= 1,
 					LANGUAGE_SKRELLIAN	= 1,
 					LANGUAGE_ROOTSPEAK	= 1,
 					LANGUAGE_TRADEBAND	= 1,
@@ -649,8 +648,7 @@ var/global/list/robot_modules = list(
 					LANGUAGE_SOL_COMMON = 1,
 					LANGUAGE_TRADEBAND = 1,
 					LANGUAGE_UNATHI = 0,
-					LANGUAGE_SIIK_MAAS	= 0,
-					LANGUAGE_SIIK_TAJR = 0,
+					LANGUAGE_SIIK	= 0,
 					LANGUAGE_SKRELLIAN = 0,
 					LANGUAGE_ROOTSPEAK	= 0,
 					LANGUAGE_GUTTER = 1,

html/changelogs/anewbe_catwords.yml

@@ -0,0 +1,36 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: Anewbe
+
+# 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: 
+  - tweak: "Changed some words to match current Tajaran lore."