Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMelbert committed Nov 5, 2024
1 parent 52d5bd4 commit 6b5e22d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/game/atoms_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
var/tk_throw_range = 10
var/mob/pulledby = null
/// What language holder type to init as
var/initial_language_holder = /datum/language_holder
var/initial_language_holder = /datum/language_holder/atom_basic
/// Holds all languages this mob can speak and understand
VAR_PRIVATE/datum/language_holder/language_holder
/// The list of factions this atom belongs to
Expand Down
13 changes: 10 additions & 3 deletions code/modules/language/_language_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ Key procs

/datum/language_holder
/// Lazyassoclist of all understood languages
var/list/understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
var/list/understood_languages
/// Lazyassoclist of languages that can be spoken.
/// Tongue organ may also set limits beyond this list.
var/list/spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
var/list/spoken_languages
/// Lazyassoclist of blocked languages.
/// Used to prevent understanding and speaking certain languages, ie for certain mobs, mutations etc.
var/list/blocked_languages
Expand Down Expand Up @@ -503,10 +503,17 @@ GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes())
/datum/language/nekomimetic = list(LANGUAGE_ATOM),
)

// Given to atoms by default
/datum/language_holder/atom_basic
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))

// Explicitly empty one for readability
/datum/language_holder/empty

// Has all the languages known (via "mind")
/datum/language_holder/universal

/datum/language_holder/universal/New()
. = ..()
grant_all_languages()
grant_all_languages(source = LANGUAGE_MIND)

0 comments on commit 6b5e22d

Please sign in to comment.