diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index eed0ab0cdcc..10855702ec0 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -858,12 +858,18 @@ /mob/living/carbon/human/proc/create_silk() + set name = "Create Silk Cocoon" + set desc = "Creates a silk cocoon! If you are holding someone, you will wrap them up in it." + set category = "Abilities" + + if(world.time < last_special) + return + var/mob/living/carbon/human/O = src var/obj/item/weapon/grab/G = src.get_active_hand() last_special = world.time + 600 //60 seconds. You don't get if(!istype(G)) - var/silk_path = /obj/structure/closet/body_bag/chirret - new silk_path(O) //For modifications in the future. + new /obj/structure/closet/body_bag/chirret(src.loc) to_chat(O, "You create a soft silk cocoon!") O.visible_message("[O] creates a soft silk cocoon!") return @@ -873,7 +879,7 @@ if(do_after(O, 200, T)) //20 seconds to cocoon someone. if(!Adjacent(T)) return var/silk_path = /obj/structure/closet/body_bag/chirret - var/obj/structure/closet/body_bag/chirret/chirrret_silk = new silk_path(O) + var/obj/structure/closet/body_bag/chirret/chirrret_silk = new /obj/structure/closet/body_bag/chirret(src.loc) T.forceMove(chirrret_silk) //Put them in the body bag! to_chat(T, "You're encased in a soft silk cocoon by [O]!") to_chat(O, "You encase [T] in a soft silk cocoon!") diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 2c2fb6d7e41..aa7df7debd5 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -333,7 +333,7 @@ num_alternate_languages = 3 secondary_langs = list("Sol Common") - //color_mult = 1 + color_mult = 1 tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite" icobase_tail = 1 inherent_verbs = list( diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 886f36a7408..ea8153500c3 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -74,6 +74,7 @@ var/obj/machinery/hologram/holopad/T = src.holo if(T && T.masters[src])//If there is a hologram and its master is the user. var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages + if(!hologram) return //VOREStation edit. I keep getting compile warnings because of this! //Human-like, sorta, heard by those who understand humans. var/rendered_a //Speech distorted, heard by those who do not understand AIs. diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index aceeeaf1e57..82a008deaa0 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -731,21 +731,25 @@ name = "Chirret Cheeks" icon_state = "chirret_cheeks" body_parts = list(BP_HEAD) + color_blend_mode = ICON_MULTIPLY - chirret_cheeks + chirret_claws name = "Chirret Claws" icon_state = "chirret_claws" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + color_blend_mode = ICON_MULTIPLY chirret_face_and_belly_v1 name = "Chirret Face and Belly Variant 1" icon_state = "chirret_fb_1" - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + body_parts = list(BP_HEAD,BP_GROIN,BP_TORSO,BP_R_LEG,BP_L_LEG) + color_blend_mode = ICON_MULTIPLY chirret_face_and_belly_v2 name = "Chirret Face and Belly Variant 2" icon_state = "chirret_fb_2" - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + body_parts = list(BP_HEAD,BP_GROIN,BP_TORSO,BP_R_LEG,BP_L_LEG) + color_blend_mode = ICON_MULTIPLY harpy_feathers name = "Rapala leg Feather" diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index d9bc8adcb7e..6ac88941933 100644 Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ diff --git a/icons/mob/species/chirret/helmet_vr.dmi b/icons/mob/species/chirret/helmet_vr.dmi new file mode 100644 index 00000000000..320a6cef91c Binary files /dev/null and b/icons/mob/species/chirret/helmet_vr.dmi differ diff --git a/icons/mob/species/chirret/mask_vr.dmi b/icons/mob/species/chirret/mask_vr.dmi new file mode 100644 index 00000000000..bbe1b658d52 Binary files /dev/null and b/icons/mob/species/chirret/mask_vr.dmi differ diff --git a/icons/mob/species/chirret/suit_vr.dmi b/icons/mob/species/chirret/suit_vr.dmi new file mode 100644 index 00000000000..45805104661 Binary files /dev/null and b/icons/mob/species/chirret/suit_vr.dmi differ diff --git a/icons/mob/species/chirret/tail.dmi b/icons/mob/species/chirret/tail.dmi new file mode 100644 index 00000000000..d514cf37775 Binary files /dev/null and b/icons/mob/species/chirret/tail.dmi differ diff --git a/icons/obj/bodybag_vr.dmi b/icons/obj/bodybag_vr.dmi index c5310e4b846..911f77f8b2c 100644 Binary files a/icons/obj/bodybag_vr.dmi and b/icons/obj/bodybag_vr.dmi differ