mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 06:00:23 +01:00
Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in.
This commit is contained in:
@@ -73,7 +73,8 @@
|
||||
if(!(path in negative_traits))
|
||||
pref.neg_traits -= path
|
||||
|
||||
if(pref.species == pref.custom_base && pref.species != SPECIES_CUSTOM)
|
||||
var/datum/species/selected_species = all_species[pref.species]
|
||||
if(selected_species.selects_bodytype)
|
||||
// Allowed!
|
||||
else if(!pref.custom_base || !(pref.custom_base in custom_species_bases))
|
||||
pref.custom_base = SPECIES_HUMAN
|
||||
|
||||
@@ -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/implanted(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/pumila_apple/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)
|
||||
|
||||
@@ -607,12 +607,6 @@ 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
|
||||
}
|
||||
|
||||
{
|
||||
ckey: nepox
|
||||
character_name: Annie Rose
|
||||
|
||||
Reference in New Issue
Block a user