diff --git a/code/datums/chemistry/Chemistry-Holder.dm b/code/datums/chemistry/Chemistry-Holder.dm index eb5d4fec..01733f33 100644 --- a/code/datums/chemistry/Chemistry-Holder.dm +++ b/code/datums/chemistry/Chemistry-Holder.dm @@ -625,6 +625,12 @@ datum spectro = 1 if (spectro) + if("cloak_juice" in reagent_list) + var/datum/reagent/cloaker = reagent_list["cloak_juice"] + if(cloaker.volume >= 5) + . += "
ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE." + return + . += "
Spectroscopic analysis:" for(var/current_id in reagent_list) diff --git a/code/datums/chemistry/Reagents-Misc.dm b/code/datums/chemistry/Reagents-Misc.dm index 03c86023..2418b539 100644 --- a/code/datums/chemistry/Reagents-Misc.dm +++ b/code/datums/chemistry/Reagents-Misc.dm @@ -713,6 +713,19 @@ datum else boutput(M, "Yuck!") return + cloak_juice + name = "cloaked panellus extract" + id = "cloak_juice" + description = "
ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE." + reagent_state = LIQUID + fluid_r = 50 + fluid_g = 50 + fluid_b = 255 + transparency = 50 + value = 5 + hygiene_value = -3 + depletion_rate = 0.1 + cryostylane name = "cryostylane" id = "cryostylane" diff --git a/code/datums/hydroponics/plant_mutations.dm b/code/datums/hydroponics/plant_mutations.dm index 8ff4ca41..f4871d63 100644 --- a/code/datums/hydroponics/plant_mutations.dm +++ b/code/datums/hydroponics/plant_mutations.dm @@ -271,6 +271,15 @@ chance = 20 assoc_reagents = list("amanitin") +/datum/plantmutation/fungus/cloak + name = "Cloaked Panellus" + iconmod = "Cloak" + crop = /obj/item/reagent_containers/food/snacks/mushroom/cloak + PTrange = list(null,10) //low potency + CZrange = list(25,null) // high crop size + chance = 10 + assoc_reagents = list("cloak_juice") + // Lasher Mutations /datum/plantmutation/lasher/berries diff --git a/code/datums/hydroponics/plants_weed.dm b/code/datums/hydroponics/plants_weed.dm index b39686b8..02e26b89 100644 --- a/code/datums/hydroponics/plants_weed.dm +++ b/code/datums/hydroponics/plants_weed.dm @@ -15,7 +15,7 @@ vending = 2 genome = 30 assoc_reagents = list("space_fungus") - mutations = list(/datum/plantmutation/fungus/amanita,/datum/plantmutation/fungus/psilocybin) + mutations = list(/datum/plantmutation/fungus/amanita,/datum/plantmutation/fungus/psilocybin,/datum/plantmutation/fungus/cloak) /datum/plant/lasher name = "Lasher" diff --git a/code/obj/item/food/snacks.dm b/code/obj/item/food/snacks.dm index 987d2abf..0edc878c 100644 --- a/code/obj/item/food/snacks.dm +++ b/code/obj/item/food/snacks.dm @@ -939,6 +939,13 @@ amount = 1 heal_amt = 1 +/obj/item/reagent_containers/food/snacks/mushroom/cloak + name = "space mushroom" + desc = "A mushroom cap of Space Fungus. It doesn't smell of anything." + icon_state = "mushroom-M3" + amount = 1 + heal_amt = 0 + // Foods /obj/item/reagent_containers/food/snacks/candy diff --git a/code/procs/scanprocs.dm b/code/procs/scanprocs.dm index 6090ac15..7e840581 100644 --- a/code/procs/scanprocs.dm +++ b/code/procs/scanprocs.dm @@ -217,7 +217,15 @@ if (A.reagents) if (A.reagents.reagent_list.len > 0) + if("cloak_juice" in A.reagents.reagent_list) + var/datum/reagent/cloaker = A.reagents.reagent_list["cloak_juice"] + if(cloaker.volume >= 5) + data = "ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE." + return data + + var/reagents_length = A.reagents.reagent_list.len + data = "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found in [A]." for (var/current_id in A.reagents.reagent_list) diff --git a/icons/obj/foodNdrink/food_produce.dmi b/icons/obj/foodNdrink/food_produce.dmi index f11585aa..2cd33afb 100644 Binary files a/icons/obj/foodNdrink/food_produce.dmi and b/icons/obj/foodNdrink/food_produce.dmi differ diff --git a/icons/obj/hydroponics/hydro_mutants.dmi b/icons/obj/hydroponics/hydro_mutants.dmi index b517eadd..ee16be9e 100644 Binary files a/icons/obj/hydroponics/hydro_mutants.dmi and b/icons/obj/hydroponics/hydro_mutants.dmi differ diff --git a/icons/obj/hydroponics/hydromisc.dmi b/icons/obj/hydroponics/hydromisc.dmi index 03d618af..7f6c2564 100644 Binary files a/icons/obj/hydroponics/hydromisc.dmi and b/icons/obj/hydroponics/hydromisc.dmi differ