From a87a75d0590edf51b1a7a8e2724663e06d00eb87 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 3 May 2017 22:22:07 -0500 Subject: [PATCH 1/2] Draconic language, for lizards --- code/modules/language/unathi.dm | 20 +++++++++++++++++++ .../human/species_types/lizardpeople.dm | 3 +++ code/modules/surgery/organs/tongue.dm | 1 + code/modules/surgery/organs/tongue.dm.rej | 10 ++++++++++ tgstation.dme.rej | 9 +++++++++ 5 files changed, 43 insertions(+) create mode 100644 code/modules/language/unathi.dm create mode 100644 code/modules/surgery/organs/tongue.dm.rej create mode 100644 tgstation.dme.rej diff --git a/code/modules/language/unathi.dm b/code/modules/language/unathi.dm new file mode 100644 index 0000000000..5c6da5362f --- /dev/null +++ b/code/modules/language/unathi.dm @@ -0,0 +1,20 @@ +/datum/language/unathi + name = "Unathi" + desc = "The common language of lizard-people, composed of sibilant hisses and rattles." + speech_verb = "hisses" + ask_verb = "hisses" + exclaim_verb = "roars" + key = "o" + flags = TONGUELESS_SPEECH + space_chance = 40 + syllables = list( + "za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz", + "ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh", + "la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl", + "ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk", + "sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss", + "ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr", + "a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s" + ) + icon_state = "lizard" + default_priority = 90 diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 876d2f9e34..5fa3d1e4f8 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -17,6 +17,9 @@ skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" +/datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H) + H.grant_language(/datum/language/draconic) + /datum/species/lizard/random_name(gender,unique,lastname) if(unique) return random_unique_lizard_name(gender) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 1ef36f3fe2..bbfa6eface 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -127,6 +127,7 @@ languages_possible = typecacheof(list( /datum/language/xenocommon, /datum/language/common, + /datum/language/draconic, /datum/language/ratvar, /datum/language/monkey)) diff --git a/code/modules/surgery/organs/tongue.dm.rej b/code/modules/surgery/organs/tongue.dm.rej new file mode 100644 index 0000000000..39d5c09394 --- /dev/null +++ b/code/modules/surgery/organs/tongue.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm (rejected hunks) +@@ -13,7 +13,7 @@ + . = ..() + languages_possible = typecacheof(list( + /datum/language/common, +- /datum/language/unathi, ++ /datum/language/draconic, + /datum/language/monkey, + /datum/language/ratvar + )) diff --git a/tgstation.dme.rej b/tgstation.dme.rej new file mode 100644 index 0000000000..b450e34a07 --- /dev/null +++ b/tgstation.dme.rej @@ -0,0 +1,9 @@ +diff a/tgstation.dme b/tgstation.dme (rejected hunks) +@@ -1377,6 +1377,7 @@ + #include "code\modules\jobs\job_types\silicon.dm" + #include "code\modules\jobs\map_changes\map_changes.dm" + #include "code\modules\language\common.dm" ++#include "code\modules\language\draconic.dm" + #include "code\modules\language\drone.dm" + #include "code\modules\language\language.dm" + #include "code\modules\language\language_menu.dm" From e03b4b79053ef1412c37d37db7e67c9a6c5e776a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 16 May 2017 23:46:37 -0500 Subject: [PATCH 2/2] ooga booga lizard --- .../language/{unathi.dm => draconic.dm} | 4 ++-- code/modules/surgery/organs/tongue.dm | 19 ++++++------------- tgstation.dme | 1 + 3 files changed, 9 insertions(+), 15 deletions(-) rename code/modules/language/{unathi.dm => draconic.dm} (94%) diff --git a/code/modules/language/unathi.dm b/code/modules/language/draconic.dm similarity index 94% rename from code/modules/language/unathi.dm rename to code/modules/language/draconic.dm index 5c6da5362f..aaa998c2c0 100644 --- a/code/modules/language/unathi.dm +++ b/code/modules/language/draconic.dm @@ -1,5 +1,5 @@ -/datum/language/unathi - name = "Unathi" +/datum/language/draconic + name = "Draconic" desc = "The common language of lizard-people, composed of sibilant hisses and rattles." speech_verb = "hisses" ask_verb = "hisses" diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index bbfa6eface..1a9d6b98e6 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -10,9 +10,10 @@ var/taste_sensitivity = 15 // lower is more sensitive. /obj/item/organ/tongue/Initialize(mapload) - ..() + . = ..() languages_possible = typecacheof(list( /datum/language/common, + /datum/language/draconic, /datum/language/monkey, /datum/language/ratvar )) @@ -123,7 +124,7 @@ taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED /obj/item/organ/tongue/alien/Initialize(mapload) - ..() + . = ..() languages_possible = typecacheof(list( /datum/language/xenocommon, /datum/language/common, @@ -176,7 +177,7 @@ /obj/item/organ/tongue/bone/plasmaman/get_spans() return - + /obj/item/organ/tongue/robot name = "robotic voicebox" desc = "A voice synthesizer that can interface with organic lifeforms." @@ -186,16 +187,8 @@ attack_verb = list("beeped", "booped") taste_sensitivity = 25 // not as good as an organic tongue -/obj/item/organ/tongue/robot/Initialize(mapload) - ..() - languages_possible = typecacheof(list( - /datum/language/xenocommon, - /datum/language/common, - /datum/language/ratvar, - /datum/language/monkey, - /datum/language/drone, - /datum/language/machine, - /datum/language/swarmer)) +/obj/item/organ/tongue/robot/can_speak_in_language(datum/language/dt) + . = TRUE // THE MAGIC OF ELECTRONICS /obj/item/organ/tongue/robot/get_spans() return ..() | SPAN_ROBOT diff --git a/tgstation.dme b/tgstation.dme index 1f3ef27802..92bac3f840 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1419,6 +1419,7 @@ #include "code\modules\jobs\job_types\security.dm" #include "code\modules\jobs\job_types\silicon.dm" #include "code\modules\language\common.dm" +#include "code\modules\language\draconic.dm" #include "code\modules\language\drone.dm" #include "code\modules\language\language.dm" #include "code\modules\language\language_menu.dm"