diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 681a06b29dd..0baf1d2d19d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -320,6 +320,18 @@ ckeywhitelist = list("chaleur") character_name = list("Hisako Arato") +/datum/gear/fluff/perrin_robes + path = /obj/item/clothing/under/fluff/gildedrobe_perrin + display_name = "Perrin's Robes" + ckeywhitelist = list("codeme") + character_name = list("Perrin Kade") + +/datum/gear/fluff/perrin_shoes + path = /obj/item/clothing/shoes/fluff/gildedshoes_perrin + display_name = "Perrin's Shoes" + ckeywhitelist = list("codeme") + character_name = list("Perrin Kade") + /datum/gear/fluff/jade_stamp path = /obj/item/weapon/stamp/fluff/jade_horror display_name = "Official Council of Mid Horror rubber stamp" @@ -1114,6 +1126,12 @@ ckeywhitelist = list("stiphs") character_name = list("Lilith Vespers") +/datum/gear/fluff/greek_dress + path = /obj/item/clothing/under/fluff/greek_dress + display_name = "mytilenean Dress" + ckeywhitelist = list("sudate") + character_name = list("Shea Corbett") + /datum/gear/fluff/silent_mimemask path = /obj/item/clothing/mask/gas/sexymime display_name = "Silent Stripe's Mime Mask" @@ -1177,6 +1195,13 @@ ckeywhitelist = list("thedavestdave") character_name = list("Roy Tilton") +/datum/gear/fluff/lucky_amour + path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky + display_name = "Lucky's amour" + ckeywhitelist = list ("thedavestdave") + character_name = list("Lucky") + allowed_roles = list("Chaplain") + /datum/gear/fluff/monty_balaclava path = /obj/item/clothing/mask/balaclava display_name = "Monty's Balaclava" @@ -1438,16 +1463,3 @@ display_name = "Health Service Achievement medal" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") - -/datum/gear/fluff/lucky_amour - path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky - display_name = "Lucky's amour" - ckeywhitelist = list ("thedavestdave") - character_name = list("Lucky") - allowed_roles = list("Chaplain") - -/datum/gear/fluff/greek_dress - path = /obj/item/clothing/under/fluff/greek_dress - display_name = "mytilenean Dress" - ckeywhitelist = list("sudate") - character_name = list("Shea Corbett") diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index aa01f6c4654..fbe569af117 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -885,4 +885,11 @@ icon = 'icons/mob/human_races/markings_vr.dmi' icon_state = "altevian-incisors" color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) \ No newline at end of file + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr_eldritch_markings + name = "Eldritch Markings" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "perrinmarkings" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD,BP_L_ARM,BP_L_HAND,BP_R_ARM,BP_R_HAND,BP_L_LEG,BP_L_FOOT,BP_R_LEG,BP_R_FOOT) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index ec8b9c273db..bf8104862fa 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -1201,6 +1201,12 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/perrin_tentacles + name = "octopus tentacles (Perrin Kade)" + desc = "" + icon_state = "perrintentacles" + ckeys_allowed = list("codeme") + //LONG TAILS ARE NOT TAUR BUTTS >:O /datum/sprite_accessory/tail/longtail name = "You should not see this..." diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 0b167fe87e7..716b80b565f 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2511,6 +2511,7 @@ Departamental Swimsuits, for general use item_state = null // i swear to god this works - hatterhat icon_override = 'icons/vore/custom_onmob_vr.dmi' + //Sudate: Shea Corbett /obj/item/clothing/under/fluff/greek_dress name = "mytilenean dress" @@ -2525,6 +2526,7 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "greek_dress" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + //JadeManique: Freyr /obj/item/clothing/mask/fluff/freyr_mask name = "Freyr's Mask" @@ -2536,4 +2538,27 @@ Departamental Swimsuits, for general use item_state_slots = null body_parts_covered = FACE flags_inv = HIDEFACE - item_flags = FLEXIBLEMATERIAL \ No newline at end of file + item_flags = FLEXIBLEMATERIAL + +//codeme: Perrin Kade +/obj/item/clothing/shoes/fluff/gildedshoes_perrin + name = "gilded shoes" + desc = "Black shoes with gilding, revealing and comfortable for any wearer!" + + icon_state = "perrinshoes" + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_override = 'icons/vore/custom_onmob_vr.dmi' + +/obj/item/clothing/under/fluff/gildedrobe_perrin + name = "gilded robe" + desc = "Black robe with gilding, revealing and comfortable for any wearer!" + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "perrinrobes" + worn_state = "perrinrobes_s" + rolled_sleeves = 0 + rolled_down = 0 + + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "perrinrobes_s" + body_parts_covered = UPPER_TORSO|LOWER_TORSO \ No newline at end of file diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index ee1c196b379..19ae286fd93 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/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index 74b8d5fe60e..f3cf3be8255 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 4abd3696910..7c03befdfab 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index 68403c0974b..b401831f62d 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index a124b88c2f1..3b6b7fa7c59 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4025,6 +4025,7 @@ #include "code\modules\vore\eating\vorepanel_vr.dm" #include "code\modules\vore\fluffstuff\custom_boxes_vr.dm" #include "code\modules\vore\fluffstuff\custom_clothes_vr.dm" +#include "code\modules\vore\fluffstuff\custom_implants_vr.dm" #include "code\modules\vore\fluffstuff\custom_items_vr.dm" #include "code\modules\vore\fluffstuff\custom_mecha_vr.dm" #include "code\modules\vore\fluffstuff\custom_permits_vr.dm"