cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 20:28:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2021-03-16 18:54:54 -03:00
parent 7cb53f0a63 4053758828
commit 4fa8abfca7
59 changed files with 767 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/language/arachnid.dm
+1 -1
View File
@@ -10,7 +10,7 @@
icon_state = "arachnid"
//SKYRAT CHANGE - language restriction
restricted = TRUE
restricted = FALSE
//
/datum/language/arachnid/scramble(input)
code/modules/language/draconic.dm
+1 -1
View File
@@ -19,5 +19,5 @@
icon_state = "lizard"
default_priority = 90
//SKYRAT CHANGE - language restriction
restricted = TRUE
restricted = FALSE
//
code/modules/language/dwarven.dm
+3 -3
View File
File diff suppressed because one or more lines are too long
code/modules/language/language.dm
+4 -3
View File
@@ -22,13 +22,14 @@
var/list/scramble_cache = list()
var/default_priority = 0 // the language that an atom knows with the highest "default_priority" is selected by default.
// 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
//
// if you are seeing someone speak popcorn language, then something is wrong.
var/icon = 'icons/misc/language.dmi'
var/icon_state = "popcorn"
/datum/language/proc/display_icon(atom/movable/hearer)
var/understands = hearer.has_language(src.type)
if(flags & LANGUAGE_HIDE_ICON_IF_UNDERSTOOD && understands)
code/modules/language/language_holder.dm
+20 -20
View File
@@ -253,16 +253,16 @@ Key procs
blocked_languages = null
/datum/language_holder/dwarf
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))
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))
/datum/language_holder/jelly
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
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))
/datum/language_holder/lightbringer
understood_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
@@ -270,10 +270,10 @@ Key procs
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
/datum/language_holder/lizard
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
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))
/datum/language_holder/lizard/ash
selected_language = /datum/language/draconic
@@ -288,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)) //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
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))
/datum/language_holder/slime
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
@@ -304,10 +304,10 @@ Key procs
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
/datum/language_holder/sylvan
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
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))
/datum/language_holder/synthetic
code/modules/language/mushroom.dm
+1 -1
View File
@@ -10,5 +10,5 @@
default_priority = 80
syllables = list("poof", "pff", "pFfF", "piff", "puff", "pooof", "pfffff", "piffpiff", "puffpuff", "poofpoof", "pifpafpofpuf")
//SKYRAT CHANGE - language restriction
restricted = TRUE
restricted = FALSE
//
code/modules/language/slime.dm
+4 -4
View File
@@ -8,8 +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"
//SKYRAT CHANGE - language restriction
restricted = FALSE
//
code/modules/language/sylvan.dm
+3
View File
@@ -16,3 +16,6 @@
)
icon_state = "plant"
default_priority = 90
//SKYRAT CHANGE - language restriction
restricted = FALSE
//
code/modules/language/voltaic.dm
+3
View File
@@ -12,3 +12,6 @@
)
icon_state = "volt"
default_priority = 90
//SKYRAT CHANGE - language restriction
restricted = FALSE
//