From 084ed30446e5bccd985dbd9f5fa7dc80b1d35037 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 25 Jan 2017 01:04:01 -0500
Subject: [PATCH] more fixes and features

---
 code/game/objects/effects/glowshroom.dm                   | 2 ++
 code/modules/hydroponics/grown/berries.dm                 | 1 +
 code/modules/hydroponics/grown/mushrooms.dm               | 2 ++
 code/modules/hydroponics/grown/towercap.dm                | 2 +-
 .../reagents/chemistry/machinery/reagentgrinder.dm        | 8 ++++----
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 237c3ecf623..21ff80df749 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -16,10 +16,12 @@
 	var/yield = 3
 	var/generation = 1
 	var/spreadIntoAdjacentChance = 60
+	light_color = "#006622"
 
 obj/effect/glowshroom/glowcap
 	name = "glowcap"
 	icon_state = "glowcap"
+	light_color = "#8E0300"
 
 /obj/effect/glowshroom/single
 	yield = 0
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index c709e22bde8..165853c63f7 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -88,6 +88,7 @@
 	icon_state = "glowberrypile"
 	filling_color = "#7CFC00"
 	origin_tech = "plasmatech=6"
+	light_color = "#006622"
 
 // Cherries
 /obj/item/seeds/cherry
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 51d020bc812..22304cb99a3 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -231,6 +231,7 @@
 	filling_color = "#00FA9A"
 	var/effect_path = /obj/effect/glowshroom
 	origin_tech = "biotech=4;plasmatech=6"
+	light_color = "#006622"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
 	if(istype(user.loc, /turf/space))
@@ -267,3 +268,4 @@
 	filling_color = "#00FA9A"
 	effect_path = /obj/effect/glowshroom/glowcap
 	origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
+	light_color = "#8E0300"
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index f5bb061daf1..9f6a8bb99ef 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -143,7 +143,7 @@
 	if(!burning && CheckOxygen())
 		icon_state = "bonfire_on_fire"
 		burning = 1
-		set_light(6)
+		set_light(6, l_color = "#ED9200")
 		Burn()
 		processing_objects.Add(src)
 
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 04b07ca9cfb..736173181b7 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -203,12 +203,12 @@
 		[beaker_contents]<hr>
 		"}
 				if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
-						dat += "<A href='?src=\ref[src];action=grind'>Grind the reagents</a><BR>"
-						dat += "<A href='?src=\ref[src];action=juice'>Juice the reagents</a><BR><BR>"
+						dat += "<A href='?src=[src.UID()];action=grind'>Grind the reagents</a><BR>"
+						dat += "<A href='?src=[src.UID()];action=juice'>Juice the reagents</a><BR><BR>"
 				if(holdingitems && holdingitems.len > 0)
-						dat += "<A href='?src=\ref[src];action=eject'>Eject the reagents</a><BR>"
+						dat += "<A href='?src=[src.UID()];action=eject'>Eject the reagents</a><BR>"
 				if (beaker)
-						dat += "<A href='?src=\ref[src];action=detach'>Detach the beaker</a><BR>"
+						dat += "<A href='?src=[src.UID()];action=detach'>Detach the beaker</a><BR>"
 		else
 				dat += "Please wait..."