From 4bd095fbb803bb25deeba7f1d1a320e915b98b87 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 11 Dec 2012 10:48:37 +0000
Subject: [PATCH] -Added photo support for newspapers. -Removed some commented
 out code for advance diseases.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5296 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/diseases/advance/advance.dm |  7 ++-----
 code/game/machinery/newscaster.dm       | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 74f81f6eced..95adc92dcc3 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -94,15 +94,12 @@ var/list/advance_cures = 	list(
 
 // Compares type then ID.
 /datum/disease/advance/IsSame(var/datum/disease/advance/D)
-	if(!(istype(D, /datum/disease/advance)))
-		//error("Returning 0 because not same type.")
 
+	if(!(istype(D, /datum/disease/advance)))
 		return 0
-	//error("Comparing [src.GetDiseaseID()] [D.GetDiseaseID()]")
+
 	if(src.GetDiseaseID() != D.GetDiseaseID())
-		//error("Returing 0")
 		return 0
-	//error("Returning 1")
 	return 1
 
 // To add special resistances.
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 4d60b0eec87..10ca9fff863 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -816,8 +816,14 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob)
 						dat+="No Feed stories stem from this channel..."
 					else
 						dat+="<ul>"
+						var/i = 0
 						for(var/datum/feed_message/MESSAGE in C.messages)
-							dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR><BR>"
+							i++
+							dat+="-[MESSAGE.body] <BR>"
+							if(MESSAGE.img)
+								user << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
+								dat+="<img src='tmp_photo[i].png' width = '180'><BR>"
+							dat+="<FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR><BR>"
 						dat+="</ul>"
 				if(scribble_page==curr_page)
 					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[src.scribble]\"</I>"
@@ -828,7 +834,13 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob)
 				if(src.important_message!=null)
 					dat+="<DIV STYLE='float:center;'><FONT SIZE=4><B>Wanted Issue:</B></FONT SIZE></DIV><BR><BR>"
 					dat+="<B>Criminal name</B>: <FONT COLOR='maroon'>[important_message.author]</FONT><BR>"
-					dat+="<B>Description</B>: [important_message.body]"
+					dat+="<B>Description</B>: [important_message.body]<BR>"
+					dat+="<B>Photo:</B>: "
+					if(important_message.img)
+						user << browse_rsc(important_message.img, "tmp_photow.png")
+						dat+="<BR><img src='tmp_photow.png' width = '180'>"
+					else
+						dat+="None"
 				else
 					dat+="<I>Apart from some uninteresting Classified ads, there's nothing on this page...</I>"
 				if(scribble_page==curr_page)