diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 87a0536a54f..a2afcdc729f 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -14,6 +14,7 @@ name = "pack of ambrosia vulgaris seeds" desc = "These seeds grow into common ambrosia, a plant grown by and from medicine." icon_state = "seed-ambrosiavulgaris" + plant_icon_offset = 0 species = "ambrosiavulgaris" plantname = "Ambrosia Vulgaris" product = /obj/item/food/grown/ambrosia/vulgaris diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index d6581271dad..a0d78edc86b 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -3,6 +3,7 @@ name = "pack of cannabis seeds" desc = "Taxable." icon_state = "seed-cannabis" + plant_icon_offset = 6 species = "cannabis" plantname = "Cannabis Plant" product = /obj/item/food/grown/cannabis @@ -15,11 +16,11 @@ icon_dead = "cannabis-dead" // Same for the dead icon genes = list(/datum/plant_gene/trait/repeated_harvest) mutatelist = list(/obj/item/seeds/cannabis/rainbow, - /obj/item/seeds/cannabis/death, - /obj/item/seeds/cannabis/white, - /obj/item/seeds/cannabis/ultimate) - reagents_add = list(/datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS - //axed lipolicide, replaced space drugs with thc + /obj/item/seeds/cannabis/death, + /obj/item/seeds/cannabis/white, + /obj/item/seeds/cannabis/ultimate, + ) + reagents_add = list(/datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS - axed lipolicide, replaced space drugs with thc /obj/item/seeds/cannabis/rainbow @@ -64,22 +65,24 @@ name = "pack of omega weed seeds" desc = "These seeds grow into omega weed." icon_state = "seed-ocannabis" + plant_icon_offset = 0 icon_grow = "ocannabis-grow" species = "ocannabis" plantname = "Omega Weed" product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null - reagents_add = list(/datum/reagent/drug/thc = 0.3, //SKYRAT EDIT - MORENARCOTICS - /datum/reagent/toxin/mindbreaker = 0.3, - /datum/reagent/mercury = 0.15, - /datum/reagent/lithium = 0.15, - /datum/reagent/medicine/atropine = 0.15, - /datum/reagent/drug/methamphetamine = 0.15, - /datum/reagent/drug/bath_salts = 0.15, - /datum/reagent/drug/krokodil = 0.15, - //SKYRAT REMOVAL // /datum/reagent/toxin/lipolicide = 0.15, - /datum/reagent/drug/nicotine = 0.1) + reagents_add = list(/datum/reagent/drug/thc = 0.3, //SKYRAT EDIT - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, + /datum/reagent/toxin/mindbreaker = 0.3, + /datum/reagent/mercury = 0.15, + /datum/reagent/lithium = 0.15, + /datum/reagent/medicine/atropine = 0.15, + /datum/reagent/drug/methamphetamine = 0.15, + /datum/reagent/drug/bath_salts = 0.15, + /datum/reagent/drug/krokodil = 0.15, + // /datum/reagent/toxin/lipolicide = 0.15, // SKYRAT REMOVAL - MORE NARCOTICS + /datum/reagent/drug/nicotine = 0.1, + ) rarity = 69 graft_gene = /datum/plant_gene/trait/glow/green diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index bae6cb40604..dd64288bfb4 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -55,6 +55,7 @@ name = "pack of bungo tree seeds" desc = "These seeds grow into bungo trees. They appear to be heavy and almost perfectly spherical." icon_state = "seed-bungotree" + plant_icon_offset = 4 species = "bungotree" plantname = "Bungo Tree" product = /obj/item/food/grown/bungofruit diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index b2237abe2c2..21233fde44b 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -128,6 +128,7 @@ name = "pack of harebell seeds" desc = "These seeds grow into pretty little flowers." icon_state = "seed-harebell" + plant_icon_offset = 1 species = "harebell" plantname = "Harebells" product = /obj/item/food/grown/harebell diff --git a/code/modules/hydroponics/grown/kronkus.dm b/code/modules/hydroponics/grown/kronkus.dm index b1e7ee39f3c..ebf3849bcf1 100644 --- a/code/modules/hydroponics/grown/kronkus.dm +++ b/code/modules/hydroponics/grown/kronkus.dm @@ -2,6 +2,7 @@ name = "pack of kronkus seeds" desc = "A pack of highly illegal kronkus seeds.\nPossession of these seeds carries the death penalty in 7 sectors." icon_state = "seed-kronkus" + plant_icon_offset = 6 species = "kronkus" plantname = "Kronkus Vine" product = /obj/item/food/grown/kronkus diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index f02556fc31e..bcdb2073b8a 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -3,6 +3,7 @@ name = "pack of pumpkin seeds" desc = "These seeds grow into pumpkin vines." icon_state = "seed-pumpkin" + plant_icon_offset = 4 species = "pumpkin" plantname = "Pumpkin Vines" product = /obj/item/food/grown/pumpkin diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 6010ca14c64..89801785cef 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -34,6 +34,7 @@ name = "pack of replica pod seeds" desc = "These seeds grow into replica pods. They say these are used to harvest humans." icon_state = "seed-replicapod" + plant_icon_offset = 2 species = "replicapod" plantname = "Replica Pod" product = /mob/living/carbon/human //verrry special -- Urist diff --git a/code/modules/hydroponics/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm index 899036b7ed0..d8f1a66795b 100644 --- a/code/modules/hydroponics/grown/weeds/kudzu.dm +++ b/code/modules/hydroponics/grown/weeds/kudzu.dm @@ -4,6 +4,7 @@ name = "pack of kudzu seeds" desc = "These seeds grow into a weed that grows incredibly fast." icon_state = "seed-kudzu" + plant_icon_offset = 2 species = "kudzu" plantname = "Kudzu" product = /obj/item/food/grown/kudzupod diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm index deb16eab18f..ca1ebb13ea2 100644 --- a/code/modules/hydroponics/grown/weeds/nettle.dm +++ b/code/modules/hydroponics/grown/weeds/nettle.dm @@ -2,6 +2,7 @@ name = "pack of nettle seeds" desc = "These seeds grow into nettles." icon_state = "seed-nettle" + plant_icon_offset = 0 species = "nettle" plantname = "Nettles" product = /obj/item/food/grown/nettle diff --git a/code/modules/hydroponics/grown/weeds/starthistle.dm b/code/modules/hydroponics/grown/weeds/starthistle.dm index e6de2ed1145..a87221594f0 100644 --- a/code/modules/hydroponics/grown/weeds/starthistle.dm +++ b/code/modules/hydroponics/grown/weeds/starthistle.dm @@ -3,6 +3,7 @@ name = "pack of starthistle seeds" desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots." icon_state = "seed-starthistle" + plant_icon_offset = 3 species = "starthistle" plantname = "Starthistle" lifespan = 70 diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index b5dd3040890..b81900b7fd8 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -300,7 +300,7 @@ set_self_sustaining(FALSE) /obj/machinery/hydroponics/process(delta_time) - var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time + var/needs_update = FALSE // Checks if the icon needs updating so we don't redraw empty trays every time if(self_sustaining) if(powered()) @@ -319,7 +319,7 @@ if(age < myseed.maturation) lastproduce = age - needs_update = 1 + needs_update = TRUE //Nutrients////////////////////////////////////////////////////////////// @@ -493,6 +493,7 @@ else var/t_growthstate = clamp(round((age / myseed.maturation) * myseed.growthstages), 1, myseed.growthstages) plant_overlay.icon_state = "[myseed.icon_grow][t_growthstate]" + plant_overlay.pixel_y = myseed.plant_icon_offset return plant_overlay /obj/machinery/hydroponics/proc/update_status_light_overlays() diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 7076739a232..aeac2fc053e 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -24,6 +24,8 @@ var/icon_dead /// Used to override harvest icon (default is `"[species]-harvest"`). If null, plant will use `[icon_grow][growthstages]`. var/icon_harvest + /// Used to offset the plant sprite so that it appears at proper height in the tray + var/plant_icon_offset = 8 /// How long before the plant begins to take damage from age. var/lifespan = 25 /// Amount of health the plant has. diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index b215017e300..fcf73899863 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/growing_flowers.dmi b/icons/obj/hydroponics/growing_flowers.dmi index c9bb7eeaacd..d0126a54f58 100644 Binary files a/icons/obj/hydroponics/growing_flowers.dmi and b/icons/obj/hydroponics/growing_flowers.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index d44416aecb6..7e535cdaf9b 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/growing_mushrooms.dmi b/icons/obj/hydroponics/growing_mushrooms.dmi index 1e1b243ca03..8c94f10354f 100644 Binary files a/icons/obj/hydroponics/growing_mushrooms.dmi and b/icons/obj/hydroponics/growing_mushrooms.dmi differ diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi index ae02728f872..bf49c72ba79 100644 Binary files a/icons/obj/hydroponics/growing_vegetables.dmi and b/icons/obj/hydroponics/growing_vegetables.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/hydroponics/growing.dmi b/modular_skyrat/master_files/icons/obj/hydroponics/growing.dmi index bbd9fcc01d7..677bcf26d14 100644 Binary files a/modular_skyrat/master_files/icons/obj/hydroponics/growing.dmi and b/modular_skyrat/master_files/icons/obj/hydroponics/growing.dmi differ diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm index a9bf477f40d..2e24bd68ab7 100644 --- a/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm +++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm @@ -9,6 +9,7 @@ desc = "Long stalks with flowering tips, they contain a chemical that attracts felines." species = "catnip" plantname = "Catnip Plant" + icon_dead = null growthstages = 3 product = /obj/item/food/grown/tea/catnip reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm index 03aa514c05c..0193e4e140b 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm @@ -12,6 +12,7 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "telriis-stage" growthstages = 4 + plant_icon_offset = 7 genes = list(/datum/plant_gene/trait/repeated_harvest) reagents_add = list(/datum/reagent/medicine/higadrite = 0.1) diff --git a/modular_skyrat/modules/xenoarch/icons/growing.dmi b/modular_skyrat/modules/xenoarch/icons/growing.dmi index c33bab44193..4bab24c4fc3 100644 Binary files a/modular_skyrat/modules/xenoarch/icons/growing.dmi and b/modular_skyrat/modules/xenoarch/icons/growing.dmi differ