Merge pull request #3 from Citadel-Station-13/master

3
This commit is contained in:
lolman360
2019-08-17 11:55:56 +10:00
committed by GitHub
273 changed files with 9652 additions and 2072 deletions
+2
View File
@@ -69,6 +69,8 @@
if(default_deconstruction_screwdriver(user, "dnamod", "dnamod", I))
update_icon()
return
else if(default_unfasten_wrench(user, I))
return
if(default_deconstruction_crowbar(I))
return
if(iscyborg(user))
+3 -3
View File
@@ -218,13 +218,13 @@
// Strawberry
/obj/item/seeds/strawberries
name = "pack of green grape seeds"
name = "pack of strawberrie seeds"
desc = "These seeds grow into strawberries vines."
icon_state = "seed-strawberry"
species = "strawberry"
plantname = "Strawberry Vine"
product = /obj/item/reagent_containers/food/snacks/grown/strawberries
reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.1)
reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2)
mutatelist = list()
/obj/item/reagent_containers/food/snacks/grown/strawberries
@@ -233,4 +233,4 @@
icon_state = "strawberries"
filling_color = "#7FFF00"
tastes = list("strawberries" = 1)
wine_power = 20
wine_power = 20
@@ -14,6 +14,7 @@
icon_dead = "tea-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("teapowder" = 0.1)
/obj/item/reagent_containers/food/snacks/grown/tea
seed = /obj/item/seeds/tea