Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm

code/game/objects/items/devices/scanners.dm

@@ -301,7 +301,7 @@ MASS SPECTROMETER
 		else
 			user << "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>"
 
-		if(bz_concentration > 0.005)
+		if(bz_concentration > 0.01)
 			user << "<span class='alert'>Hallucinogen: [round(plasma_concentration*100, 0.01)] %</span>"
 		else
 			user << "<span class='info'>Hallucinogen: [round(plasma_concentration*100, 0.01)] %</span>"

code/game/objects/items/devices/traitordevices.dm

@@ -72,7 +72,7 @@ effective or pretty fucking useless.
 	name = "health analyzer"
 	icon_state = "health"
 	item_state = "analyzer"
-	desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
+	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3

code/game/objects/structures/grille.dm

@@ -258,3 +258,13 @@
 
 /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
 	return 0
+
+/obj/structure/grille/broken // Pre-broken grilles for map placement
+	icon_state = "brokengrille"
+	density = 0
+	health = 0
+	destroyed = 1
+
+/obj/structure/grille/broken/New()
+	..()
+	stored.amount = 1