mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Merge pull request #4722 from AnymousUnknow/master
hide_body_part flags for markings, with supplied abnormal bodytype markings.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/datum/sprite_accessory/marking/ch
|
||||
icon = 'icons/mob/human_races/markings_ch.dmi'
|
||||
|
||||
/datum/sprite_accessory/marking/ch/orca_head
|
||||
name = "Orca head"
|
||||
icon_state = "orca_head"
|
||||
@@ -481,4 +482,4 @@
|
||||
name = "Spots, Outer"
|
||||
icon_state = "spots_extremities"
|
||||
body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
@@ -1176,7 +1176,7 @@
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
ckeys_allowed = list("prettiebyrd")
|
||||
|
||||
|
||||
/datum/sprite_accessory/tail/altevian
|
||||
name = "Altevian Tail"
|
||||
icon = 'icons/mob/vore/tails_vr.dmi'
|
||||
|
||||
@@ -618,4 +618,4 @@
|
||||
extra_overlay2 = "noodle_markings_2"
|
||||
suit_sprites = 'icons/mob/taursuits_noodle_vr.dmi'
|
||||
clip_mask_state = "taur_clip_mask_noodle"
|
||||
icon_sprite_tag = "noodle"
|
||||
icon_sprite_tag = "noodle"
|
||||
@@ -23,4 +23,4 @@
|
||||
icon = 'icons/mob/vore/wings_ch.dmi'
|
||||
icon_state = "snail_shell"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
@@ -131,7 +131,7 @@ var/global/list/limb_icon_cache = list()
|
||||
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
|
||||
limb_icon_cache[cache_key] = I
|
||||
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
|
||||
|
||||
|
||||
// VOREStation edit start
|
||||
if(nail_polish)
|
||||
var/icon/I = new(nail_polish.icon, nail_polish.icon_state)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
digitigrade = dna.digitigrade
|
||||
|
||||
if( !model && ( istype(src,/obj/item/organ/external/leg) || istype(src,/obj/item/organ/external/foot) ) ) //All leg icons go through here now.
|
||||
|
||||
|
||||
var/gender = "m"
|
||||
if(owner && owner.gender == FEMALE)
|
||||
gender = "f"
|
||||
@@ -43,7 +43,6 @@
|
||||
mob_icon = new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]")
|
||||
apply_colouration(mob_icon)
|
||||
else
|
||||
//Use digi icon if digitigrade, otherwise use regular icon. Ternary operator is based.
|
||||
mob_icon = new /icon(digitigrade ? species.icodigi : species.get_icobase(owner, (status & ORGAN_MUTATED)), "[icon_name][gender ? "_[gender]" : ""]")
|
||||
apply_colouration(mob_icon)
|
||||
|
||||
@@ -66,7 +65,7 @@
|
||||
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
|
||||
limb_icon_cache[cache_key] = I
|
||||
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
|
||||
|
||||
|
||||
// VOREStation edit start
|
||||
if(nail_polish)
|
||||
var/icon/I = new(nail_polish.icon, nail_polish.icon_state)
|
||||
|
||||
Reference in New Issue
Block a user