cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

facepaint (#35286)

Browse Source
This commit is contained in:
jellyveggie2
2023-10-30 03:29:21 +01:00
committed by GitHub
parent b67f7dc6e9
commit 8eacc04c6f
8 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1913,6 +1913,7 @@
var/static/list/resettable_vars = list(
"lip_style",
"eye_style",
"face_style",
"wear_suit",
"w_uniform",
"shoes",

1
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -7,6 +7,7 @@
var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
var/eye_style = null
var/face_style = null
mob_bump_flag = HUMAN
mob_push_flags = ALLMOBS

16
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -277,12 +277,16 @@ var/global/list/damage_icon_parts = list()
eyes.Blend(rgb(my_appearance.r_eyes, my_appearance.g_eyes, my_appearance.b_eyes), ICON_ADD)
stand_icon.Blend(eyes, ICON_OVERLAY)
if (face_style)
stand_icon.Blend(new/icon('icons/mob/makeup.dmi', "facepaint_[face_style]_s"), ICON_OVERLAY)
//Mouth (lipstick!)
if(lip_style)
stand_icon.Blend(new/icon('icons/mob/hair_styles.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
stand_icon.Blend(new/icon('icons/mob/makeup.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
if(eye_style)
stand_icon.Blend(new/icon('icons/mob/hair_styles.dmi', "eyeshadow_[eye_style]_light_s"), ICON_OVERLAY)
stand_icon.Blend(new/icon('icons/mob/makeup.dmi', "eyeshadow_[eye_style]_light_s"), ICON_OVERLAY)
//Underwear
@@ -1494,11 +1498,15 @@ var/global/list/damage_icon_parts = list()
eyes_l.Blend(rgb(my_appearance.r_eyes, my_appearance.g_eyes, my_appearance.b_eyes), ICON_ADD)
face_lying.Blend(eyes_l, ICON_OVERLAY)
if (face_style)
stand_icon.Blend(new/icon('icons/mob/makeup.dmi', "facepaint_[face_style]_l"), ICON_OVERLAY)
if(lip_style)
face_lying.Blend(new/icon('icons/mob/hair_styles.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)
face_lying.Blend(new/icon('icons/mob/makeup.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)
if(eye_style)
face_lying.Blend(new/icon('icons/mob/hair_styles.dmi', "eyeshadow_[eye_style]_light_l"), ICON_OVERLAY)
face_lying.Blend(new/icon('icons/mob/makeup.dmi', "eyeshadow_[eye_style]_light_l"), ICON_OVERLAY)
var/image/face_lying_image = new /image(icon = face_lying)
return face_lying_image