diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 5d23644e7d77c..b51965873dc3d 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -143,7 +143,9 @@ // Glow gene procs /obj/item/weapon/reagent_containers/food/snacks/grown/Destroy() - var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow) + var/datum/plant_gene/trait/glow/G + if(seed) + G = seed.get_gene(/datum/plant_gene/trait/glow) if(G && ismob(loc)) loc.set_light(-G.get_lum(seed)) return ..() diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 1e9d829116f5e..857ce8f01790c 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -16,7 +16,7 @@ /obj/item/seeds/cannabis/death, /obj/item/seeds/cannabis/white, /obj/item/seeds/cannabis/ultimate) - reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies + reagents_add = list("space_drugs" = 0.15) // gives u the munchies /obj/item/seeds/cannabis/rainbow @@ -29,7 +29,7 @@ icon_dead = "megacannabis-dead" product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow mutatelist = list() - reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35) + reagents_add = list("mindbreaker" = 0.15) rarity = 40 /obj/item/seeds/cannabis/death @@ -42,7 +42,7 @@ icon_dead = "blackcannabis-dead" product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death mutatelist = list() - reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15) + reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15) rarity = 40 /obj/item/seeds/cannabis/white @@ -55,7 +55,7 @@ icon_dead = "whitecannabis-dead" product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white mutatelist = list() - reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15) + reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15) rarity = 40 @@ -74,7 +74,6 @@ "mercury" = 0.15, "lithium" = 0.15, "atropine" = 0.15, - "haloperidol" = 0.15, "methamphetamine" = 0.15, "capsaicin" = 0.15, "barbers_aid" = 0.15, @@ -82,8 +81,7 @@ "itching_powder" = 0.15, "crank" = 0.15, "krokodil" = 0.15, - "histamine" = 0.15, - "lipolicide" = 0.15) + "histamine" = 0.15) rarity = 69 diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 66c5a17a841ee..13be4a37e100b 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -11,7 +11,7 @@ potency = 15 icon_dead = "wheat-dead" mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat) - reagents_add = list("nutriment" = 0.04) + reagents_add = list("nutriment" = 0.04, "flour" = 0.08) /obj/item/weapon/reagent_containers/food/snacks/grown/wheat seed = /obj/item/seeds/wheat diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index 8e08c9ac7ccf6..18abd64de51ee 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -14,7 +14,7 @@ growthstages = 4 rarity = 30 var/list/mutations = list() - reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02) + reagents_add = list("anti_toxin" = 0.04, "nutriment" = 0.02) /obj/item/seeds/kudzu/Copy() var/obj/item/seeds/kudzu/S = ..() diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 865f04b319160..5c3468f14b2dc 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -19,7 +19,7 @@ potency = 15 growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) - reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0) + reagents_add = list("morphine" = 0.35, "anti_toxin" = 0.35, "nutriment" = 0) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi seed = /obj/item/seeds/reishi diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index e3bb416c59367..d9bc3060e3162 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -64,7 +64,9 @@ // Glow gene procs /obj/item/weapon/grown/Destroy() - var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow) + var/datum/plant_gene/trait/glow/G + if(seed) + G = seed.get_gene(/datum/plant_gene/trait/glow) if(G && ismob(loc)) loc.set_light(-G.get_lum(seed)) return ..() diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 75809dbf1867b..8ee915d4d980f 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -101,7 +101,7 @@ to_chat(user, "\The [src] is too full to add more metal.") return if(stack.amount >= num) - stack.use(num) + stack.use(Ceiling(num)) to_chat(user, "You add [num] sheet\s to \the [src].") metal += num * metal_per_sheet interact(user) diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 3165c60ff0784..d27468d61f669 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 4fefb18a9b481..b42846f20d95d 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ