Merge pull request #4867 from Novacat/nova-survival

Species Tweaks
This commit is contained in:
Spades
2019-03-30 09:58:29 -04:00
committed by GitHub
6 changed files with 40 additions and 20 deletions
@@ -66,6 +66,7 @@
base_color = "#333333"
blood_color = "#14AD8B"
reagent_tag = IS_CHIMERA
/datum/species/xenochimera/handle_environment_special(var/mob/living/carbon/human/H)
//If they're KO'd/dead, they're probably not thinking a lot about much of anything.
@@ -37,8 +37,6 @@
flesh_color = "#AFA59E"
base_color = "#777777"
reagent_tag = IS_SERGAL
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
@@ -99,8 +97,6 @@
base_color = "#777777"
blood_color = "#1D2CBF"
reagent_tag = IS_AKULA
/datum/species/akula/can_breathe_water()
return TRUE // Surprise, SHERKS.
@@ -140,8 +136,6 @@
flesh_color = "#AFA59E"
base_color = "#333333"
reagent_tag = IS_SERGAL
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
@@ -319,7 +313,7 @@
min_age = 18
gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm
inherent_verbs = list(/mob/living/proc/shred_limb)
heat_discomfort_level = 294 //Prevents heat discomfort spam at 20c
heat_discomfort_level = 295 //Prevents heat discomfort spam at 20c
/datum/species/skrell
spawn_flags = SPECIES_CAN_JOIN
@@ -209,6 +209,31 @@
icon_state = "hair_messy"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_curls
name = "Tajaran Curly"
icon_state = "hair_curly"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_wife
name = "Tajaran Housewife"
icon_state = "hair_wife"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_victory
name = "Tajaran Victory Curls"
icon_state = "hair_victory"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_bob
name = "Tajaran Bob"
icon_state = "hair_tbob"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
taj_ears_fingercurl
name = "Tajaran Finger Curls"
icon_state = "hair_fingerwave"
species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN)
teshari_fluffymohawk
name = "Teshari Fluffy Mohawk"
icon = 'icons/mob/human_face_vr.dmi'