Merge pull request #820 from tigercat2000/Spraycans

Adds spraycans, fixes lipstick, modifies scleaner
This commit is contained in:
ZomgPonies
2015-04-16 16:39:19 -04:00
12 changed files with 112 additions and 43 deletions
@@ -24,6 +24,7 @@
var/b_skin = 0
var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
var/lip_color = "white"
var/age = 30 //Player's age (pure fluff)
var/b_type = "A+" //Player's bloodtype
@@ -332,6 +332,12 @@ proc/get_damage_icon_part(damage_state, body_part)
if(update_icons)
update_icons()
if(lip_style && species && species.flags & HAS_LIPS)
var/icon/lips = icon("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[lip_style]_s")
lips.Blend(lip_color, ICON_ADD)
stand_icon.Blend(lips, ICON_OVERLAY)
//tail
update_tail_showing(0)