diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index d8479f1cd78..480713d7ebc 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -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 diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 3904ace9273..8cc29d3fcac 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -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" @@ -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 diff --git a/goon/icons/obj/hydroponics.dmi b/goon/icons/obj/hydroponics.dmi index 1b2a0a583d5..5fb5d4ed8dd 100644 Binary files a/goon/icons/obj/hydroponics.dmi and b/goon/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 379f30fce8d..f24d177e45c 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ