Merge pull request #1206 from Erthilo/TGUpdates

TG Update r3659 to r3681

code/game/objects/devices/PDA/PDA.dm

@@ -8,7 +8,8 @@
 	icon_state = "pda"
 	item_state = "electronic"
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_ID | SLOT_BELT
 
 	//Main variables
 	var/owner = null
@@ -134,8 +135,6 @@
 
 /obj/item/device/pda/roboticist
 	icon_state = "pda-robot"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case."
-	note = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Turbo Edition!"
 
 /obj/item/device/pda/librarian
 	icon_state = "pda-libb"
@@ -143,6 +142,16 @@
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
 
+/obj/item/device/pda/atmos
+	icon_state = "pda-atmo"
+
+/obj/item/device/pda/chemist
+	default_cartridge = /obj/item/weapon/cartridge/chemistry
+	icon_state = "pda-chem"
+
+/obj/item/device/pda/geneticist
+	icon_state = "pda-gene"
+
 /*
  *	The Actual PDA
  */

code/game/objects/devices/PDA/cart.dm

@@ -41,6 +41,11 @@
 		icon_state = "cart-m"
 		access_medical = 1
 
+	chemistry
+		name = "ChemWhiz Cartridge"
+		icon_state = "cart-chem"
+		access_reagent_scanner = 1
+
 	security
 		name = "R.O.B.U.S.T. Cartridge"
 		icon_state = "cart-s"
@@ -91,7 +96,7 @@
 			name = "Signal Ace 2"
 			desc = "Complete with integrated radio signaler!"
 			icon_state = "cart-tox"
-			access_reagent_scanner = 1
+//			access_reagent_scanner = 1
 
 		New()
 			..()
@@ -154,7 +159,7 @@
 		name = "Signal Ace DELUXE"
 		icon_state = "cart-rd"
 		access_status_display = 1
-		access_reagent_scanner = 1
+//		access_reagent_scanner = 1
 
 		New()
 			..()