Artur
2020-04-06 13:24:52 +03:00
parent f26f0c2555
commit c402c6dc30
2 changed files with 9 additions and 14 deletions

View File

@@ -706,7 +706,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
name = "\improper E-Cigarette"
desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that.
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "blaVape" //We cant have a null icon state due to the vendor spritesheet
icon_state = "black_vape"
item_state = null
w_class = WEIGHT_CLASS_TINY
var/chem_volume = 100

View File

@@ -187,11 +187,11 @@
/obj/item/clothing/head/wig
name = "wig"
desc = "A bunch of hair without a head attached."
icon_state = "pwig"
item_state = "pwig"
icon = 'icons/mob/human_face.dmi' // default icon for all hairs
icon_state = "hair_vlong"
flags_inv = HIDEHAIR
color = "#000"
var/hair_style = "Very Long Hair"
var/hair_color = "#000"
/obj/item/clothing/head/wig/Initialize(mapload)
. = ..()
@@ -203,14 +203,9 @@
if(!S)
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "pwig"
/obj/item/clothing/head/wig/update_overlays()
. = ..()
var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
if(S)
var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state, color = hair_color)
M.appearance_flags |= RESET_COLOR
. += M
else
icon = S.icon
icon_state = S.icon_state
/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
. = list()
@@ -220,12 +215,12 @@
return
var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state,layer = -HAIR_LAYER)
M.appearance_flags |= RESET_COLOR
M.color = hair_color
M.color = color
. += M
/obj/item/clothing/head/wig/random/Initialize(mapload)
hair_style = pick(GLOB.hair_styles_list - "Bald") //Don't want invisible wig
hair_color = "#[random_short_color()]"
color = "#[random_short_color()]"
. = ..()
/obj/item/clothing/head/bronze