cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-10-11 20:31:01 -04:00
committed by GitHub
parent 14d698a2e1
commit 39dcc037ba
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
-9
View File
@@ -830,19 +830,10 @@
product = new has_item_product(get_turf(user))
else
product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
<<<<<<< HEAD
if(get_trait(TRAIT_PRODUCT_COLOUR))
if(!istype(product, /mob))
//product.color = get_trait(TRAIT_PRODUCT_COLOUR) //Already applied correctly on overlays in icon_update, no need to double color over all overlays
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)
=======
if (get_trait(TRAIT_PRODUCT_COLOUR))
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)
>>>>>>> 2c961d572e... Merge pull request #13866 from VOREStation/upstream-merge-8735
if(mysterious)
product.name += "?"