cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 16:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pulls #1706 from Skyrat (#18)

Browse Source
This commit is contained in:
Enric Gabriel
2020-07-02 02:20:27 -03:00
committed by GitHub
parent 9c5a13d6d7
commit 72f993fdbd
42 changed files with 432 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/language/aphasia.dm
+3
View File
@@ -11,3 +11,6 @@
space_chance = 20
default_priority = 10
icon_state = "aphasia"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
code/modules/language/beachbum.dm
+3
View File
@@ -20,3 +20,6 @@
"tail", "trim", "tube", "wobble", "roll", "gnarly", "epic")
icon_state = "beach"
//SKYRAT CHANGE - language restriction
restricted = FALSE
//
code/modules/language/codespeak.dm
+3
View File
@@ -5,6 +5,9 @@
default_priority = 0
flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
icon_state = "codespeak"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
/datum/language/codespeak/scramble(input)
var/lookup = check_cache(input)
code/modules/language/common.dm
+3
View File
@@ -9,6 +9,9 @@
default_priority = 100
icon_state = "galcom"
//SKYRAT CHANGE - language restriction
restricted = TRUE //i know it's weird, but it's restricted because crewmembers spawn with it by default
//
//Syllable Lists
/*
code/modules/language/draconic.dm
+3
View File
@@ -18,3 +18,6 @@
)
icon_state = "lizard"
default_priority = 90
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
code/modules/language/drone.dm
+3
View File
@@ -14,3 +14,6 @@
default_priority = 20
icon_state = "drone"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
code/modules/language/dwarven.dm
+4 -1
View File
File diff suppressed because one or more lines are too long
code/modules/language/language.dm
+3
View File
@@ -25,6 +25,9 @@
// if you are seeing someone speak popcorn language, then something is wrong.
var/icon = 'icons/misc/language.dmi'
var/icon_state = "popcorn"
//SKYRAT CHANGE - is this language available on the character setup? Set to true if not.
var/restricted = TRUE
//
/datum/language/proc/display_icon(atom/movable/hearer)
var/understands = hearer.has_language(src.type)
code/modules/language/language_holder.dm
+34 -25
View File
@@ -253,16 +253,16 @@ Key procs
blocked_languages = null
/datum/language_holder/dwarf
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/dwarf = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/dwarf = list(LANGUAGE_ATOM))
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/dwarf = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/dwarf = list(LANGUAGE_ATOM))
/datum/language_holder/jelly
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/slime = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/slime = list(LANGUAGE_ATOM))
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/slime = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
// /datum/language/slime = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
/datum/language_holder/lightbringer
understood_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
@@ -270,13 +270,17 @@ Key procs
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
/datum/language_holder/lizard
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/draconic = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
// /datum/language/draconic = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
/datum/language_holder/lizard/ash
selected_language = /datum/language/draconic
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), //SKYRAT EDIT - additional languages
/datum/language/draconic = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
/datum/language_holder/monkey
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
@@ -284,10 +288,10 @@ Key procs
spoken_languages = list(/datum/language/monkey = list(LANGUAGE_ATOM))
/datum/language_holder/mushroom
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/mushroom = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/mushroom = list(LANGUAGE_ATOM))
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/mushroom = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
// /datum/language/mushroom = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
/datum/language_holder/slime
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
@@ -300,21 +304,26 @@ Key procs
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
/datum/language_holder/sylvan
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/sylvan = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/sylvan = list(LANGUAGE_ATOM))
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
// /datum/language/sylvan = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
// /datum/language/sylvan = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
/datum/language_holder/synthetic
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/machine = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM),
/datum/language/slime = list(LANGUAGE_ATOM),
/datum/language/dwarf = list(LANGUAGE_ATOM))
understood_languages = list(// SKYRAT EDIT - additional languages
/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/machine = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM),
// SKYRAT EDIT - additional languages
/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM),
/datum/language/slime = list(LANGUAGE_ATOM),
/datum/language/dwarf = list(LANGUAGE_ATOM))
code/modules/language/machine.dm
+4 -1
View File
@@ -10,7 +10,10 @@
syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz")
space_chance = 10
default_priority = 90
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
icon_state = "eal"
/datum/language/machine/get_random_name()
code/modules/language/monkey.dm
+3
View File
@@ -10,3 +10,6 @@
default_priority = 80
icon_state = "animal"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
code/modules/language/mushroom.dm
+3
View File
@@ -9,3 +9,6 @@
sentence_chance = 0
default_priority = 80
syllables = list("poof", "pff", "pFfF", "piff", "puff", "pooof", "pfffff", "piffpiff", "puffpuff", "poofpoof", "pifpafpofpuf")
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
code/modules/language/narsian.dm
+4 -1
View File
@@ -27,7 +27,10 @@
) //the base syllables, which include a few rare ones that won't appear in the mixed syllables
icon_state = "narsie"
default_priority = 10
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
/datum/language/narsie/New()
for(var/syllable in base_syllables) //we only do this once, since there's only ever a single one of each language datum.
for(var/target_syllable in base_syllables)
code/modules/language/ratvarian.dm
+5 -2
View File
@@ -9,11 +9,14 @@
default_priority = 10
spans = list(SPAN_ROBOT)
icon_state = "ratvar"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
/datum/language/ratvar/scramble(var/input)
. = text2ratvar(input)
/datum/language/ratvar/get_spoken_verb(msg_end)
if(!msg_end)
return pick(random_speech_verbs)
return ..()
return ..()
code/modules/language/slime.dm
+4 -1
View File
@@ -8,5 +8,8 @@
flags = TONGUELESS_SPEECH
syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
default_priority = 70
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
icon_state = "slime"
code/modules/language/swarmer.dm
+4 -1
View File
@@ -12,7 +12,10 @@
default_priority = 60
icon_state = "swarmer"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
// since various flats and sharps are the same,
// all non-accidental notes are doubled in the list
/* The list with unicode symbols for the accents.
code/modules/language/vampiric.dm
+3
View File
@@ -11,6 +11,9 @@
space_chance = 40
default_priority = 90
icon_state = "bloodsucker"
//SKYRAT CHANGE - language restriction
restricted = TRUE
//
flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD // Hide the icon next to your text if someone doesn't know this language.
syllables = list(
code/modules/language/xenocommon.dm
+3
View File
@@ -9,3 +9,6 @@
default_priority = 50
icon_state = "xeno"
//SKYRAT CHANGE - language restriction
restricted = TRUE //I think humanoid xenos should have a separate language...
//