From 39ea9fdceeaa3bf041c78947302590e425eebe66 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 17 Aug 2017 20:19:55 -0500 Subject: [PATCH 1/2] Fix spelling of "cannabis" --- code/modules/hydroponics/grown/cannabis.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/modules/hydroponics/grown/cannabis.dm.rej diff --git a/code/modules/hydroponics/grown/cannabis.dm.rej b/code/modules/hydroponics/grown/cannabis.dm.rej new file mode 100644 index 0000000000..3778386128 --- /dev/null +++ b/code/modules/hydroponics/grown/cannabis.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm (rejected hunks) +@@ -113,7 +113,7 @@ + + /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate + seed = /obj/item/seeds/cannabis/ultimate +- name = "omega cannibas leaf" ++ name = "omega cannabis leaf" + desc = "You feel dizzy looking at it. What the fuck?" + icon_state = "ocannabis" + volume = 420 From bf5d1fc159cb126d50d7fd7e567469e011fcf15f Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 20:14:08 -0700 Subject: [PATCH 2/2] sync --- code/modules/hydroponics/grown/cannabis.dm | 23 ++++++++++--------- .../modules/hydroponics/grown/cannabis.dm.rej | 10 -------- 2 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 code/modules/hydroponics/grown/cannabis.dm.rej diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 2788e0ba13..4254678bee 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -5,7 +5,7 @@ icon_state = "seed-cannabis" species = "cannabis" plantname = "Cannabis Plant" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis + product = /obj/item/reagent_containers/food/snacks/grown/cannabis maturation = 8 potency = 20 growthstages = 1 @@ -26,7 +26,7 @@ icon_state = "seed-megacannabis" species = "megacannabis" plantname = "Rainbow Weed" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow + product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow mutatelist = list() reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35) rarity = 40 @@ -37,7 +37,7 @@ icon_state = "seed-blackcannabis" species = "blackcannabis" plantname = "Deathweed" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death + product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death mutatelist = list() reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15) rarity = 40 @@ -48,7 +48,7 @@ icon_state = "seed-whitecannabis" species = "whitecannabis" plantname = "Lifeweed" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white + product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white mutatelist = list() reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15) rarity = 40 @@ -60,7 +60,7 @@ icon_state = "seed-ocannabis" species = "ocannabis" plantname = "Omega Weed" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate + product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate mutatelist = list() reagents_add = list("space_drugs" = 0.3, "mindbreaker" = 0.3, @@ -82,7 +82,7 @@ // --------------------------------------------------------------- -/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis +/obj/item/reagent_containers/food/snacks/grown/cannabis seed = /obj/item/seeds/cannabis icon = 'goon/icons/obj/hydroponics.dmi' name = "cannabis leaf" @@ -90,29 +90,30 @@ icon_state = "cannabis" filling_color = "#00FF00" bitesize_mod = 2 + foodtype = VEGETABLES //i dont really know what else weed could be to be honest -/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow +/obj/item/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 +/obj/item/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 +/obj/item/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 +/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate seed = /obj/item/seeds/cannabis/ultimate - name = "omega cannibas leaf" + name = "omega cannabis leaf" desc = "You feel dizzy looking at it. What the fuck?" icon_state = "ocannabis" volume = 420 diff --git a/code/modules/hydroponics/grown/cannabis.dm.rej b/code/modules/hydroponics/grown/cannabis.dm.rej deleted file mode 100644 index 3778386128..0000000000 --- a/code/modules/hydroponics/grown/cannabis.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm (rejected hunks) -@@ -113,7 +113,7 @@ - - /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate - seed = /obj/item/seeds/cannabis/ultimate -- name = "omega cannibas leaf" -+ name = "omega cannabis leaf" - desc = "You feel dizzy looking at it. What the fuck?" - icon_state = "ocannabis" - volume = 420