Skip to content
This repository has been archived by the owner on Apr 16, 2021. It is now read-only.

UM - 035 - Cloak Plant #184

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/datums/chemistry/Chemistry-Holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. += "<br><span style=\"color:red\">ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE.</span>"
return

. += "<br><span style=\"color:red\">Spectroscopic analysis:</span>"

for(var/current_id in reagent_list)
Expand Down
13 changes: 13 additions & 0 deletions code/datums/chemistry/Reagents-Misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,19 @@ datum
else boutput(M, "<span style=\"color:red\">Yuck!</span>")
return

cloak_juice
name = "cloaked panellus extract"
id = "cloak_juice"
description = "<br><span style=\"color:red\">ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE.</span>"
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"
Expand Down
9 changes: 9 additions & 0 deletions code/datums/hydroponics/plant_mutations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/hydroponics/plants_weed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 7 additions & 0 deletions code/obj/item/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions code/procs/scanprocs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<span style=\"color:red\">ERR: SPECTROSCOPIC ANALYSIS OF THIS SUBSTANCE IS NOT POSSIBLE.</span>"
return data


var/reagents_length = A.reagents.reagent_list.len

data = "<span style='color:blue'>[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found in [A].</span>"

for (var/current_id in A.reagents.reagent_list)
Expand Down
Binary file modified icons/obj/foodNdrink/food_produce.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/hydro_mutants.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/hydromisc.dmi
Binary file not shown.