diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 43291ef45b..34869dd8c3 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -469,3 +469,9 @@ name = "Tusks" icon_state = "tusks" body_parts = list(BP_HEAD) + + spots + name = "Alurane Body" + icon_state = "alurane" + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) + ckeys_allowed = list("natje") \ No newline at end of file diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 94b77b5493..9c151f934e 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -244,6 +244,12 @@ icon_state = "shock" ckeys_allowed = list("icowom") +/datum/sprite_accessory/ears/alurane + name = "alurane ears/hair (Pumila)" + desc = "" + icon_state = "alurane-ears" + ckeys_allowed = list("natje") + /* //////////////////////////// / =--------------------= / diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 7a8be6517d..3892e39265 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -582,7 +582,25 @@ else return 1 -//scree:Scree +//natje:Pumila +/obj/item/clothing/under/fluff/aluranevines + name = "Pumila's vines" + desc = "A wrap of green vines and colourful flowers." + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "alurane-vines" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "alurane-vines" + + mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(..()) + if(H.ckey != "natje") + H << "Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise." + return 0 + else + return 1 + /obj/item/clothing/under/fluff/screesuit name = "Scree's feathers" desc = "A mop of fluffy blue feathers, the honkmother only knows what kind of bird they originally came from." diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 565b829c59..494d10e094 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -768,6 +768,85 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie rimplant.reagents.remove_reagent(rimplant.generated_reagent, rimplant.transfer_amount) +/obj/item/weapon/implant/reagent_generator/pumila_apple + name = "apple laying implant" + desc = "This is an implant that allows the user to grow apples." + generated_reagent = "sugar" //This actually allows them to. + usable_volume = 250 //Five apples. Let's not get /too/ crazy here. + transfer_amount = 50 + + empty_message = list("Your have no apples on you.", "You have a distinct lack of apples..") + full_message = list("You have multiple apples on you, ready for harvest!", "There are a multitude of apples awaiting harvest on you!") + emote_descriptor = list("an apple right off of Pumila!", "a large apple off Pumila!") + var/verb_descriptor = list("grabs", "snatches", "picks") + var/self_verb_descriptor = list("grab", "snatch", "pick") + var/short_emote_descriptor = list("picks", "grabs") + self_emote_descriptor = list("grab", "pick", "snatch") + assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_pumila_apple + +/obj/item/weapon/implant/reagent_generator/pumila_apple/implanted(mob/living/carbon/source) + processing_objects += src + to_chat(source, "You implant [source] with \the [src].") + source.verbs |= assigned_proc + return 1 + +/obj/item/weapon/implanter/reagent_generator/pumila_apple + implant_type = /obj/item/weapon/implant/reagent_generator/pumila_apple + +/mob/living/carbon/human/proc/use_reagent_implant_pumila_apple() + set name = "Grab Apple" + set desc = "Grab an apple off of Pumila." + set category = "Object" + set src in view(1) + + //do_reagent_implant(usr) + if(!isliving(usr) || !usr.canClick()) + return + + if(usr.incapacitated() || usr.stat > CONSCIOUS) + return + + var/obj/item/weapon/implant/reagent_generator/roiz/rimplant + for(var/I in src.contents) + if(istype(I, /obj/item/weapon/implant/reagent_generator)) + rimplant = I + break + if (rimplant) + if(rimplant.reagents.total_volume <= rimplant.transfer_amount) + to_chat(src, "[pick(rimplant.empty_message)]") + return + + var/datum/seed/S = plant_controller.seeds["apple"] //crosses fingers. + S.harvest(usr,0,0,1) + + var/index = rand(0,2) + + if (usr != src) + var/emote = rimplant.emote_descriptor[index] + var/verb_desc = rimplant.verb_descriptor[index] + var/self_verb_desc = rimplant.self_verb_descriptor[index] + usr.visible_message("[usr] [verb_desc] [emote]", + "You [self_verb_desc] [emote]") + else + src.visible_message("[src] [pick(rimplant.short_emote_descriptor)] an apple.", + "You [pick(rimplant.self_emote_descriptor)] an apple.") + + rimplant.reagents.remove_reagent(rimplant.generated_reagent, rimplant.transfer_amount) +/* +/obj/item/weapon/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up. + generated_reagent = "honey" + usable_volume = 5000 + + empty_message = list("You appear to be all out of nectar", "You feel as though you are lacking a majority of your nectar.") + full_message = list("You appear to be full of nectar.", "You feel as though you are full of nectar!") + emote_descriptor = list("squeezes nectar", "extracts nectar") + self_emote_descriptor = list("squeeze", "extract") + verb_name = "Extract Honey" + verb_desc = "Obtain pumila's nectar and put it into a container!" + +/obj/item/weapon/implanter/reagent_generator/pumila_nectar + implant_type = /obj/item/weapon/implant/reagent_generator/pumila_nectar +*/ //Egg item //------------- /obj/item/weapon/reagent_containers/food/snacks/egg/roiz diff --git a/config/custom_items.txt b/config/custom_items.txt index e6b4bf8f3f..aba31889d2 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -423,6 +423,19 @@ item_path: /obj/item/weapon/storage/belt/utility/fluff/vulpine } # ######## N CKEYS + +{ +ckey: natje +character_name: Pumila +item_path: /obj/item/clothing/under/fluff/aluranevines +} + +{ +ckey: natje +character_name: Pumila +item_path: /obj/item/weapon/implanter/reagent_generator/pumila_apple +} + # ######## O CKEYS { ckey: orbisa diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 414f695db4..ff56c61494 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/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 296f3eb9a3..bd01e5ca38 100644 Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 0517135afd..316052f1da 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ