-
-
Notifications
You must be signed in to change notification settings - Fork 573
Language PR Followup #4844
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Erikafox
wants to merge
15
commits into
shiptest-ss13:master
Choose a base branch
from
Erikafox:patch_129
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+108
−7
Open
Language PR Followup #4844
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
1200fcd
hold
Erikafox 4930815
Update miners_cant.dm
Erikafox 9af0001
w
Erikafox 33da03e
e
Erikafox b8960a4
Update miners_cant.dm
Erikafox e14e9e0
finishes this shitass pr
Erikafox c098102
gloans
Erikafox 99558dd
forgot cant icon
Erikafox 4685c60
move magic numbers around
Erikafox 01c8155
Update vox_pidgin.dm
Erikafox 18cc243
why did you change
Erikafox 3c10254
yeah i probably should've given it last final compile and run but we …
Erikafox 9e4070f
Merge remote-tracking branch 'upstream/master' into patch_129
Erikafox fffccbe
Merge branch 'master' into patch_129
FalloutFalcon c392e25
i guess miners cant after all
Erikafox File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/datum/quirk/csl | ||
name = "Common Second Language" | ||
desc = "For some reason or another, you still haven't learned all the intricacies of Galactic Common." | ||
value = -1 | ||
gain_text = span_danger("You still haven't cracked Galactic Common") | ||
lose_text = span_notice("Oh! That's what that word means.") | ||
detectable = FALSE | ||
|
||
/datum/quirk/csl/add() | ||
quirk_holder.remove_language(/datum/language/galactic_common, UNDERSTOOD_LANGUAGE, LANGUAGE_ATOM) | ||
//make this a choosable thing when someone finishes prefs (literally never) ((redeem this comment for an erika token if you finish prefs)) | ||
quirk_holder.grant_partial_language(/datum/language/galactic_common, 50, type) | ||
|
||
/datum/quirk/csl/remove() | ||
if(QDELING(quirk_holder)) | ||
return | ||
|
||
quirk_holder.remove_partial_language(/datum/language/galactic_common, type) | ||
quirk_holder.grant_language(/datum/language/galactic_common, UNDERSTOOD_LANGUAGE, LANGUAGE_ATOM) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/datum/language/clip_kalixcian | ||
name = "CLIP Kalixcian" | ||
desc = "The CLIP dialect of Kalixcian, forming in the CLIP core worlds after around a century of drift." | ||
speech_verb = "hisses" | ||
ask_verb = "hisses" | ||
exclaim_verb = "roars" | ||
sing_verb = "sings" | ||
default_priority = 80 | ||
sentence_chance = 0 | ||
between_word_sentence_chance = 10 | ||
between_word_space_chance = 50 | ||
additional_syllable_low = -1 | ||
additional_syllable_high = 2 | ||
key = "2" | ||
flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD | ||
icon_state = "clip_kalixcian" | ||
space_chance = 30 | ||
syllables = list( | ||
"zah", "az", "zeh", "ez", "zie", "iz", "zou", "ozh", "zu", "uz", "zs", "sz", | ||
"hah", "ah", "heh", "eh", "hie", "ih", "hou", "ohm", "hu", "uh", "hs", "sh", | ||
"lah", "al", "leh", "el", "lie", "il", "lou", "ole", "lu", "ul", "ls", "sl", | ||
"kah", "ak", "keh", "eek", "kie", "ik", "kou", "okh", "kue", "uke", "ksh", "skh", | ||
"sah", "as", "seh", "eas", "sie", "is", "sou", "osu", "sue", "us", "ss", "ss", | ||
"rah", "ar", "reh", "err", "rie", "ir", "roe", "ore", "rue", "ur", "rs", "sr", | ||
"a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s" | ||
) | ||
icon_state = "clip_kalixcian" | ||
mutual_understanding = list( | ||
/datum/language/kalixcian_common = 60, | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.