Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
This commit is contained in:
Artur
@@ -151,7 +151,7 @@
|
||||
spawn(30)
|
||||
if(!QDELETED(src))
|
||||
var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
|
||||
S.speed += round(10 / seed.potency)
|
||||
S.speed += round(10 / max(seed.potency, 1), 1)
|
||||
S.visible_message("<span class='notice'>The banana spider chitters as it stretches its legs.</span>")
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -261,6 +261,7 @@
|
||||
seed = /obj/item/seeds/strawberry
|
||||
name = "strawberry"
|
||||
icon_state = "strawberry"
|
||||
filling_color = "#7FFF00"
|
||||
filling_color = "#E50D31"
|
||||
juice_results = list(/datum/reagent/consumable/strawberryjuice = 0)
|
||||
tastes = list("strawberries" = 1)
|
||||
wine_power = 20
|
||||
|
||||
@@ -234,19 +234,6 @@
|
||||
reagents.chem_temp = 1000 //Sets off the black powder
|
||||
reagents.handle_reactions()
|
||||
|
||||
// Lavaland cactus
|
||||
|
||||
/obj/item/seeds/lavaland/cactus
|
||||
name = "pack of fruiting cactus seeds"
|
||||
desc = "These seeds grow into fruiting cacti."
|
||||
icon_state = "seed-cactus"
|
||||
species = "cactus"
|
||||
plantname = "Fruiting Cactus"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
|
||||
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
|
||||
growthstages = 2
|
||||
|
||||
|
||||
// Coconut
|
||||
/obj/item/seeds/coconut
|
||||
name = "pack of coconut seeds"
|
||||
@@ -279,6 +266,7 @@
|
||||
throwforce = 5
|
||||
hitsound = 'sound/weapons/klonk.ogg'
|
||||
attack_verb = list("klonked", "donked", "bonked")
|
||||
distill_reagent = "creme_de_coconut"
|
||||
var/opened = FALSE
|
||||
var/carved = FALSE
|
||||
var/chopped = FALSE
|
||||
|
||||
@@ -334,68 +334,4 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom/attack_self(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
|
||||
|
||||
//// LAVALAND MUSHROOMS ////
|
||||
|
||||
// Bracket (Shaving mushroom)
|
||||
|
||||
/obj/item/seeds/lavaland
|
||||
name = "lavaland seeds"
|
||||
desc = "You should never see this."
|
||||
lifespan = 50
|
||||
endurance = 25
|
||||
maturation = 7
|
||||
production = 4
|
||||
yield = 4
|
||||
potency = 15
|
||||
growthstages = 3
|
||||
rarity = 20
|
||||
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
/obj/item/seeds/lavaland/polypore
|
||||
name = "pack of polypore mycelium"
|
||||
desc = "This mycelium grows into bracket mushrooms, also known as polypores. Woody and firm, shaft miners often use them for makeshift crafts."
|
||||
icon_state = "mycelium-polypore"
|
||||
species = "polypore"
|
||||
plantname = "Polypore Mushrooms"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings
|
||||
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
|
||||
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
|
||||
|
||||
// Porcini (Leafy mushroom)
|
||||
|
||||
/obj/item/seeds/lavaland/porcini
|
||||
name = "pack of porcini mycelium"
|
||||
desc = "This mycelium grows into Boletus edulus, also known as porcini. Native to the late Earth, but discovered on Lavaland. Has culinary, medicinal and relaxant effects."
|
||||
icon_state = "mycelium-porcini"
|
||||
species = "porcini"
|
||||
plantname = "Porcini Mushrooms"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
|
||||
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
|
||||
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
|
||||
|
||||
// Inocybe (Mushroom caps)
|
||||
|
||||
/obj/item/seeds/lavaland/inocybe
|
||||
name = "pack of inocybe mycelium"
|
||||
desc = "This mycelium grows into an inocybe mushroom, a species of Lavaland origin with hallucinatory and toxic effects."
|
||||
icon_state = "mycelium-inocybe"
|
||||
species = "inocybe"
|
||||
plantname = "Inocybe Mushrooms"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
|
||||
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
|
||||
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
|
||||
|
||||
// Embershroom (Mushroom stem)
|
||||
|
||||
/obj/item/seeds/lavaland/ember
|
||||
name = "pack of embershroom mycelium"
|
||||
desc = "This mycelium grows into embershrooms, a species of bioluminescent mushrooms native to Lavaland."
|
||||
icon_state = "mycelium-ember"
|
||||
species = "ember"
|
||||
plantname = "Embershroom Mushrooms"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
|
||||
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow)
|
||||
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
|
||||
investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
|
||||
@@ -98,7 +98,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/death/pickup(mob/living/carbon/user)
|
||||
if(..())
|
||||
if(prob(50))
|
||||
user.Knockdown(100)
|
||||
user.DefaultCombatKnockdown(100)
|
||||
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle as you try picking it up!</span>")
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
|
||||
@@ -111,5 +111,5 @@
|
||||
M.adjust_blurriness(force/7)
|
||||
if(prob(20))
|
||||
M.Unconscious(force / 0.3)
|
||||
M.Knockdown(force / 0.75)
|
||||
M.DefaultCombatKnockdown(force / 0.75)
|
||||
M.drop_all_held_items()
|
||||
|
||||
@@ -30,5 +30,6 @@
|
||||
filling_color = "#F6CB0B"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
foodtype = FRUIT | PINEAPPLE
|
||||
juice_results = list(/datum/reagent/consumable/pineapplejuice = 0)
|
||||
tastes = list("pineapple" = 1)
|
||||
wine_power = 40
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
plantname = "Blood-Tomato Plants"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/tomato/blood
|
||||
mutatelist = list()
|
||||
reagents_add = list(/datum/reagent/blood = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
|
||||
reagents_add = list(/datum/reagent/blood/tomato = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
|
||||
rarity = 20
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/tomato/blood
|
||||
@@ -47,7 +47,7 @@
|
||||
splat_type = /obj/effect/gibspawner/generic
|
||||
filling_color = "#FF0000"
|
||||
foodtype = FRUIT | GROSS
|
||||
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
|
||||
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood/tomato = 0)
|
||||
distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
|
||||
|
||||
// Blue Tomato
|
||||
|
||||
@@ -27,9 +27,6 @@
|
||||
mutatelist = list()
|
||||
rarity = 20
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/item/grown/log
|
||||
seed = /obj/item/seeds/tower
|
||||
name = "tower-cap log"
|
||||
@@ -275,6 +272,9 @@
|
||||
else if(istype(A, /obj/item) && prob(20))
|
||||
var/obj/item/O = A
|
||||
O.microwave_act()
|
||||
else if(istype(A, /obj/item/grown/log))
|
||||
qdel(A)
|
||||
new /obj/item/stack/sheet/mineral/coal(loc, 1)
|
||||
|
||||
/obj/structure/bonfire/process()
|
||||
if(!CheckOxygen())
|
||||
|
||||
Reference in New Issue
Block a user