From 44c8b03fcdb9f35372e5ce9923ffbae32f172e26 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Thu, 19 Mar 2015 20:10:51 +0100
Subject: [PATCH 1/2] Cryopod naming fixes.

Fixes issue where the cryopod name would not update if left willingly.
Fixes issue where the cryopod name would not update if forced inside.
---
 code/game/machinery/cryopod.dm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 5915aef5ac..29227ceb58 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -398,10 +398,9 @@
 	announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]")
 	visible_message("<span class='notice'>\The [src] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)
 
+	set_occupant(null)
 	// Delete the mob.
 	del(occupant)
-	occupant = null
-	name = initial(name)
 
 
 /obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
@@ -448,7 +447,7 @@
 
 			M << "<span class='notice'>[on_enter_occupant_message]</span>"
 			M << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
-			occupant = M
+			set_occupant(M)
 			time_entered = world.time
 
 			// Book keeping!
@@ -517,7 +516,7 @@
 		usr.client.perspective = EYE_PERSPECTIVE
 		usr.client.eye = src
 		usr.loc = src
-		src.occupant = usr
+		set_occupant(usr)
 
 		if(orient_right)
 			icon_state = "[occupied_icon_state]-r"
@@ -526,11 +525,10 @@
 
 		usr << "<span class='notice'>[on_enter_occupant_message]</span>"
 		usr << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
-		occupant = usr
+
 		time_entered = world.time
 
 		src.add_fingerprint(usr)
-		name = "[name] ([usr.name])"
 
 	return
 
@@ -544,7 +542,7 @@
 		occupant.client.perspective = MOB_PERSPECTIVE
 
 	occupant.loc = get_turf(src)
-	occupant = null
+	set_occupant(null)
 
 	if(orient_right)
 		icon_state = "[base_icon_state]-r"
@@ -553,6 +551,12 @@
 
 	return
 
+/obj/machinery/cryopod/proc/set_occupant(var/occupant)
+	src.occupant = occupant
+	name = initial(name)
+	if(occupant)
+		name = "[name] ([occupant])]"
+
 
 //Attacks/effects.
 /obj/machinery/cryopod/blob_act()

From fb52e095d02deab6a6823d7393fdcdf990fe96ec Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 20 Mar 2015 12:37:55 +1030
Subject: [PATCH 2/2] Fixes #8543

---
 code/modules/hydroponics/seed_datums.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 7d69393216..dacdab26ba 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -861,6 +861,7 @@
 	seed_name = "orange"
 	display_name = "orange trees"
 	kitchen_tag = "orange"
+	chems = list("nutriment" = list(1,20), "orangejuice" = list(1,20))
 
 /datum/seed/citrus/orange/New()
 	..()