cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3885 from Cameron653/ALRAUNE_STUFF

Browse Source 
Alraune abilities and minor code changes
This commit is contained in:
Spades
2018-08-13 07:50:23 -04:00
committed by GitHub
parent ed06781743 5fc76df183
commit 84a3d824de
13 changed files with 234 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/living_vr.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/fuzzy = 1 // Preference toggle for sharp/fuzzy icon.
var/tail_alt = 0 // Tail layer toggle.
var/can_be_drop_prey = 0
var/can_be_drop_pred = 1 //Mobs are pred by default.
var/can_be_drop_pred = 1 // Mobs are pred by default.
//
// Hook for generic creation of stuff on new creatures
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -65
View File
@@ -995,70 +995,6 @@
rimplant.reagents.remove_any(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_reagents = list("sugar" = 2) //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/post_implant(mob/living/carbon/source)
processing_objects += src
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
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 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, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
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("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
else
visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an apple.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an apple.</span>")
rimplant.reagents.remove_any(rimplant.transfer_amount)
/*
/obj/item/weapon/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up.
generated_reagents = list("honey" = 2)
@@ -1998,7 +1934,7 @@
KA.desc = initial(KA.desc)
KA.icon = initial(KA.icon)
..()
//ArgobargSoup:Lynn Shady
/obj/item/device/flashlight/pen/fluff/lynn
name = "Lynn's penlight"