diff --git a/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi b/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi deleted file mode 100644 index 190df5af8be..00000000000 Binary files a/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi and /dev/null differ diff --git a/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi deleted file mode 100644 index 98161d0ba7f..00000000000 Binary files a/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi and /dev/null differ diff --git a/modular_zubbers/code/modules/hydroponics/grown/rocks.dm b/modular_zubbers/modules/hydroponics/code/grown/rocks.dm similarity index 87% rename from modular_zubbers/code/modules/hydroponics/grown/rocks.dm rename to modular_zubbers/modules/hydroponics/code/grown/rocks.dm index f34101c35fe..bb993ad1a19 100644 --- a/modular_zubbers/code/modules/hydroponics/grown/rocks.dm +++ b/modular_zubbers/modules/hydroponics/code/grown/rocks.dm @@ -3,7 +3,7 @@ desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\ \"Remember: Legally speaking, rocking is more legal than stoning. \n \ We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\"" - icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi' + icon = 'modular_zubbers/modules/hydroponics/icons/seeds.dmi' icon_state = "seed-rockfruit" species = "rock" plantname = "Rockfruits" @@ -20,7 +20,7 @@ growthstages = 2 - growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi' + growing_icon = 'modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi' genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/fire_resistance, @@ -40,7 +40,7 @@ force = 5 // Comparatively shit considering a nettle is 15 throwforce = 10 // Less shit but hey, it is a rock - icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi' + icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi' icon_state = "rockfruit" var/product = /obj/item/food/grown/rockfruit @@ -71,7 +71,7 @@ foodtypes = FRUIT - icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi' + icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi' icon_state = "rockfruit-peeled" tastes = list("mountains" = 1) @@ -81,8 +81,8 @@ desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \ Probably not edible, but a golem will try to prove you otherwise" - icon = 'modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi' - icon_state = "rocks" + icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi' + icon_state = "rockfruit-trash" foodtypes = STONE food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5) diff --git a/modular_zubbers/code/modules/vending/megaseed.dm b/modular_zubbers/modules/hydroponics/code/vending/megaseed.dm similarity index 100% rename from modular_zubbers/code/modules/vending/megaseed.dm rename to modular_zubbers/modules/hydroponics/code/vending/megaseed.dm diff --git a/modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi b/modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi similarity index 100% rename from modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi rename to modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi diff --git a/modular_zubbers/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/modules/hydroponics/icons/harvest.dmi new file mode 100644 index 00000000000..433f82e9fdf Binary files /dev/null and b/modular_zubbers/modules/hydroponics/icons/harvest.dmi differ diff --git a/modular_zubbers/code/modules/hydroponics/icons/seeds.dmi b/modular_zubbers/modules/hydroponics/icons/seeds.dmi similarity index 100% rename from modular_zubbers/code/modules/hydroponics/icons/seeds.dmi rename to modular_zubbers/modules/hydroponics/icons/seeds.dmi diff --git a/modular_zubbers/modules/hydroponics/readme.txt b/modular_zubbers/modules/hydroponics/readme.txt new file mode 100644 index 00000000000..81540f5dc08 --- /dev/null +++ b/modular_zubbers/modules/hydroponics/readme.txt @@ -0,0 +1,8 @@ +# BUBBERSTATION MODULAR HYDROPONICS + +## What to put here +Any completely new seeds, produce, sprites, and mechanics. +Do not put any actual craftable foods here, instead either create or use, (if already created) the relevant modular folder. + + +Overrides of mechanics on parent repos (TG, Skyrat) should still be done in the code folder. diff --git a/tgstation.dme b/tgstation.dme index ef16a3b3a69..27578dfcbc6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8288,7 +8288,6 @@ #include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm" #include "modular_zubbers\code\modules\hydroponics\gene_modder.dm" #include "modular_zubbers\code\modules\hydroponics\plant_genes.dm" -#include "modular_zubbers\code\modules\hydroponics\grown\rocks.dm" #include "modular_zubbers\code\modules\job_estimation\code\dead.dm" #include "modular_zubbers\code\modules\jobs\_job.dm" #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm" @@ -8382,7 +8381,6 @@ #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm" #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm" -#include "modular_zubbers\code\modules\vending\megaseed.dm" #include "modular_zubbers\code\modules\~donator\choicebeacon.dm" #include "modular_zubbers\maps\biodome\area.dm" #include "modular_zubbers\maps\biodome\beach.dm" @@ -8463,7 +8461,9 @@ #include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm" #include "modular_zubbers\modules\hemophages\code\limbgrower.dm" #include "modular_zubbers\modules\hemophages\code\species.dm" +#include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm" #include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm" +#include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm" #include "modular_zubbers\modules\jobs\code\job_types\quartermaster.dm" #include "modular_zubbers\modules\jobs\code\job_types\warden.dm" #include "modular_zubbers\modules\jobs\code\trims\jobs.dm"