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

Merge pull request #8220 from Poojawa/master

Browse Source 
fixes floaty-leg syndrome for xenos and random color issues
This commit is contained in:
kevinz000
2019-04-07 15:13:00 -07:00
committed by GitHub
parent 8efa2cacc9 3af678fc23
commit a4a1f77c0f
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+1 -1
View File
@@ -1256,7 +1256,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/none
name = "None"
icon_state = "none"
color_src = MUTCOLORS
ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme")
/datum/sprite_accessory/mam_body_markings/plain
name = "Plain"
modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+3 -3
View File
@@ -195,10 +195,10 @@
say_mod = "hisses"
default_color = "00FF00"
should_draw_citadel = TRUE
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur")
default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None")
mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs")
default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade Legs")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'