Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Language holder for Preternis fix #7513

Merged
merged 10 commits into from
Jan 6, 2020
Merged

Language holder for Preternis fix #7513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
856950c
Revert "Restoring my main branch"
Hopekz Oct 15, 2019
00b5eb0
Revert "Revert "Restoring my main branch""
Hopekz Oct 15, 2019
b122222
Merge remote-tracking branch 'upstream/master'
Hopekz Oct 15, 2019
c7b3b8b
Merge branch 'master' of https://github.com/Hopekz/Yogstation
Hopekz Nov 29, 2019
4783f72
Merge branch 'master' of https://github.com/Hopekz/Yogstation
Hopekz Dec 10, 2019
c46ab39
Bees can ventcrawl
Hopekz Dec 21, 2019
dfdba6e
Revert "Bees can ventcrawl"
Hopekz Dec 21, 2019
5368ffa
Merge remote-tracking branch 'upstream/master'
Hopekz Dec 31, 2019
a40a3b7
Merge remote-tracking branch 'upstream/master'
Hopekz Jan 5, 2020
116237e
Adds a language holder to preternis to fix sheltered
Hopekz Jan 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/modules/language/language_holder.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ Key procs
/datum/language/machine = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))

/datum/language_holder/preternis
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/machine = list(LANGUAGE_ATOM),)
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/machine = list(LANGUAGE_ATOM),)

/datum/language_holder/empty
understood_languages = list()
spoken_languages = list()
Expand Down
1 change: 1 addition & 0 deletions yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ adjust_charge - take a positive or negative value to adjust the charge level
var/tesliumtrip = FALSE
var/draining = FALSE
screamsound = 'goon/sound/robot_scream.ogg'
species_language_holder = /datum/language_holder/preternis

/datum/species/preternis/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
Expand Down