Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2020-01-13 18:37:42 +00:00
16 changed files with 173 additions and 12 deletions

View File

@@ -25,6 +25,7 @@
var/apply_color_to_mob = TRUE // Do we color the mob to match the plant?
var/has_item_product // Item products. (Eggy)
var/force_layer
var/harvest_sound = null //Vorestation edit - sound the plant makes when harvested
// Making the assumption anything in HYDRO-ponics is capable of processing water, and nutrients commonly associated with it, leaving us with the below to be tweaked.
var/list/beneficial_reagents // Reagents considered uniquely 'beneficial' by a plant.
@@ -769,6 +770,10 @@
var/turf/T = get_turf(user)
create_spores(T)
if(harvest_sound)//Vorestation edit
var/turf/M = get_turf(user)
playsound(M, harvest_sound, 50, 1, -1)
if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample)
if(istype(user)) user << "<span class='danger'>You fail to harvest anything useful.</span>"
else

View File

@@ -39,3 +39,6 @@
set_trait(TRAIT_PRODUCT_ICON,"mushroom6")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
harvest_sound = 'sound/items/hooh.ogg'