From 3a14201f37252cf23321eff2f031e29b64a587f2 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Wed, 29 Feb 2012 14:05:36 -0700
Subject: [PATCH] Bugfixes for PDA manifest and bloody Tarjans

---
 baystation12.dme                              |  2 +-
 .../Cael_Aislinn/Tajara/examine.dm            | 34 +++++++++----------
 code/game/objects/devices/PDA/PDA.dm          |  7 ++++
 code/game/objects/devices/PDA/cart.dm         |  7 ----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index beed9a343a4..d49c86e7c42 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -527,7 +527,7 @@
 #include "code\game\machinery\computer\id.dm"
 #include "code\game\machinery\computer\lockdown.dm"
 #include "code\game\machinery\computer\medical.dm"
-#include "code\game\machinery\computer\Operating.dm"
+#include "code\game\machinery\computer\operating.dm"
 #include "code\game\machinery\computer\power.dm"
 #include "code\game\machinery\computer\robot.dm"
 #include "code\game\machinery\computer\security.dm"
diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
index 7f89c66afe1..2c57d87e929 100644
--- a/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
@@ -16,8 +16,8 @@
 		t_him = "her"
 
 	if (src.w_uniform)
-		if (src.w_uniform.blood_DNA)
-			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
+		if (src.w_uniform.blood_DNA.len)
+			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA.len ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
 		else
 			usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
 
@@ -25,8 +25,8 @@
 		usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
 
 	if (src.wear_suit)
-		if (src.wear_suit.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
+		if (src.wear_suit.blood_DNA.len)
+			usr << "\red [src.name] has a[src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
 		else
 			usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
 
@@ -37,39 +37,39 @@
 		usr << "\blue [src.name] has a \icon[src.r_ear] [src.r_ear.name] on [t_his] right ear."
 
 	if (src.wear_mask)
-		if (src.wear_mask.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_mask.blood_DNA ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
+		if (src.wear_mask.blood_DNA.len)
+			usr << "\red [src.name] has a[src.wear_mask.blood_DNA.len ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
 		else
 			usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
 
 	if (src.l_hand)
-		if (src.l_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.l_hand.blood_DNA ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
+		if (src.l_hand.blood_DNA.len)
+			usr << "\red [src.name] has a[src.l_hand.blood_DNA.len ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
 		else
 			usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
 
 	if (src.r_hand)
-		if (src.r_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.r_hand.blood_DNA ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
+		if (src.r_hand.blood_DNA.len)
+			usr << "\red [src.name] has a[src.r_hand.blood_DNA.len ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
 		else
 			usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
 
 	if (src.belt)
-		if (src.belt.blood_DNA)
-			usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
+		if (src.belt.blood_DNA.len)
+			usr << "\red [src.name] has a[src.belt.blood_DNA.len ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
 		else
 			usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
 	if(src.s_store)
-		if(src.s_store.blood_DNA)
-			usr << "\red [src.name] has a[src.s_store.blood_DNA ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
+		if(src.s_store.blood_DNA.len)
+			usr << "\red [src.name] has a[src.s_store.blood_DNA.len ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
 		else
-			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
+			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
 	if (src.shoes)
-		usr << "[src.shoes.blood_DNA ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
+		usr << "[src.shoes.blood_DNA.len ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA.len ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
 
 
 	if (src.gloves)
-		if (src.gloves.blood_DNA)
+		if (src.gloves.blood_DNA.len)
 			usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
 		else
 			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 4470eae3ade..e8783ac589a 100755
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -316,6 +316,13 @@
 							dat += "OTHER: [round(unknown_level)]%<br>"
 					dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"
 				dat += "<br>"
+			if (41) //crew manifest
+
+				dat += "<h4><img src=pda_notes.png> Crew Manifest</h4>"
+				dat += "Entries cannot be modified from this terminal.<br><br>"
+
+				dat += data_core.get_manifest(1)
+				dat += "<br>"
 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
 				dat += cart
 
diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm
index 8b5b5249695..ef012e92fdd 100644
--- a/code/game/objects/devices/PDA/cart.dm
+++ b/code/game/objects/devices/PDA/cart.dm
@@ -228,13 +228,6 @@ Code:
 [radio:code]
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=1'>+</a>
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=5'>+</a><br>"}
-			if (41) //crew manifest
-
-				menu = "<h4><img src=pda_notes.png> Crew Manifest</h4>"
-				menu += "Entries cannot be modified from this terminal.<br><br>"
-
-				menu += data_core.get_manifest(1)
-				menu += "<br>"
 
 
 			if (42) //status displays