Merge pull request #2514 from VOREStation/Cameron653-patch-1

Gives Reasonable Species Brutal Predation
This commit is contained in:
Spades
2017-11-25 23:46:23 -05:00
committed by GitHub
@@ -121,6 +121,7 @@
name_language = LANGUAGE_BIRDSONG
color_mult = 1
can_fly = 1
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
min_age = 18
max_age = 80
@@ -183,6 +184,7 @@
"You feel uncomfortably warm.",
"Your overheated skin itches."
)
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
/datum/species/fl_zorren
name = "Flatland Zorren"
@@ -214,6 +216,7 @@
flesh_color = "#AFA59E"
base_color = "#333333"
color_mult = 1
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
@@ -239,6 +242,7 @@
// gluttonous = 1
num_alternate_languages = 3
color_mult = 1
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \
dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \
@@ -292,6 +296,7 @@
"You feel uncomfortably warm.",
"Your chitin feels hot."
)
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
/datum/species/unathi
spawn_flags = SPECIES_CAN_JOIN //Species_can_join is the only spawn flag all the races get, so that none of them will be whitelist only if whitelist is enabled.
@@ -300,6 +305,7 @@
tail_animation = 'icons/mob/species/unathi/tail_vr.dmi'
color_mult = 1
min_age = 18
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
/datum/species/tajaran
spawn_flags = SPECIES_CAN_JOIN
@@ -309,6 +315,7 @@
color_mult = 1
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/carbon/human/proc/shred_limb)
/datum/species/skrell
spawn_flags = SPECIES_CAN_JOIN
@@ -331,6 +338,12 @@
push_flags = ~HEAVY //Allows them to use micro step code.
swap_flags = ~HEAVY
inherent_verbs = list(
/mob/living/carbon/human/proc/sonar_ping,
/mob/living/proc/hide,
/mob/living/carbon/human/proc/shred_limb
)
/datum/species/shapeshifter/promethean
spawn_flags = SPECIES_CAN_JOIN
@@ -348,6 +361,7 @@
min_age = 18
icobase = 'icons/mob/human_races/r_vox_old.dmi'
deform = 'icons/mob/human_races/r_def_vox_old.dmi'
inherent_verbs = list(/mob/living/carbon/human/proc/shred_limb)
datum/species/harpy
name = "Rapala"