cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 21:16:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked some things around teshari bug.

Browse Source 
Added in minimap images :3
This commit is contained in:
AnonymousHybi
2018-03-26 15:33:26 +01:00
parent 49802ea6a8
commit 8979d933b1
13 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+13 -16
View File
@@ -51,14 +51,14 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/head/get_icon()
..()
//The overlays are not drawn on the mob, they are used for if the head is removed and becomes an item
cut_overlays()
//Every 'addon' below requires information from species
if(!owner || !owner.species)
return
//Eye color/icon
var/should_have_eyes = owner.should_have_organ(O_EYES)
var/has_eye_color = owner.species.appearance_flags & HAS_EYE_COLOR
@@ -78,7 +78,7 @@ var/global/list/limb_icon_cache = list()
eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD)
add_overlay(eyes_icon)
mob_icon.Blend(eyes_icon, ICON_OVERLAY)
//Lip color/icon
if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS)))
var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")
@@ -159,12 +159,10 @@ var/global/list/limb_icon_cache = list()
icon_cache_key += "[M][markings[M]["color"]]"
if(body_hair && islist(h_col) && h_col.len >= 3)
var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]"
if(!limb_icon_cache[cache_key])
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
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)
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
mob_icon.Blend(I, ICON_OVERLAY)
icon_cache_key += "[body_hair][rgb(h_col[1],h_col[2],h_col[3])]"
if(model)
icon_cache_key += "_model_[model]"
@@ -179,12 +177,11 @@ var/global/list/limb_icon_cache = list()
icon_cache_key += "[M][markings[M]["color"]]"
if(body_hair && islist(h_col) && h_col.len >= 3)
var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]"
if(!limb_icon_cache[cache_key])
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
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)
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
mob_icon.Blend(I, ICON_OVERLAY)
icon_cache_key += "[body_hair][rgb(h_col[1],h_col[2],h_col[3])]"
// VOREStation edit ends here
dir = EAST
code/modules/organs/subtypes/seromi.dm
+4 -4
View File
@@ -1,8 +1,8 @@
/obj/item/organ/external/foot/seromi
body_hair = "feathers"
//body_hair = "feathers"
/obj/item/organ/external/foot/right/seromi
body_hair = "feathers"
//body_hair = "feathers"
/obj/item/organ/external/hand/seromi
body_hair = "feathers"
//body_hair = "feathers"
/obj/item/organ/external/hand/right/seromi
body_hair = "feathers"
//body_hair = "feathers"