Pulls #1706 from Skyrat (#18)

This commit is contained in:
Enric Gabriel
2020-07-02 02:20:27 -03:00
committed by GitHub
parent 9c5a13d6d7
commit 72f993fdbd
42 changed files with 432 additions and 51 deletions
@@ -429,6 +429,9 @@
if(humanc && CONFIG_GET(flag/roundstart_traits))
SSquirks.AssignQuirks(humanc, humanc.client, TRUE, FALSE, job, FALSE)
//skyrat change
if(humanc)
SSlanguage.AssignLanguage(humanc, humanc.client, TRUE, FALSE, job, FALSE)
log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)
@@ -108,6 +108,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
/// Our default override for typing indicator state
var/typing_indicator_state
//SKYRAT SNOWFLAKE
var/list/languagewhitelist = list()
///////////
// PROCS //
@@ -16,6 +16,7 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
exotic_bloodtype = "BUG"
exotic_blood_color = BLOOD_COLOR_BUG
languagewhitelist = list("Moffic", "Buggy") //Skyrat change - species language whitelist
/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
@@ -66,6 +66,7 @@
exotic_bloodtype = "X*"
damage_overlay_type = "xeno"
liked_food = MEAT
languagewhitelist = list("Xenomorph")
//Praise the Omnissiah, A challange worthy of my skills - HS
@@ -23,6 +23,7 @@
exotic_blood_color = BLOOD_COLOR_OIL
var/datum/action/innate/monitor_change/screen
languagewhitelist = list("Encoded Audio Language") //Skyrat change - species language whitelist
/datum/species/ipc/on_species_gain(mob/living/carbon/human/C)
if(isipcperson(C) && !screen)
@@ -22,6 +22,7 @@
coldmod = 6 // = 3x cold damage
heatmod = 0.5 // = 1/4x heat damage
burnmod = 0.5 // = 1/2x generic burn damage
languagewhitelist = list("Slime") //Skyrat change - species language whitelist
species_language_holder = /datum/language_holder/jelly
/datum/species/jelly/on_species_loss(mob/living/carbon/C)
@@ -25,6 +25,7 @@
disliked_food = GRAIN | DAIRY
liked_food = GROSS | MEAT
inert_mutation = FIREBREATH
languagewhitelist = list("Draconic") //Skyrat change - species language whitelist
species_language_holder = /datum/language_holder/lizard
/datum/species/lizard/random_name(gender,unique,lastname)
@@ -23,6 +23,7 @@
mutanteyes = /obj/item/organ/eyes/night_vision/mushroom
var/datum/martial_art/mushpunch/mush
languagewhitelist = list("Mushroom") //Skyrat change - species language whitelist
species_language_holder = /datum/language_holder/mushroom
/datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species)
@@ -21,6 +21,7 @@
disliked_food = FRUIT
liked_food = VEGETABLES
outfit_important_for_life = /datum/outfit/plasmaman
languagewhitelist = list("Calcic") //Skyrat change - species language whitelist
/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
var/datum/gas_mixture/environment = H.loc.return_air()
@@ -18,6 +18,7 @@
var/light_oxyheal = -1
var/light_burnheal = -1
var/light_bruteheal = -1
languagewhitelist = list("Sylvan") //Skyrat change - species language whitelist
/datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
. = ..()
@@ -14,6 +14,7 @@
dangerous_existence = 1
mutanteyes = /obj/item/organ/eyes/night_vision
languagewhitelist = list("Shadowtongue") //Skyrat change - species language whitelist
/datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
. = ..()
@@ -16,6 +16,7 @@
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
languagewhitelist = list("Encoded Audio Language")
exotic_bloodtype = "S"
exotic_blood_color = BLOOD_COLOR_OIL