Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds limbflowers, and buttflower icons #21

Merged
merged 1 commit into from
Sep 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
products = list(/obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/*/obj/item/seeds/buttseed = 3,*//obj/item/seeds/berry = 3,
products = list(/obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/obj/item/seeds/buttseed = 3,/obj/item/seeds/limbseed = 3,/obj/item/seeds/berry = 3,
/obj/item/seeds/cabbage = 3,/obj/item/seeds/carrot = 3,/obj/item/seeds/cherry = 3,/obj/item/seeds/chanter = 3,
/obj/item/seeds/chili = 3,/obj/item/seeds/cocoapod = 3,/obj/item/seeds/coffee = 3,/obj/item/seeds/corn = 3,
/obj/item/seeds/eggplant = 3,/obj/item/seeds/grape = 3,/obj/item/seeds/grass = 3,/obj/item/seeds/lemon = 3,
Expand Down
1 change: 1 addition & 0 deletions code/modules/hydroponics/grown/buttflower.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
maturation = 8
production = 6
yield = 1
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this already set in the parent?

Copy link
Contributor Author

@tortellinitony tortellinitony Sep 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

butt flowers were invisible before

potency = 20
plant_type = 0
oneharvest = 1
Expand Down
35 changes: 35 additions & 0 deletions code/modules/hydroponics/grown/limbflower.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/obj/item/seeds/limbseed
name = "pack of replica limb seeds"
desc = "Replica limbs, like arms and legs. Break a leg!"
icon_state = "seed-limb"
species = "limb"
plantname = "Replica Limb Flower"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/limb_spawn
lifespan = 25
endurance = 10
maturation = 8
production = 6
yield = 2
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

potency = 20
plant_type = 0
oneharvest = 1
growthstages = 3

/obj/item/weapon/reagent_containers/food/snacks/grown/limb_spawn
seed = /obj/item/seeds/limbseed
name = "limbplant"
desc = "A cluster of limbs sprouting from a stem."
icon_state = "limbplant"

/obj/item/weapon/reagent_containers/food/snacks/grown/limb_spawn/canconsume(mob/eater, mob/user)
return 0

/obj/item/weapon/reagent_containers/food/snacks/grown/limb_spawn/attack_self(mob/user as mob)
if(user)
user.unEquip(src)
var/obj/item/bodypart/L = newBodyPart(pick("r_arm", "l_arm", "r_leg", "l_leg"))
L.loc = get_turf(src)
L.skin_tone = random_skin_tone()
L.update_limb()
qdel(src)
Binary file modified icons/obj/hydroponics/growing_flowers.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/harvest.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/seeds.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@
#include "code\modules\hydroponics\grown\flowers.dm"
#include "code\modules\hydroponics\grown\grass_carpet.dm"
#include "code\modules\hydroponics\grown\kudzu.dm"
#include "code\modules\hydroponics\grown\limbflower.dm"
#include "code\modules\hydroponics\grown\melon.dm"
#include "code\modules\hydroponics\grown\misc.dm"
#include "code\modules\hydroponics\grown\mushrooms.dm"
Expand Down