Merge pull request #172 from SkyMarshal/master

I am a derp. (This fixes a stupid compile error.)

baystation12.dme

@@ -144,6 +144,7 @@
 #define FILE_DIR "code/WorkInProgress/SkyMarshal"
 #define FILE_DIR "code/WorkInProgress/Tastyfish"
 #define FILE_DIR "code/WorkInProgress/virus2"
+#define FILE_DIR "code/WorkInProgress/Wrongnumber"
 #define FILE_DIR "html"
 #define FILE_DIR "icons"
 #define FILE_DIR "icons/effects"

code/defines/mob/living/carbon/carbon.dm

@@ -5,6 +5,7 @@
 	var/brain_op_stage = 0.0
 	var/eye_op_stage = 0.0
 	var/appendix_op_stage = 0.0
+	var/embryo_op_stage = 0.0
 
 	var/datum/disease2/disease/virus2 = null
 	var/list/datum/disease2/disease/resistances2 = list()

code/modules/mob/living/say.dm

@@ -221,7 +221,7 @@
 
 		//I see no reason to restrict such way of whispering
 		if ("whisper")
-			whisper(copytext(message_old, 3))
+			whisper(trim(copytext(message_old, 3)))
 			return
 
 		if ("binary")