Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Removes defunct bodyhair system - should use markings instead. #301

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[MIRROR] Removes defunct bodyhair system - should use markings instead. #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af689c
Merge pull request #1052 from MistakeNot4892/bodyhair
afterthought2 Dec 20, 2020
9e1fef4
Removes defunct bodyhair system - should use markings instead.
SkyratBot Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions code/modules/mob/living/carbon/human/update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,6 @@ var/global/list/damage_icon_parts = list()
if(part.skin_colour)
icon_key += "[part.skin_colour]"
icon_key += "[part.skin_blend]"
if(part.body_hair && part.hair_colour)
icon_key += "[part.hair_colour]"
else
icon_key += COLOR_BLACK
for(var/M in part.markings)
icon_key += "[M][part.markings[M]["color"]]"
if(BP_IS_PROSTHETIC(part))
Expand Down
1 change: 0 additions & 1 deletion code/modules/organs/external/_external.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
var/skin_colour // skin colour
var/skin_blend = ICON_ADD // How the skin colour is applied.
var/hair_colour // hair colour
var/body_hair // Icon blend for body hair if any.
var/list/markings = list() // Markings (body_markings) to apply to the icon

// Wound and structural data.
Expand Down
8 changes: 0 additions & 8 deletions code/modules/organs/external/_external_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,6 @@ var/list/limb_icon_cache = list()
mob_icon.Blend(mark_s, mark_style.layer_blend) //So when it's on your body, it has icons
icon_cache_key += "[M][markings[M]["color"]]"

if(body_hair && hair_colour)
var/cache_key = "[body_hair]-[icon_name]-[hair_colour]"
if(!limb_icon_cache[cache_key])
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
I.Blend(hair_colour, ICON_ADD)
limb_icon_cache[cache_key] = I
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)

set_dir(EAST, TRUE)
icon = mob_icon

Expand Down