shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
LetterJay
2017-02-07 17:50:29 -06:00
parent a432886ba3 356abcd2e5
commit b24808f39a
10 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+34 -83
View File
@@ -1,9 +1,8 @@
datum/species/canid
name = "Canid"
id = "canid"
datum/species/mammal
name = "Mammal"
id = "mammal"
default_color = "4B4B4B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
// subspecies = list("fox")
mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "snout", "legs", "taur")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "body_markings" = "None", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "None", "taur" = "None")
attack_verb = "claw"
@@ -15,52 +14,6 @@ datum/species/canid
if(H)
H.endTailWag()
//FELID//
/datum/species/felid
name = "Felid"
id = "felid"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "snout", "legs", "taur")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "Tajaran", "mam_ears" = "Big Cat", "mam_tail" = "Big Cat", "taur" = "None")
attack_verb = "claw"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1 //no sprites yet
/datum/species/tajaran/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
//Mammal//
/* // Not needed, as markings and tails work fine
/datum/species/ailurus
name = "Ailurus"
id = "ailurus"
default_color = "4B4B4B"
species_traits = list(EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "ailurus")
attack_verb = "claw"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1
*/
/datum/species/capra
name = "Capra"
id = "capra"
default_color = "4B4B4B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "capra")
attack_verb = "claw"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1
//AVIAN//
/datum/species/avian
@@ -68,52 +21,49 @@ datum/species/canid
id = "avian"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("beak", "wings", "avian_tail", "taur")
default_features = list("beak" = "None", "wings" = "None", "taur" = "None")
attack_verb = "peck"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 0 //no sprites yet
blacklisted = 1
/datum/species/avian
name = "Hawk"
id = "hawk"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail", "mam_body_markings")
default_features = list("wings" = "hawk", "mam_body_markings" = "hawk")
mutant_bodyparts = list("snout", "wings", "taur", "mam_tail", "mam_body_markings")
default_features = list("snout" = "Sharp", "wings" = "None", "taur" = "None", "mam_body_markings" = "Hawk")
attack_verb = "peck"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1
/datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
//AQUATIC//
/datum/species/shark
name = "Shark"
id = "shark"
/datum/species/aquatic
name = "Aquatic"
id = "aquatic"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail", "mam_body_markings")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "shark", "mam_body_markings" = "None")
mutant_bodyparts = list("mam_tail", "mam_body_markings", "mam_ears")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "shark", "mam_body_markings" = "None", "mam_ears" = "None")
attack_verb = "bite"
attack_sound = 'sound/weapons/bite.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1 //no sprites yet
roundstart = 1
/datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
//INSECT//
/datum/species/moth
name = "Moth"
id = "moth"
/datum/species/insect
name = "Insect"
id = "insect"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_body_markings")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "moth")
mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "moth", "mam_tail" = "None", "mam_ears" = "None")
attack_verb = "flutter" //wat?
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1 //no sprites yet
roundstart = 1
/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
//HERBIVOROUS//
@@ -203,14 +153,14 @@ datum/species/canid
/datum/species/yautja/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
var/datum/outfit/yautja_basic/O = new /datum/outfit/yautja_basic//Just basic gear. Doesn't include anything that gives any meaningful advantage.
H.equipOutfit(O, visualsOnly)
return 0*/
return 0
/datum/species/octopus
blacklisted = 1
/datum/species/carp
blacklisted = 1
/datum/species/horse
blacklisted = 1
blacklisted = 1*/
///////////////////
//DONATOR SPECIES//
@@ -228,18 +178,19 @@ datum/species/canid
mutant_bodyparts = list("slimecoontail", "slimecoonears", "slimecoonsnout")
default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")*/
// Fat Shark <3
/datum/species/shark/datashark
name = "DataShark"
id = "datashark"
default_color = "BCAC9B"
species_traits = list(EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "datashark")
species_traits = list(MUTCOLORS_PARTSONLY,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail", "mam_body_markings")
default_features = list("mam_tail" = "datashark", "mam_body_markings" = "None")
attack_verb = "bite"
attack_sound = 'sound/weapons/bite.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1 //no sprites yet
// roundstart = 1
whitelisted = 1
whitelist = list("rubyflamewing")
blacklisted = 0