diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 5fe26128dae..55f552d98cc 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -17,6 +17,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/survival/Barpack = new /obj/item/weapon/storage/box/survival(H)
@@ -53,6 +54,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/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
 
 
@@ -121,7 +123,7 @@
 		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/black(H), H.slot_gloves)
 		return 1
 
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 0f48a604028..c316eab7fc4 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -55,7 +55,7 @@
 		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/warden(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/device/pda/warden(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/warden(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/warden(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm
index 8536da0e602..3f8b9e09bd6 100644
--- a/code/game/objects/closets/secure/medical.dm
+++ b/code/game/objects/closets/secure/medical.dm
@@ -67,14 +67,14 @@
 		new /obj/item/weapon/storage/backpack/medic(src)
 		new /obj/item/clothing/under/rank/nursesuit (src)
 		new /obj/item/clothing/head/nursehat (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")
@@ -112,6 +112,8 @@
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/clothing/shoes/brown	(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 a5c211327f2..a85e0c1c4b7 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -53,7 +53,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
@@ -106,6 +110,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"
@@ -142,6 +150,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