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

Spkrtn/fix/8703 8733

Browse Source
This commit is contained in:
Spookerton
2022-10-07 15:59:49 -04:00
committed by VirgoBot
parent 4215e8f6e1
commit 00460dcf7b
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
+8
View File
@@ -825,6 +825,7 @@
else if(has_item_product)
product = new has_item_product(get_turf(user))
else
<<<<<<< HEAD
product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
if(get_trait(TRAIT_PRODUCT_COLOUR))
if(!istype(product, /mob))
@@ -832,6 +833,13 @@
if(istype(product,/obj/item/weapon/reagent_containers/food))
var/obj/item/weapon/reagent_containers/food/food = product
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
=======
product = new /obj/item/reagent_containers/food/snacks/grown(get_turf(user),name)
if (get_trait(TRAIT_PRODUCT_COLOUR))
if (istype(product,/obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/food = product
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
>>>>>>> 29546fd08fa... Merge pull request #8735 from Spookerton/spkrtn/fix/8703-8733
if(mysterious)
product.name += "?"