diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 29e2ce08eb4..66322cea927 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -18,6 +18,7 @@
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform)
+		H.equip_if_possible(new /obj/item/device/pda/bar(H), H.slot_belt)
 
 		if(H.backbag == 1)
 			var/obj/item/weapon/storage/box/Barpack = new /obj/item/weapon/storage/box(H)
@@ -54,6 +55,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/storage/chef(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/head/chefhat(H), H.slot_head)
+		H.equip_if_possible(new /obj/item/device/pda/chef(H), H.slot_belt)
 		return 1
 
 
@@ -124,7 +126,8 @@
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_cargo(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/cargotech(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/quartermaster(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/device/pda/cargo(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/clothing/gloves/fingerless/black(H), H.slot_gloves)
 		return 1
 
 
@@ -149,6 +152,7 @@
 		H.equip_if_possible(new /obj/item/device/pda/shaftminer(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/miner(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
+		H.equip_if_possible(new /obj/item/clothing/gloves/fingerless/black(H), H.slot_gloves)
 		if(H.backbag == 1)
 			H.equip_if_possible(new /obj/item/weapon/storage/box(H), H.slot_r_hand)
 			H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_l_hand)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 37cf507093b..e3a22ec17cd 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -20,8 +20,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/storage/armourrigvest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/heads/hos(H), H.slot_belt)
-//		H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit)
-//We're Bay12, not Goon.  We don't need armor 24/7
+//		H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit) //We're Bay12, not Goon.  We don't need armor 24/7
 		H.equip_if_possible(new /obj/item/clothing/gloves/hos(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
@@ -97,7 +96,6 @@
 /*		var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H)
 		CIG.light("")
 		H.equip_if_possible(CIG, H.slot_wear_mask)	*/
-		//Fuck that thing.  --SkyMarshal
 		H.equip_if_possible(new /obj/item/clothing/gloves/detective(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack)
diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm
index b9829af6ad4..34391c40dce 100644
--- a/code/game/objects/closets/secure/medical.dm
+++ b/code/game/objects/closets/secure/medical.dm
@@ -72,14 +72,14 @@
 		new /obj/item/device/pda/medical(src)
 		new /obj/item/weapon/storage/firstaid/regular(src)
 		new /obj/item/device/flashlight/pen(src)
-		switch(pick(list("blue", "green", "purple")))
+		switch(pick("blue", "green", "purple"))
 			if ("blue")
 				new /obj/item/clothing/under/rank/medical/blue(src)
 			if ("green")
 				new /obj/item/clothing/under/rank/medical/green(src)
 			if ("purple")
 				new /obj/item/clothing/under/rank/medical/purple(src)
-		switch(pick(list("blue", "green", "purple")))
+		switch(pick("blue", "green", "purple"))
 			if ("blue")
 				new /obj/item/clothing/under/rank/medical/blue(src)
 			if ("green")
@@ -162,6 +162,8 @@
 		new /obj/item/device/flashlight/pen(src)
 		new /obj/item/weapon/cartridge/cmo(src)
 		new /obj/item/device/radio/headset/heads/cmo(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		new /obj/item/device/flash(src)
 		return
 
 
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 3fdbcb4fb67..9e2ec3aac75 100755
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -54,7 +54,11 @@
 
 /obj/item/device/pda/detective
 	default_cartridge = /obj/item/weapon/cartridge/detective
-	icon_state = "pda-s"
+	icon_state = "pda-det"
+
+/obj/item/device/pda/warden
+	default_cartridge = /obj/item/weapon/cartridge/security
+	icon_state = "pda-warden"
 
 /obj/item/device/pda/janitor
 	default_cartridge = /obj/item/weapon/cartridge/janitor
@@ -107,6 +111,10 @@
 	icon_state = "pda-c"
 	toff = 1
 
+/obj/item/device/pda/cargo
+	default_cartridge = /obj/item/weapon/cartridge/quartermaster
+	icon_state = "pda-cargo"
+
 /obj/item/device/pda/quartermaster
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
 	icon_state = "pda-q"
@@ -143,6 +151,13 @@
 	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/chef
+	icon_state = "pda-chef"
+
+/obj/item/device/pda/bar
+	icon_state = "pda-bar"
+
 /obj/item/device/pda/atmos
 	icon_state = "pda-atmo"
 
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index a3dea0e843d..8418708ddbb 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ