Skip to content

Commit

Permalink
Misc Botany changes. (tgstation#19240)
Browse files Browse the repository at this point in the history
* Names the cannibas leaves and enables weapon/grown to be added to the smart fridge

* Gives cannabis seed packets sprites consistent with other seed packets, and so they also look different.
  • Loading branch information
Firecage authored and optimumtact committed Jul 11, 2016
1 parent 65989fd commit da3da71
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@


/obj/machinery/smartfridge/proc/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/))
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/) || istype(O,/obj/item/weapon/grown/))
return 1
return 0

Expand Down
5 changes: 4 additions & 1 deletion code/modules/hydroponics/grown/cannabis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/obj/item/seeds/cannabis
name = "pack of cannabis seeds"
desc = "Taxable."
icon = 'goon/icons/obj/hydroponics.dmi'
icon_state = "seed-cannabis"
species = "cannabis"
plantname = "Cannabis Plant"
Expand Down Expand Up @@ -95,21 +94,25 @@

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
seed = /obj/item/seeds/cannabis/rainbow
name = "rainbow cannabis leaf"
desc = "Is it supposed to be glowing like that...?"
icon_state = "megacannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
seed = /obj/item/seeds/cannabis/death
name = "death cannabis leaf"
desc = "Looks a bit dark. Oh well."
icon_state = "blackcannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
seed = /obj/item/seeds/cannabis/white
name = "white cannabis leaf"
desc = "It feels smooth and nice to the touch."
icon_state = "whitecannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
seed = /obj/item/seeds/cannabis/ultimate
name = "omega cannibas leaf"
desc = "You feel dizzy looking at it. What the fuck?"
icon_state = "ocannabis"
volume = 420
Binary file modified goon/icons/obj/hydroponics.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/seeds.dmi
Binary file not shown.

0 comments on commit da3da71

Please sign in to comment.