Fixed diona pods being mutable, fixed a few other tweaks, added cuttings.

This commit is contained in:
Zuhayr
2014-07-29 12:38:21 +09:30
committed by ZomgPonies
parent 071bfd4629
commit a7ffa5747b
6 changed files with 58 additions and 15 deletions
+5 -1
View File
@@ -1,4 +1,8 @@
//Analyzer, pestkillers, weedkillers, nutrients, hatchets.
//Analyzer, pestkillers, weedkillers, nutrients, hatchets, cutters.
/obj/item/weapon/wirecutters/clippers
name = "plant clippers"
desc = "A tool used to take samples from plants."
/obj/item/device/analyzer/plant_analyzer
name = "plant analyzer"
+8 -4
View File
@@ -105,8 +105,6 @@ proc/populate_seed_list()
//Mutates the plant overall (randomly).
/datum/seed/proc/mutate(var/degree,var/turf/source_turf)
world << "Seed mutation proc called with [degree]."
if(!degree || immutable) return
source_turf.visible_message("\blue \The [display_name] quivers!")
@@ -346,7 +344,7 @@ proc/populate_seed_list()
return (P ? P : 0)
//Place the plant products at the feet of the user.
/datum/seed/proc/harvest(var/mob/user,var/yield_mod)
/datum/seed/proc/harvest(var/mob/user,var/yield_mod,var/harvest_sample)
if(!user)
return
@@ -358,7 +356,7 @@ proc/populate_seed_list()
if(!got_product)
user << "\red You fail to harvest anything useful."
else
user << "You harvest from the [display_name]."
user << "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name]."
//This may be a new line. Update the global if it is.
if(name == "new line" || !(name in seed_types))
@@ -366,6 +364,12 @@ proc/populate_seed_list()
name = "[uid]"
seed_types[name] = src
if(harvest_sample)
var/obj/item/seeds/seeds = new(get_turf(user))
seeds.seed_type = name
seeds.update_seed()
return
var/total_yield
if(isnull(yield_mod) || yield_mod < 1)
yield_mod = 0
+6 -4
View File
@@ -85,16 +85,18 @@
/obj/machinery/botany/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/seeds))
if(seed)
if(seed.seed.immutable)
user << "That seed is not compatible with our genetics technology."
else
user << "There is already a seed loaded."
user << "There is already a seed loaded."
var/obj/item/seeds/S =W
if(S.seed && S.seed.immutable)
user << "That seed is not compatible with our genetics technology."
else
user.drop_item(W)
W.loc = src
seed = W
user << "You load [W] into [src]."
return
if(istype(W,/obj/item/weapon/screwdriver))
open = !open
user << "\blue You [open ? "open" : "close"] the maintenance panel."
+8
View File
@@ -32,6 +32,14 @@
if(seed && !seed.roundstart)
usr << "It's tagged as variety #[seed.uid]."
/obj/item/seeds/cutting
name = "cuttings"
desc = "Some plant cuttings."
/obj/item/seeds/cutting/update_appearance()
..()
src.name = "packet of [seed.seed_name] cuttings"
/obj/item/seeds/replicapod
seed_type = "diona"