Skip to content

Separated Chemicals #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Joker66613 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Separated Chemicals #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions aquila/code/modules/hydroponics/plant_genes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/datum/plant_gene/trait/noreact
// Makes plant reagents not react until squashed.
name = "Separated Chemicals"

/datum/plant_gene/trait/noreact/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
..()
ENABLE_BITFIELD(G.reagents.flags, NO_REACT)

/datum/plant_gene/trait/noreact/on_squashreact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
DISABLE_BITFIELD(G.reagents.flags, NO_REACT)
G.reagents.handle_reactions()
14 changes: 9 additions & 5 deletions code/modules/hydroponics/grown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
if(seed.get_gene(/datum/plant_gene/trait/squash))
squash(hit_atom)

/obj/item/reagent_containers/food/snacks/grown/proc/squash(atom/target)
/obj/item/reagent_containers/food/snacks/grown/proc/squash(atom/target)//AQ EDIT przywraca sep chems
var/turf/T = get_turf(target)
forceMove(T)
if(ispath(splat_type, /obj/effect/decal/cleanable/food/plant_smudge))
Expand All @@ -122,10 +122,14 @@
if(seed)
for(var/datum/plant_gene/trait/trait in seed.genes)
trait.on_squash(src, target)
reagents.reaction(T)
for(var/A in T)
reagents.reaction(A)
qdel(src)
if(!seed.get_gene(/datum/plant_gene/trait/noreact))
reagents.reaction(T)
for(var/A in T)
reagents.reaction(A)
qdel(src)
if(seed.get_gene(/datum/plant_gene/trait/noreact))
visible_message("<span class='warning'>[src] crumples, and bubbles ominously as its contents mix.</span>")
addtimer(CALLBACK(src, .proc/squashreact), 20)

/obj/item/reagent_containers/food/snacks/grown/proc/squashreact()
for(var/datum/plant_gene/trait/trait in seed.genes)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/berries.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
lifespan = 30
endurance = 25
mutatelist = list()
genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/repeated_harvest)
genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/noreact, /datum/plant_gene/trait/repeated_harvest)//AQ EDIT
reagents_add = list(/datum/reagent/uranium = 0.25, /datum/reagent/iodine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 20

Expand Down