diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d122a7f9777..d2fc328a468 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -78,21 +78,22 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
#define SUIT_STORE_LAYER 17 //Suit storage-slot item
#define BACK_LAYER 18 //Back-slot item
#define HAIR_LAYER 19 //The human's hair
-#define EARS_LAYER 20 //Both ear-slot items (combined image)
-#define EYES_LAYER 21 //Mob's eyes (used for glowing eyes)
-#define FACEMASK_LAYER 22 //Mask-slot item
-#define HEAD_LAYER 23 //Head-slot item
-#define HANDCUFF_LAYER 24 //Handcuffs, if the human is handcuffed, in a secret inv slot
-#define LEGCUFF_LAYER 25 //Same as handcuffs, for legcuffs
-#define L_HAND_LAYER 26 //Left-hand item
-#define R_HAND_LAYER 27 //Right-hand item
-#define WING_LAYER 28 //VOREStation edit. Simply move this up a number if things are added.
-#define TAIL_LAYER_ALT 29 //VOREStation edit. Simply move this up a number if things are added.
-#define MODIFIER_EFFECTS_LAYER 30 //Effects drawn by modifiers
-#define FIRE_LAYER 31 //'Mob on fire' overlay layer
-#define WATER_LAYER 32 //'Mob submerged' overlay layer
-#define TARGETED_LAYER 33 //'Aimed at' overlay layer
-#define TOTAL_LAYERS 33 //VOREStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
+#define HAIR_ACCESSORY_LAYER 20 //VOREStation edit. Simply move this up a number if things are added.
+#define EARS_LAYER 21 //Both ear-slot items (combined image)
+#define EYES_LAYER 22 //Mob's eyes (used for glowing eyes)
+#define FACEMASK_LAYER 23 //Mask-slot item
+#define HEAD_LAYER 24 //Head-slot item
+#define HANDCUFF_LAYER 25 //Handcuffs, if the human is handcuffed, in a secret inv slot
+#define LEGCUFF_LAYER 26 //Same as handcuffs, for legcuffs
+#define L_HAND_LAYER 27 //Left-hand item
+#define R_HAND_LAYER 28 //Right-hand item
+#define WING_LAYER 29 //VOREStation edit. Simply move this up a number if things are added.
+#define TAIL_LAYER_ALT 30 //VOREStation edit. Simply move this up a number if things are added.
+#define MODIFIER_EFFECTS_LAYER 31 //Effects drawn by modifiers
+#define FIRE_LAYER 32 //'Mob on fire' overlay layer
+#define WATER_LAYER 33 //'Mob submerged' overlay layer
+#define TARGETED_LAYER 34 //'Aimed at' overlay layer
+#define TOTAL_LAYERS 35 //VOREStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
//////////////////////////////////
/mob/living/carbon/human
@@ -455,13 +456,34 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
var/icon/ears_s = get_ears_overlay()
if(ears_s)
face_standing.Blend(ears_s, ICON_OVERLAY)
+ to_chat(src, "getting hair accessory...")
var/icon/hair_acc_s = get_hair_accessory_overlay()
+ var/image/hair_acc_s_image = null
+ to_chat(src, "checking for hair_acc_s...")
if(hair_acc_s)
- face_standing.Blend(hair_acc_s, ICON_OVERLAY)
+ to_chat(src, "hair_acc_s found!")
+ if(hair_accessory_style.ignores_lighting)
+ to_chat(src, "setting image and plane...")
+ hair_acc_s_image = image(hair_acc_s)
+ hair_acc_s_image.plane = PLANE_LIGHTING_ABOVE
+ hair_acc_s_image.appearance_flags = appearance_flags
if(istype(head_organ,/obj/item/organ/external/head/vr))
var/obj/item/organ/external/head/vr/head_organ_vr = head_organ
overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset)
apply_layer(HAIR_LAYER)
+ to_chat(src, "checking for hair_acc_s in the head organ check...")
+ if(hair_acc_s)
+ to_chat(src, "hair_acc_s found!")
+ to_chat(src, "checking for hair_acc_s_image...")
+ if (hair_acc_s_image)
+ to_chat(src, "hair_acc_s_image found!")
+ overlays_standing[HAIR_ACCESSORY_LAYER] = hair_acc_s_image
+ apply_layer(HAIR_ACCESSORY_LAYER)
+ return
+ to_chat(src, "no hair_acc_s_image! wat.")
+ overlays_standing[HAIR_ACCESSORY_LAYER] = hair_acc_s
+ to_chat(src, "applying hair_acc_s!")
+ apply_layer(HAIR_ACCESSORY_LAYER)
return
// VOREStation Edit - END
diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm
index 03b0b3c7402..b8fb21f261f 100644
--- a/code/modules/vore/appearance/sprite_accessories_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_vr.dm
@@ -2036,7 +2036,7 @@
/datum/sprite_accessory/hair_accessory
name = "You should not see this..."
- icon = 'icons/mob/vore/hair_accessories.dmi'
+ icon = 'icons/mob/vore/hair_accessories_vr.dmi'
do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color
var/ignores_lighting = 0 // Whether or not this hair accessory will ignore lighting and glow in the dark.
@@ -2046,9 +2046,8 @@
var/desc = "You should not see this..."
/datum/sprite_accessory/hair_accessory/verie_hair_glow
-
name = "verie's hair glow"
desc = ""
icon_state = "verie_hair_glow"
ignores_lighting = 1
- ckeys_allowed = list("vitoras") // This probably won't come into play EVER but better safe than sorry
\ No newline at end of file
+ //ckeys_allowed = list("vitoras") // This probably won't come into play EVER but better safe than sorry
\ No newline at end of file
diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm
index b85b06aa63c..55d76332b43 100644
--- a/code/modules/vore/appearance/update_icons_vr.dm
+++ b/code/modules/vore/appearance/update_icons_vr.dm
@@ -21,55 +21,29 @@ var/global/list/wing_icon_cache = list()
return null
/mob/living/carbon/human/proc/get_hair_accessory_overlay()
+ to_chat(src, "starting get_hair_accessory_overlay()...")
if(hair_accessory_style && !(head && (head.flags_inv & BLOCKHEADHAIR)))
- if(hair_accessory_style.ignores_lighting)
- var/image/hair_acc_s = get_hair_accessory_glow_image()
- hair_acc_s.plane = PLANE_LIGHTING_ABOVE
- return hair_acc_s
- else
- var/icon/hair_acc_s = get_hair_accessory_icon()
- return hair_acc_s
-
+ to_chat(src, "found hair accessory style! and ur head's intact. nice")
+ var/icon/hair_acc_s = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.icon_state)
+ to_chat(src, "hair_acc_s set!")
+ if(hair_accessory_style.do_colouration)
+ hair_acc_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), hair_accessory_style.color_blend_mode)
+
+ if(hair_accessory_style.extra_overlay)
+ var/icon/overlay = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay)
+ overlay.Blend(rgb(src.r_ears2, src.g_ears2, src.b_ears2), hair_accessory_style.color_blend_mode)
+ hair_acc_s.Blend(overlay, ICON_OVERLAY)
+ qdel(overlay)
+
+ if(hair_accessory_style.extra_overlay2) //MORE COLOURS IS BETTERER
+ var/icon/overlay = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay2)
+ overlay.Blend(rgb(src.r_ears3, src.g_ears3, src.b_ears3), hair_accessory_style.color_blend_mode)
+ hair_acc_s.Blend(overlay, ICON_OVERLAY)
+ qdel(overlay)
+ to_chat(src, "get_hair_accessory_overlay() completed!")
+ return hair_acc_s
return null
-/mob/living/carbon/human/proc/get_hair_accessory_icon()
- var/icon/hair_acc_s = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.icon_state)
- if(hair_accessory_style.do_colouration)
- hair_acc_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), hair_accessory_style.color_blend_mode)
-
- if(hair_accessory_style.extra_overlay)
- var/icon/overlay = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay)
- overlay.Blend(rgb(src.r_ears2, src.g_ears2, src.b_ears2), hair_accessory_style.color_blend_mode)
- hair_acc_s.Blend(overlay, ICON_OVERLAY)
- qdel(overlay)
-
- if(hair_accessory_style.extra_overlay2) //MORE COLOURS IS BETTERER
- var/icon/overlay = new/icon("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay2)
- overlay.Blend(rgb(src.r_ears3, src.g_ears3, src.b_ears3), hair_accessory_style.color_blend_mode)
- hair_acc_s.Blend(overlay, ICON_OVERLAY)
- qdel(overlay)
- return hair_acc_s
-
-/mob/living/carbon/human/proc/get_hair_accessory_glow_image()
- var/image/hair_acc_s = new/image("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.icon_state)
- if(hair_accessory_style.do_colouration)
- hair_acc_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), hair_accessory_style.color_blend_mode)
- hair_accessory_style.plane = PLANE_LIGHTING_ABOVE
-
- if(hair_accessory_style.extra_overlay)
- var/image/overlay = new/image("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay)
- overlay.Blend(rgb(src.r_ears2, src.g_ears2, src.b_ears2), hair_accessory_style.color_blend_mode)
- overlay.plane = PLANE_LIGHTING_ABOVE
- hair_acc_s.Blend(overlay, ICON_OVERLAY)
- qdel(overlay)
-
- if(hair_accessory_style.extra_overlay2) //MORE COLOURS IS BETTERER
- var/image/overlay = new/image("icon" = hair_accessory_style.icon, "icon_state" = hair_accessory_style.extra_overlay2)
- overlay.Blend(rgb(src.r_ears3, src.g_ears3, src.b_ears3), hair_accessory_style.color_blend_mode)
- overlay.plane = PLANE_LIGHTING_ABOVE
- hair_acc_s.Blend(overlay, ICON_OVERLAY)
- qdel(overlay)
- return hair_acc_s
/mob/living/carbon/human/proc/get_tail_image()
//If you are FBP with tail style and didn't set a custom one
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 30b736805c2..fbe9e2d92c0 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2258,7 +2258,7 @@ Departamental Swimsuits, for general use
// If you ain't the robutt, you probably don't have the hair style that the hooded icon states are made for. sorry!
var/mob/living/carbon/human/H = src.loc
if (H.ckey != "vitoras")
- to_user(H, "Strange... the hood doesn't go over your head no matter how you try to put it up.")
+ to_chat(H, "Strange... the hood doesn't go over your head no matter how you try to put it up.")
return
..()
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index da569a1476f..57102f0486c 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1364,8 +1364,9 @@
POSITRONICS IN A MODEL E CHASSIS.\""
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "verie_brush"
+ w_class = ITEMSIZE_TINY
- var/owner = "vitoras"
+ var/owner = "ryumi"
/obj/item/weapon/fluff/verie/attack_self(mob/living/carbon/human/user)
if (istype(user))
@@ -1379,8 +1380,10 @@
user.update_hair()
user.visible_message("[user] combs her hair. \The [src] leaves behind glowing cyan highlights as it passes through \
her black strands.", \
- "You brush your hair. The teeth react to your nanites and stimulate them into giving off a brillian cyan glow!")
- return
+ "You brush your hair. \The [src]'s teeth begin to vibrate and glow as they react to your nanites. \
+ The teeth stimulate the nanites in your hair strands until your hair give off a brilliant, faintly pulsing \
+ cyan glow!")
+
else
to_chat(user, "\The [src] isn't compatible with your body as it is now.")