Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/modules/admin/admin.dm

@@ -1882,16 +1882,26 @@
 				if(istype(M, /mob/living/carbon/alien))
 					dat += "<td>Alien</td>"
 
-				if(M.mind && M.mind.assigned_role)								// Adds a column to Player Panel that shows their current job.
+				if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human))	// Adds a column to Player Panel that shows their current job.
 					var/mob/living/carbon/human/H = M
+
 					if (H.wear_id)
-						var/obj/item/weapon/card/id/id = H.wear_id
+						var/obj/item/weapon/card/id/id
+
+						if(istype(H.wear_id, /obj/item/weapon/card/id))
+							id = H.wear_id									// The ID is on the ID slot
+						else if(istype(H.wear_id, /obj/item/device/pda))
+							var/obj/item/device/pda/PDA = H.wear_id
+							id = PDA.id										// The ID is contained inside the PDA
+
 						if(M.mind.assigned_role == id.assignment)			// Polymorph
 							dat += "<td>[M.mind.assigned_role]</td>"
 						else
 							dat += "<td>[M.mind.assigned_role] ([id.assignment])"
+
 					else
 						dat += "<td>[M.mind.assigned_role] (No ID)</td>"
+
 				else
 					dat += "<td>No Assigned Role</td>"
 
@@ -1960,7 +1970,7 @@
 
 	dat += "</table></body></html>"
 
-	usr << browse(dat, "window=players;size=540x480")
+	usr << browse(dat, "window=players;size=905x480")
 
 
 /obj/admins/proc/Jobbans()

code/modules/chemical/Chemistry-Tools.dm

@@ -2823,6 +2823,12 @@
 	icon_state = "flask"
 	volume = 60
 
+/obj/item/weapon/reagent_containers/food/drinks/dflask
+	name = "Detective's Flask"
+	desc = "A well used metal flask with the detective's name etched into it."
+	icon_state = "dflask"
+	volume = 60
+
 /obj/item/weapon/reagent_containers/food/drinks/britcup
 	name = "cup"
 	desc = "A cup with the british flag emblazoned on it."

code/modules/clothing/suits/armor.dm

@@ -62,6 +62,8 @@
 	item_state = "gearharness"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+
 
 /obj/item/clothing/suit/storage/armourrigvest
 	name = "armour rig vest"
@@ -70,6 +72,8 @@
 	item_state = "armourrigvest"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 
 

code/modules/power/lighting.dm

@@ -58,7 +58,7 @@
 	icon_state = "lamp1"
 	base_state = "lamp"
 	fitting = "bulb"
-	brightness = 5
+	brightness = 7
 	desc = "A desk lamp"
 	light_type = /obj/item/weapon/light/bulb
 	var/switchon = 0		// independent switching for lamps - not controlled by area lightswitch