Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-12-29 19:01:58 +00:00
117 changed files with 5697 additions and 5543 deletions
@@ -83,7 +83,7 @@
/datum/gear/eyes/material
display_name = "Optical Material Scanners (Mining)"
path = /obj/item/clothing/glasses/material
allowed_roles = list("Shaft Miner")
allowed_roles = list("Shaft Miner","Quartermaster")
/datum/gear/eyes/material/prescription
display_name = "Prescription Optical Material Scanners (Mining)"