Merge remote-tracking branch 'upstream/master'

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