From 9ba0a1b470e167a065afb4e8c9c83feddf0384dd Mon Sep 17 00:00:00 2001 From: r4d6 Date: Sun, 9 Feb 2020 07:21:47 -0500 Subject: [PATCH] Code update --- .../modules/mob/living/carbon/human/species_types/dwarves.dm | 4 +--- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index 0d3bbc0c74..15422b2cdd 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -58,18 +58,16 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // if(message[1] != "*") message = " [message]" //Credits to goonstation for the strings list. var/list/dwarf_words = strings("dwarf_replacement.json", "dwarf") //thanks to regex too. - for(var/key in dwarf_words) //Theres like 1459 words or something man. var/value = dwarf_words[key] //Thus they will always be in character. if(islist(value)) //Whether they like it or not. value = pick(value) //This could be drastically reduced if needed though. - message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]") message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]") message = replacetextEx(message, " [key]", " [value]") //Also its scottish. if(prob(3)) - message += pick(" By Armok!") + message += " By Armok!" speech_args[SPEECH_MESSAGE] = trim(message) //This mostly exists because my testdwarf's liver died while trying to also not die due to no alcohol. diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 1da676c0f6..ef15ae7e1b 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -725,11 +725,12 @@ All effects don't start immediately, but rather get worse over time; the rate is var/dorf_mode /datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/M) + var/real_dorf = is_species(H, /datum/species/dwarf) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE || is_species(H, /datum/species/dwarf))) + if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE || real_dorf) to_chat(H, "Now THAT is MANLY!") - if(is_species(H, /datum/species/dwarf)) + if(real_dorf) boozepwr = 100 // Don't want dwarves to die because of a low booze power else boozepwr = 5 //We've had worse in the mines