From b379b08551131e43aa9c190b7fc1291f33128a47 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sun, 20 Jun 2021 17:40:00 +0000 Subject: [PATCH] Pandora029 fluff item --- .../loadout/loadout_fluffitems_vr.dm | 6 + .../vore/fluffstuff/custom_clothes_vr.dm | 139 ++++++++++++++++++ 2 files changed, 145 insertions(+) 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 81f430e47b..b20401ab57 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -691,6 +691,12 @@ ckeywhitelist = list("pimientopyro") character_name = list("Zaku Fyodorovna") +/datum/gear/fluff/evelyn_coat + path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/ + display_name = "warden's navy winter coat" + ckeywhitelist = list("pandora029") + character_name = list("Evelyn Tareen") + /datum/gear/fluff/lily_medal path = /obj/item/clothing/accessory/medal/silver/unity display_name = "Lily's Unity Medal" diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 0550100a38..ca1692eacb 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2287,3 +2287,142 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET|ARMS|HANDS End CHOMP Removal*/ +<<<<<<< HEAD +||||||| parent of 89ed203456... Merge pull request #10635 from PastelPrinceDan/pandoracoat +//PastelPrinceDan: Kiyoshi Maki +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing + name = "glowing cloak" + desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + var/is_dark = FALSE + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/equipped() + ..() + var/mob/living/carbon/human/H = loc + if(istype(H) && H.wear_suit == src) + icon_override = 'icons/vore/custom_onmob_vr.dmi' + update_clothing_icon() + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped() + icon_override = 'icons/vore/custom_onmob_vr.dmi' + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user) + if(user.canmove && !user.stat) + src.is_dark = !src.is_dark + if (src.is_dark) + icon_state = "rgbd" + item_state = "rgbd" + overlay_state = "rgbd" + to_chat(user, "The polychromic plates in your cloak activate, turning it black.") + else + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + to_chat(user, "The polychromic plates in your cloak activate, turning it white.") + has_suit.update_clothing_icon() + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/verb/color_verb() + set name = "Swap color" + set category = "Object" + set src in usr + if(!istype(usr, /mob/living)) return + if(usr.stat) return + + colorswap(usr) +======= +//PastelPrinceDan: Kiyoshi Maki +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing + name = "glowing cloak" + desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + var/is_dark = FALSE + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/equipped() + ..() + var/mob/living/carbon/human/H = loc + if(istype(H) && H.wear_suit == src) + icon_override = 'icons/vore/custom_onmob_vr.dmi' + update_clothing_icon() + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped() + icon_override = 'icons/vore/custom_onmob_vr.dmi' + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user) + if(user.canmove && !user.stat) + src.is_dark = !src.is_dark + if (src.is_dark) + icon_state = "rgbd" + item_state = "rgbd" + overlay_state = "rgbd" + to_chat(user, "The polychromic plates in your cloak activate, turning it black.") + else + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + to_chat(user, "The polychromic plates in your cloak activate, turning it white.") + has_suit.update_clothing_icon() + +/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/verb/color_verb() + set name = "Swap color" + set category = "Object" + set src in usr + if(!istype(usr, /mob/living)) return + if(usr.stat) return + + colorswap(usr) + +//Pandora029 : Evelyn Tareen +/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn + name = "warden's navy winter coat" + desc = "A custom tailored security winter coat in navy blue colors, this one has the rank markings of a warden on it." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "evelyncoat" + + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "evelyncoat_mob" + +/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/ui_action_click() + ToggleHood_evelyn() + +/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/equipped(mob/user, slot) + if(slot != slot_wear_suit) + RemoveHood_evelyn() + ..() + +/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/proc/RemoveHood_evelyn() + icon_state = "evelyncoat" + item_state = "evelyncoat_mob" + hood_up = 0 + if(ishuman(hood.loc)) + var/mob/living/carbon/H = hood.loc + H.unEquip(hood, 1) + H.update_inv_wear_suit() + hood.loc = src + +/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/proc/ToggleHood_evelyn() + if(!hood_up) + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + if(H.wear_suit != src) + to_chat(H, "You must be wearing [src] to put up the hood!") + return + if(H.head) + to_chat(H, "You're already wearing something on your head!") + return + else + H.equip_to_slot_if_possible(hood,slot_head,0,0,1) + hood_up = 1 + icon_state = "evelyncoat_t" + item_state = "evelyncoat_mob_t" + H.update_inv_wear_suit() + else + RemoveHood_evelyn() +>>>>>>> 89ed203456... Merge pull request #10635 from PastelPrinceDan/pandoracoat