cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

solving conflicts

Browse Source
This commit is contained in:
Fox-McCloud
2017-01-26 06:59:16 -05:00
parent 51bbe8c466
commit d1463d9718
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/plant_genes.dm
+2 -2
View File
@@ -313,11 +313,11 @@
/datum/plant_gene/trait/noreact/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc)
..()
G.flags |= NOREACT
G.reagents.set_reacting(FALSE)
/datum/plant_gene/trait/noreact/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
G.flags &= ~NOREACT
if(G && G.reagents)
G.reagents.set_reacting(TRUE)
G.reagents.handle_reactions()