Skip to content

Commit f2418b3

Browse files
committed
minor changes
1 parent 9ec9f42 commit f2418b3

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

code/__DEFINES/~monkestation/quirk_costs.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
#define QUIRK_COST_UNCOMMON -6
77

88
#define QUIRK_COST_LISTENER -3
9+
#define QUIRK_HARDCORE_LISTENER 3
910

1011
#define QUIRK_COST_OUTSIDER -2

code/controllers/subsystem/processing/quirks.dm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
3535
list("Stormtrooper Aim", "Big Hands"),
3636
//list("Bilingual", "Foreigner"), //monkestation edit, commented out
3737
list("Listener", "Uncommon"), // monkestation addition
38-
list("Species Outsider", "Uncommon"), // monkestation addition
39-
list("Deaf", "Hard Of Hearing"), // monkestation addition
38+
list("Outsider", "Uncommon"), // monkestation addition
4039
//might be fun to change this in the future. you can be a body purist but be forced to use implants regardless for medical reasons
4140
list("Body Purist", "Hosed"),
4241
list("Body Purist", "Neuralinked"),

code/game/say.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,13 @@ GLOBAL_LIST_INIT(freqtospan, list(
180180
/// Modifies the message by comparing the languages of the speaker with the languages of the hearer. Called on the hearer.
181181
/atom/movable/proc/translate_language(atom/movable/speaker, datum/language/language, raw_message, list/spans, list/message_mods = list())
182182
if(!language)
183+
// monkestation edit start
184+
/* original
183185
return "makes a strange sound."
186+
*/
187+
var/datum/language/dialect = GLOB.language_datum_instances[/datum/language/common]
188+
return dialect.scramble(raw_message)
189+
// monkestation edit end
184190

185191
if(!has_language(language))
186192
var/datum/language/dialect = GLOB.language_datum_instances[language]

code/modules/language/language_holder.dm

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,26 @@ Key procs
6464

6565
// monkestation edit start
6666
var/mob/living/carbon/carbon_owner = owner
67-
if(istype(carbon_owner))
67+
if (istype(carbon_owner))
6868
var/uncommon = carbon_owner.has_quirk(/datum/quirk/language_holder/uncommon)
6969
var/outsider = carbon_owner.has_quirk(/datum/quirk/language_holder/outsider)
7070
var/is_human = istype(carbon_owner.dna.species, /datum/species/human)
7171
var/outsider_human = outsider && is_human
72-
if(uncommon || outsider_human)
72+
if (uncommon || outsider_human)
7373
remove_language(/datum/language/common, TRUE, TRUE, LANGUAGE_ATOM)
7474
add_blocked_language(/datum/language/common, LANGUAGE_QUIRK)
75-
if(outsider)
76-
for(var/language in understood_languages)
77-
if(language != /datum/language/common)
75+
if (outsider)
76+
for (var/language in understood_languages)
77+
if (language != /datum/language/common)
7878
remove_language(language, TRUE, FALSE, LANGUAGE_ATOM)
79-
for(var/language in spoken_languages)
80-
if(language != /datum/language/common)
79+
for (var/language in spoken_languages)
80+
if (language != /datum/language/common)
8181
remove_language(language, FALSE, TRUE, LANGUAGE_ATOM)
82-
if(uncommon)
82+
if (uncommon)
8383
grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_QUIRK)
84-
if(carbon_owner.has_quirk(/datum/quirk/language_holder/listener))
84+
if (outsider_human)
85+
grant_language(pick(GLOB.roundstart_languages), TRUE, TRUE, LANGUAGE_QUIRK)
86+
if (carbon_owner.has_quirk(/datum/quirk/language_holder/listener))
8587
remove_language(/datum/language/common, FALSE, TRUE, LANGUAGE_ATOM)
8688
// monkestation edit end
8789

monkestation/code/datums/quirks/negative_quirks/language_quirks.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/datum/quirk/language_holder/outsider
2929
name = "Outsider"
30-
desc = "You don't know your species' language."
30+
desc = "You don't know your species' language. If you are human you know a random language instead of Galactic Common."
3131
icon = FA_ICON_BAN
3232
value = QUIRK_COST_OUTSIDER
3333
gain_text = span_notice("You can't understand your species' language.")
@@ -38,6 +38,7 @@
3838
desc = "You are unable to speak Galactic Common though you understand it just fine."
3939
icon = FA_ICON_BELL_SLASH
4040
value = QUIRK_COST_LISTENER
41+
hardcore_value = QUIRK_HARDCORE_LISTENER
4142
gain_text = span_notice("You don't know how to speak Galactic Common.")
4243
lose_text = span_notice("You're able to speak Galactic Common.")
4344
medical_record_text = "Patient does not speak Galactic Common and may require an interpreter."

0 commit comments

Comments
 (0)