Merge remote-tracking branch 'citadel/master' into staves

This commit is contained in:
kevinz000
2020-02-19 14:32:28 -07:00
40 changed files with 190 additions and 87 deletions
@@ -70,3 +70,8 @@
name = "secure science crate"
desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
icon_state = "scisecurecrate"
/obj/structure/closet/crate/secure/medical
desc = "A secure medical crate."
name = "medical crate"
icon_state = "medical_secure_crate"