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

Species markings (#203)

Browse Source 
* Body markings

General Species because I give up trying to make each of them
species-specific.

* SAVE FILE UPDATE
This commit is contained in:
Poojawa
2017-02-06 04:57:48 -06:00
committed by GitHub
parent feb600fdc1
commit 17dac7f0b5
4 changed files with 91 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
+3 -3
View File
@@ -1,8 +1,8 @@
//This is the lowest supported version, anything below this is completely obsolete and the entire savefile will be wiped.
#define SAVEFILE_VERSION_MIN 10
#define SAVEFILE_VERSION_MIN 11
//This is the current version, anything below this will attempt to update (if it's not obsolete)
#define SAVEFILE_VERSION_MAX 17
#define SAVEFILE_VERSION_MAX 18
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
This proc checks if the current directory of the savefile S needs updating
@@ -157,7 +157,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(islist(S["be_special"]))
S["be_special"] >> be_special
else //force update and store the old bitflag version of be_special
needs_update = 11
needs_update = 12
S["be_special"] >> old_be_special
S["default_slot"] >> default_slot
code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+12 -9
View File
@@ -23,7 +23,7 @@ datum/species/canid
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" = "Belly", "mam_ears" = "Big Cat", "mam_tail" = "Big Cat", "taur" = "None")
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'
@@ -34,6 +34,7 @@ datum/species/canid
H.endTailWag()
//Mammal//
/* // Not needed, as markings and tails work fine
/datum/species/ailurus
name = "Ailurus"
id = "ailurus"
@@ -45,7 +46,7 @@ datum/species/canid
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
roundstart = 1
*/
/datum/species/capra
name = "Capra"
id = "capra"
@@ -79,9 +80,9 @@ datum/species/canid
name = "Hawk"
id = "hawk"
default_color = "BCAC9B"
species_traits = list(EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail")
default_features = list("wings" = "hawk")
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
mutant_bodyparts = list("mam_tail", "mam_body_markings")
default_features = list("wings" = "hawk", "mam_body_markings" = "hawk")
attack_verb = "peck"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -92,9 +93,9 @@ datum/species/canid
name = "Shark"
id = "shark"
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" = "shark")
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")
attack_verb = "bite"
attack_sound = 'sound/weapons/bite.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -105,7 +106,9 @@ datum/species/canid
name = "Moth"
id = "moth"
default_color = "BCAC9B"
species_traits = list(EYECOLOR,LIPS,HAIR)
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")
attack_verb = "flutter" //wat?
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
code/modules/mob/new_player/sprite_accessories_Citadel.dm
+76 -7
View File
@@ -347,8 +347,10 @@
*******************************************/
/datum/sprite_accessory/mam_body_markings
color_src = MUTCOLORS2
icon = 'icons/mob/mam_bodyparts.dmi'
extra = 1
extra2 = 1
icon = 'icons/mob/special/mam_body_markings.dmi'
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/none
name = "None"
@@ -359,12 +361,79 @@
icon_state = "belly"
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/bellyhandsfeet
name = "Belly, Hands, & Feet"
icon_state = "bellyhandsfeet"
gender_specific = 1
extra = 1
/datum/sprite_accessory/mam_body_markings/ailurus
name = "Red Panda"
icon_state = "ailurus"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/fox
name = "Fox"
icon_state = "fox"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/wolf
name = "Wolf"
icon_state = "wolf"
color_src = MUTCOLORS2
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/otie
name = "Otie"
icon_state = "otie"
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/cow
name = "Cow"
icon_state = "cow"
color_src = MUTCOLORS2
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/fennec
name = "Fennec"
icon_state = "Fennec"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/corvid
name = "Crow"
icon_state = "corvid"
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/tiger
name = "Tiger Stripes"
color_src = MUTCOLORS3
icon_state = "tiger"
/datum/sprite_accessory/mam_body_markings/husky
name = "Husky"
icon_state = "husky"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/shepherd
name = "Shepherd"
icon_state = "shepherd"
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/corgi
name = "Corgi"
icon_state = "corgi"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/datum/sprite_accessory/mam_body_markings/moth
name = "Moth"
icon_state = "moth"
color_src = MUTCOLORS2
extra_color_src = MUTCOLORS3
gender_specific = 1
/******************************************