Modifies some reagents(Gets rid of the stims in tinlux), adds bio bag to mining lockers, comments out prepare code, allows bio bags to be stored in belts. Allows for shaving mushrooms to spawn.

This commit is contained in:
TechnoAlchemist
2016-09-30 12:47:11 -07:00
parent 7a87e03263
commit 85b9baff24
6 changed files with 23 additions and 20 deletions
+13 -10
View File
@@ -105,7 +105,7 @@
/obj/structure/flora/ash/stem_shroom
icon_state = "t_mushroom"
name = "numerous mushrooms"
desc = "A large number of mushrooms, some of which have long, fleshy stems."
desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
luminosity = 1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
@@ -152,6 +152,7 @@
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_shavings"
list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
w_class = 1
resistance_flags = 0
burntime = 30
@@ -165,7 +166,7 @@
pixel_y = rand(-4, 4)
/* //
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/proc/prepared(mob/user)
if(!prepared)
prepared = TRUE
@@ -177,9 +178,11 @@
qdel(src)
. = 1
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/attackby(obj/item/weapon/W, mob/user, params)
if(!standard_prep || !W.sharpness || !prepared(user))
return ..()
*/
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
prepared = TRUE
@@ -189,13 +192,13 @@
desc = "A leaf, from a mushroom."
list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
icon_state = "mushroom_leaf"
standard_prep = FALSE
//standard_prep = FALSE
//prepared_type = obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf/prepared
/* //
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag && (istype(target, /turf/open/floor/plating/ashplanet/wateryrock) || istype(target, /obj/structure/sink)))
prepared(user)
*/
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf/prepared
name = "washed mushroom leaf"
desc = "A greenish leaflike structure from a mushroom. Kind of like lettuce?"
@@ -213,11 +216,11 @@
name = "sliced mushroom cap"
desc = "A sliced-up mushroom cap, revealing pale yellow innards. It smells faintly salty."
icon_state = "mushroom_cap_p"
prepared = TRUE
//prepared = TRUE
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem."
desc = "A long mushroom stem. It's slightly glowing."
list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
icon_state = "mushroom_stem"
luminosity = 1
@@ -227,11 +230,11 @@
name = "sliced mushroom stem"
desc = "A mushroom stem, cut in half to reveal orange flesh. Smells almost like potatos, but with a sour undertone."
icon_state = "mushroom_stem_p"
prepared = TRUE
//prepared = TRUE
/obj/item/weapon/reagent_containers/food/cactus_fruit
name = "cactus fruit"
list_reagents = list("vitamin" = 1, "nutriment" = 2, "vitfro" = 4)
list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4)
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
icon_state = "cactus_fruit"
//prepared_type = obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit/prepared
@@ -240,7 +243,7 @@
name = "peeled cactus fruit"
desc = "A cactus fruit with the skin and ash carefully scraped off, revealing a faintly sweet-smelling yellow center."
icon_state = "cactus_fruit_p"
prepared = TRUE
//prepared = TRUE
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
+1
View File
@@ -46,6 +46,7 @@
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe/mini(src)
new /obj/item/device/radio/headset/headset_cargo/mining(src)
new /obj/item/weapon/storage/bag/plants(src)
new /obj/item/weapon/storage/bag/ore(src)
new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/weapon/gun/energy/kinetic_accelerator(src)
+1 -1
View File
@@ -264,7 +264,7 @@
/turf/open/floor/plating/asteroid/airless/cave
var/length = 100
var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
var/flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1 )
var/flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash = 2)
var/sanity = 1
var/forward_cave_dir = 1
var/backward_cave_dir = 2