cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update grown.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-03 12:24:58 -04:00
committed by GitHub
parent 58dc70861c
commit 496a34ab2b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
-5
View File
@@ -13,15 +13,10 @@
var/datum/seed/seed
var/potency = -1
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(newloc,planttype)
..()
=======
/obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(var/mapload, var/planttype)
. = ..()
>>>>>>> 3473522... Merge pull request #6904 from VOREStation/pol-cleanup
if(!dried_type)
dried_type = type