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 b54a76f586..c07ef8bdd4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -396,6 +396,37 @@ ckeywhitelist = list("flintlockdafox") character_name = list("Flintlock Sharpsman") +<<<<<<< HEAD +======= +/datum/gear/fluff/zera_weldmask + path = /obj/item/clothing/head/welding/fluff/zera + display_name = "Zera's Welding Mask" + slot = slot_head + ckeywhitelist = list("fuackwit422") + character_name = list("Zera Livanne") + +/datum/gear/fluff/zera_labcloak + path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zera + display_name = "Zera's Labcloak" + slot = slot_wear_suit + ckeywhitelist = list("fuackwit422") + character_name = list("Zera Livanne") + +/datum/gear/fluff/zera_cloak + path = /obj/item/clothing/head/fluff/zerahat + display_name = "Grand Purple Hat" + slot = slot_head + ckeywhitelist = list("fuackwit422") + character_name = list("Zera Livanne") + +/datum/gear/fluff/zera_hat + path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak + display_name = "Grand Purple Cloak" + slot = slot_wear_suit + ckeywhitelist = list("fuackwit422") + character_name = list("Zera Livanne") + +>>>>>>> 4685c095bb... Merge pull request #14942 from SatinIsle/Zeras-Cloak // G CKEYS diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index ed54566fdd..8ddce25ce9 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2529,4 +2529,121 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_onmob_vr.dmi' item_state = "perrinrobes_s" body_parts_covered = UPPER_TORSO|LOWER_TORSO +<<<<<<< HEAD End CHOMP Removal*/ +======= + +//Fuackwit422: Zera Livanne +/obj/item/clothing/suit/storage/toggle/labcoat/fluff/zera + name = "Zera's Labcloak" + desc = "Zera's custom-designed lab-coat and cloak hybrid. Designed to perfectly align with OSHA and NT's Health and Safety regulations, while also allowing her to completely ignore all that if she really wanted." + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "zera_labcloak" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "zera_labcloak" + +/obj/item/clothing/suit/storage/toggle/labcoat/fluff/zera/toggle() + set name = "Toggle Coat Buttons" + set category = "Object" + set src in usr + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user + open = 0 + icon_state = initial(icon_state) + item_state = initial(item_state) + flags_inv = HIDETIE|HIDEHOLSTER + to_chat(usr, "You button up the coat.") + else if(open == 0) + open = 1 + icon_state = "[icon_state]_open" + item_state = "[item_state]_open" + flags_inv = HIDEHOLSTER + to_chat(usr, "You unbutton the coat.") + else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed + to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.") + return + update_clothing_icon() //so our overlays update + +/obj/item/clothing/head/welding/fluff/zera + name = "White Welding Mask" + desc = "It's a white welding mask. Zera likes it because it matches her labcoat." + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_override = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "zera_weld" + item_state = "zera_weld_onmob" + flags_inv = (HIDEEYES) + body_parts_covered = HEAD|EYES + +/obj/item/clothing/head/welding/fluff/zera/toggle() //overriding this 'cause it only conceals the eyes - it's a hat, not a mask + set category = "Object" + set src in usr + + if(usr.canmove && !usr.stat && !usr.restrained()) + if(up) + up = !up + body_parts_covered |= (EYES) + flags_inv |= (HIDEEYES) + icon_state = "zera_weld" + item_state = "zera_weld_onmob" + to_chat(usr, "You flip the helmet down to protect your eyes.") + else + up = !up + body_parts_covered &= ~(EYES) + flags_inv &= ~(HIDEEYES) + icon_state = "zera_weld_up" + item_state = "zera_weld_up_onmob" + + to_chat(usr, "You push the helmet up out of your face.") + update_clothing_icon() //so our mob-overlays + if (ismob(loc)) //should allow masks to update when it is opened/closed + var/mob/M = loc + M.update_inv_wear_mask() + usr.update_action_buttons() + +/obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak + name = "Grand Purple Cloak" + desc = "Zera's custom-designed purple cloak. Nice and spooky, and the perfect length to hold up over your face with one hand like Count von Count." + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "grand_purple_cloak" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "grand_purple_cloak" + +/obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak/toggle() + set name = "Toggle Coat Buttons" + set category = "Object" + set src in usr + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user + open = 0 + icon_state = initial(icon_state) + item_state = initial(item_state) + flags_inv = HIDETIE|HIDEHOLSTER + to_chat(usr, "You button up the coat.") + else if(open == 0) + open = 1 + icon_state = "[icon_state]_open" + item_state = "[item_state]_open" + flags_inv = HIDEHOLSTER + to_chat(usr, "You unbutton the coat.") + else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed + to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.") + return + update_clothing_icon() //so our overlays update + +/obj/item/clothing/head/fluff/zerahat + name = "Grand Purple Hat" + desc = "It's a pointy purple hat. Zera likes it because it matches her ominous purple cloak." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_override = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "grand_purple_cloak_hat" + item_state = "grand_purple_cloak_hat_onmob" +>>>>>>> 4685c095bb... Merge pull request #14942 from SatinIsle/Zeras-Cloak